Temporarily removing the 'unsubscribe' operation from CLL deletion call flow.
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / cloud_leased_line / GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
index 1a4c840..21b2270 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "d6c73c0b.0d5f48",\r
+        "id": "c958c928.fc7fe",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
         "x": 157.88330078125,\r
         "y": 156.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d49f5b5f.8b9338"\r
+                "8b28c589.12d4a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d49f5b5f.8b9338",\r
+        "id": "8b28c589.12d4a8",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "outputs": 1,\r
         "x": 456.1690216064453,\r
         "y": 212.52387523651123,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "3720330.25593ce"\r
+                "39af1a7f.521d1e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3720330.25593ce",\r
+        "id": "39af1a7f.521d1e",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-delete",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-delete' mode='sync'>\n",\r
         "outputs": 1,\r
         "x": 462.3119354248047,\r
         "y": 297.2857971191406,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7f694928.267bb8"\r
+                "7656a28c.ac0ab4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f694928.267bb8",\r
+        "id": "7656a28c.ac0ab4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 811.8833312988281,\r
         "y": 356.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "14360151.1c2e2f",\r
-                "2b05d42f.ff48b4",\r
-                "b833ca08.643e2"\r
+                "fdfa5720.e8c418",\r
+                "3ac5985c.f18eb8",\r
+                "9905a45e.0c7298"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14360151.1c2e2f",\r
+        "id": "fdfa5720.e8c418",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
         "x": 1113.2168273925781,\r
         "y": 627.216064453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b05d42f.ff48b4",\r
+        "id": "3ac5985c.f18eb8",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "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\">-->",\r
         "outputs": 1,\r
         "x": 1134.6452941894531,\r
         "y": 329.61907958984375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "41fb5683.e713a",\r
-                "80e71c24.60d2d",\r
-                "fe4111b5.f2228"\r
+                "af28127c.d820d8",\r
+                "63469daf.849ae4",\r
+                "71a31314.344984"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41fb5683.e713a",\r
+        "id": "af28127c.d820d8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 1359.6452941894531,\r
         "y": 187.61907958984375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "41abc238.ea1884"\r
+                "a801d61e.c75b88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80e71c24.60d2d",\r
+        "id": "63469daf.849ae4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 1355.1362609863281,\r
         "y": 257.193115234375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "844c0ad5.c095b"\r
+                "3d43dcc5.27db6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe4111b5.f2228",\r
+        "id": "71a31314.344984",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 1343.6452941894531,\r
         "y": 303.61907958984375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1e9cd9f4.55835e"\r
+                "858124ec.81d0f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "692bc437.51a034",\r
+        "id": "d6a6cf8b.cb8788",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
         "x": 1113.6452941894531,\r
         "y": 217.61907958984375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b833ca08.643e2",\r
+        "id": "9905a45e.0c7298",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "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' />",\r
         "outputs": 1,\r
         "x": 1101.6452941894531,\r
         "y": 269.61907958984375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "41abc238.ea1884",\r
+        "id": "a801d61e.c75b88",\r
         "type": "switchNode",\r
         "name": "switch allotted-resources_length != 0",\r
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",\r
         "outputs": 1,\r
         "x": 1599.8833312988281,\r
         "y": 184.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "edbcfce1.4d552",\r
-                "d741e3bd.0b6788"\r
+                "e0f3a386.0fe6",\r
+                "301731c1.c04b8e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "844c0ad5.c095b",\r
+        "id": "3d43dcc5.27db6c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 1509.9457092285156,\r
         "y": 260.1455383300781,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1e9cd9f4.55835e",\r
+        "id": "858124ec.81d0f8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 1513.8833312988281,\r
         "y": 304.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "edbcfce1.4d552",\r
+        "id": "e0f3a386.0fe6",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 1804.8833312988281,\r
         "y": 221.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "589ae77f.807888"\r
+                "128d7cd4.e28ffb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d741e3bd.0b6788",\r
+        "id": "301731c1.c04b8e",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 1814.8833312988281,\r
         "y": 148.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "589ae77f.807888",\r
+        "id": "128d7cd4.e28ffb",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 1797.8833312988281,\r
         "y": 296.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "10bd96f7.8fa059",\r
-                "cb92da4c.da1bb",\r
-                "cbe49015.ae0dd",\r
-                "6c495f2.f763aa",\r
-                "4304e2aa.cc073c"\r
+                "1f66e7ef.b5efe",\r
+                "b392bf29.b70228",\r
+                "49e6917b.6d0138",\r
+                "391971a2.696836",\r
+                "7226ce6d.bf87d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f06cb70.adae8c",\r
+        "id": "c1485ca8.2ec768",\r
         "type": "save",\r
         "name": "get allotted-resource from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 2283.883331298828,\r
         "y": 347.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c68fbf4e.5d82c",\r
-                "2146d17e.d0a56e",\r
-                "f04a7ec7.eb68d"\r
+                "42d08205.101f24",\r
+                "280ca852.5c8478",\r
+                "9260e446.97cb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c68fbf4e.5d82c",\r
+        "id": "42d08205.101f24",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 2499.883331298828,\r
         "y": 414.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "cbd25b41.5a644"\r
+                "1cda58ca.c0ca0f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2146d17e.d0a56e",\r
+        "id": "280ca852.5c8478",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 2500.374298095703,\r
         "y": 313.8597412109375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d020f647.b48948"\r
+                "37d08b63.267f54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f04a7ec7.eb68d",\r
+        "id": "9260e446.97cb2",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 2495.883331298828,\r
         "y": 363.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "bf60182e.46d6e"\r
+                "3db04a4.fcc1db6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10bd96f7.8fa059",\r
+        "id": "1f66e7ef.b5efe",\r
         "type": "for",\r
         "name": "for each allotted-resource",\r
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",\r
         "outputs": 1,\r
         "x": 2000.8833312988281,\r
         "y": 328.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9d7e7b42.ef2a18",\r
-                "5f06cb70.adae8c",\r
-                "b4f5dada.48378",\r
-                "5db562b1.71111c"\r
+                "ae5848cb.e1b328",\r
+                "c1485ca8.2ec768",\r
+                "c9139602.db9618",\r
+                "aadbe6b3.d2bba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d7e7b42.ef2a18",\r
+        "id": "ae5848cb.e1b328",\r
         "type": "set",\r
         "name": "set the current allotted-resource-id",\r
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",\r
         "comments": "",\r
         "x": 2280.883331298828,\r
         "y": 266.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6c495f2.f763aa",\r
+        "id": "391971a2.696836",\r
         "type": "set",\r
         "name": "set tmp.arr",\r
         "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",\r
         "comments": "",\r
         "x": 1974.8833312988281,\r
         "y": 278.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cb92da4c.da1bb",\r
+        "id": "b392bf29.b70228",\r
         "type": "get-resource",\r
         "name": "get-resource pnfs-list",\r
         "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\" >",\r
         "outputs": 1,\r
         "x": 2017.8833312988281,\r
         "y": 137.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cbe49015.ae0dd",\r
+        "id": "49e6917b.6d0138",\r
         "type": "get-resource",\r
         "name": "get-resource logical-links",\r
         "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\" >",\r
         "outputs": 1,\r
         "x": 2029.8833312988281,\r
         "y": 178.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f6d3e50c.b329e8",\r
+        "id": "33859df.81a8362",\r
         "type": "comment",\r
         "name": "The following two nodes are for PCE",\r
         "info": "",\r
         "comments": "",\r
         "x": 2054.883331298828,\r
         "y": 90.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "300ce0be.29882",\r
+        "id": "16362fdd.257198",\r
         "type": "set",\r
         "name": "set tmp.arr",\r
         "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",\r
         "comments": "",\r
         "x": 1974.8833312988281,\r
         "y": 224.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d020f647.b48948",\r
+        "id": "37d08b63.267f54",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 2678.883331298828,\r
         "y": 316.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bf60182e.46d6e",\r
+        "id": "3db04a4.fcc1db6",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 2678.820831298828,\r
         "y": 365.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cbd25b41.5a644",\r
+        "id": "1cda58ca.c0ca0f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 2680.820831298828,\r
         "y": 416.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "365e9f97.d4a028"\r
+                "8ac18ed0.a417b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "365e9f97.d4a028",\r
+        "id": "8ac18ed0.a417b8",\r
         "type": "save",\r
         "name": "get allotted-resource relationship from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 2973.820831298828,\r
         "y": 363.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6e92372c.3a07f8",\r
-                "c96fb012.9bb888",\r
-                "95b7cbb5.ac06c8"\r
+                "2f801aa3.62899e",\r
+                "8d0c42c.041064",\r
+                "39093638.1e8092"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c96fb012.9bb888",\r
+        "id": "8d0c42c.041064",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 3277.311767578125,\r
         "y": 20,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "58ab1443.358994"\r
+                "25cca067.117fb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58ab1443.358994",\r
+        "id": "25cca067.117fb8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3454.88330078125,\r
         "y": 20.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "95b7cbb5.ac06c8",\r
+        "id": "39093638.1e8092",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 3272.82080078125,\r
         "y": 69.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1f97dde6.30f20a"\r
+                "45859305.7fd9ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f97dde6.30f20a",\r
+        "id": "45859305.7fd9ac",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3454.82080078125,\r
         "y": 69.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e92372c.3a07f8",\r
+        "id": "2f801aa3.62899e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3276.82080078125,\r
         "y": 120.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7a25dc67.63046c"\r
+                "6880d10c.55d838"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a25dc67.63046c",\r
+        "id": "6880d10c.55d838",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 3456.82080078125,\r
         "y": 120.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "742cdaa9.4808c4"\r
+                "e9027b62.9e003"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "742cdaa9.4808c4",\r
+        "id": "e9027b62.9e003",\r
         "type": "switchNode",\r
         "name": "switch allotted-resource.relationship-list not empty",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",\r
         "outputs": 1,\r
         "x": 2992.883331298828,\r
         "y": 491.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9afa3e4f.f2f2c8",\r
-                "ce58b166.b2448"\r
+                "72fd55d0.427e94",\r
+                "bb0cc7e.bea8238"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce58b166.b2448",\r
+        "id": "bb0cc7e.bea8238",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 3332.88330078125,\r
         "y": 262.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9afa3e4f.f2f2c8",\r
+        "id": "72fd55d0.427e94",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 3331.88330078125,\r
         "y": 316.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "aba0f7b5.b64ec8"\r
+                "32c96151.c1aa2e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50f7604e.0c4dc8",\r
+        "id": "a8b50f84.db474",\r
         "type": "outcome",\r
         "name": "network-policy",\r
         "xml": "<outcome value='network-policy'>\n",\r
         "outputs": 1,\r
         "x": 4076.88330078125,\r
         "y": 270.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e079a6c2.9c941"\r
+                "9b999d2e.09c6d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e079a6c2.9c941",\r
+        "id": "9b999d2e.09c6d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4253.8831787109375,\r
         "y": 263.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "83280d27.4bae7",\r
-                "92c6fb1f.05a328"\r
+                "13e93d82.810a42",\r
+                "3997cabd.9c2abe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aba0f7b5.b64ec8",\r
+        "id": "32c96151.c1aa2e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 3495.88330078125,\r
         "y": 242.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a8c08369.0aef78",\r
-                "98755b5f.40e4a"\r
+                "6a03759c.b65ec4",\r
+                "2a091548.5d967a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8c08369.0aef78",\r
+        "id": "6a03759c.b65ec4",\r
         "type": "for",\r
         "name": "for each allotted-resource relationship",\r
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 3776.88330078125,\r
         "y": 198.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "64ebbb1e.14821c"\r
+                "6d840347.ad0de4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64ebbb1e.14821c",\r
+        "id": "6d840347.ad0de4",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 4038.88330078125,\r
         "y": 198.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "50f7604e.0c4dc8"\r
+                "a8b50f84.db474"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83280d27.4bae7",\r
+        "id": "13e93d82.810a42",\r
         "type": "set",\r
         "name": "set the 1st network-policy-id",\r
         "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",\r
         "comments": "",\r
         "x": 4496.8831787109375,\r
         "y": 220.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "92c6fb1f.05a328",\r
+        "id": "3997cabd.9c2abe",\r
         "type": "save",\r
         "name": "get network-policy from aai",\r
         "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\">",\r
         "outputs": 1,\r
         "x": 4485.8831787109375,\r
         "y": 275.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "26a63936.d2dcb6",\r
-                "935c2a76.01522",\r
-                "61809f6c.f102a"\r
+                "1629cf91.336928",\r
+                "7e24e3bc.4dd5bc",\r
+                "e3d66604.874708"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61809f6c.f102a",\r
+        "id": "e3d66604.874708",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 4738.88330078125,\r
         "y": 161.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "8483d549.4ff1d8"\r
+                "9dd0299.013fdd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8483d549.4ff1d8",\r
+        "id": "9dd0299.013fdd8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4887.454833984375,\r
         "y": 161.571533203125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "79f73429.37a0f4",\r
+        "id": "1b29ba86.57c2a5",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 4886.392333984375,\r
         "y": 205.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "935c2a76.01522",\r
+        "id": "7e24e3bc.4dd5bc",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 4727.392333984375,\r
         "y": 205.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "79f73429.37a0f4"\r
+                "1b29ba86.57c2a5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26a63936.d2dcb6",\r
+        "id": "1629cf91.336928",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4734.392333984375,\r
         "y": 284.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "4efa868e.4aaf8"\r
+                "b86241e1.90f6f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4efa868e.4aaf8",\r
+        "id": "b86241e1.90f6f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4873.392333984375,\r
         "y": 284.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ac693539.f50e98",\r
-                "9a31854c.efaef8"\r
+                "6d437f62.f0b9e8",\r
+                "c60cac93.77d028"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac693539.f50e98",\r
+        "id": "6d437f62.f0b9e8",\r
         "type": "set",\r
         "name": "set the max bandwidth",\r
         "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",\r
         "comments": "",\r
         "x": 5078.88330078125,\r
         "y": 282.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9a31854c.efaef8",\r
+        "id": "c60cac93.77d028",\r
         "type": "set",\r
         "name": "set the max bandwidth",\r
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
         "comments": "",\r
         "x": 5077.88330078125,\r
         "y": 328.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98755b5f.40e4a",\r
+        "id": "2a091548.5d967a",\r
         "type": "for",\r
         "name": "for each allotted-resource relationship",\r
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 3593.88330078125,\r
         "y": 314.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a599949c.47c2"\r
+                "2f22efb0.7f6638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a599949c.47c2",\r
+        "id": "2f22efb0.7f6638",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 3873.88330078125,\r
         "y": 314.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9f30fb79.9864f8"\r
+                "a8ed1762.dadd28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f30fb79.9864f8",\r
+        "id": "a8ed1762.dadd28",\r
         "type": "outcome",\r
         "name": "logical-link",\r
         "xml": "<outcome value='logical-link'>\n",\r
         "outputs": 1,\r
         "x": 2256.8834533691406,\r
         "y": 803.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "4497a7be.db159"\r
+                "d4da35fd.31c82"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4497a7be.db159",\r
+        "id": "d4da35fd.31c82",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 2433.883331298828,\r
         "y": 796.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "748da704.3dc228",\r
-                "132fdd9a.6a584a"\r
+                "de7b00e3.6a171",\r
+                "e6ab014c.406db"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "748da704.3dc228",\r
+        "id": "de7b00e3.6a171",\r
         "type": "set",\r
         "name": "set the current logical-link-name",\r
         "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",\r
         "comments": "",\r
         "x": 2676.883331298828,\r
         "y": 753.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "132fdd9a.6a584a",\r
+        "id": "e6ab014c.406db",\r
         "type": "save",\r
         "name": "get logical-link from aai",\r
         "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\">",\r
         "outputs": 1,\r
         "x": 2665.883331298828,\r
         "y": 808.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1d5c52ad.8a4fcd",\r
-                "c6fd8eb5.369a58",\r
-                "b0ba9e98.5ef29"\r
+                "5a07beae.8794d8",\r
+                "1d7b95c6.606562",\r
+                "7f820a8.8f172f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d5c52ad.8a4fcd",\r
+        "id": "5a07beae.8794d8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 2957.374298095703,\r
         "y": 786.8597412109375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "81786826.f1adc"\r
+                "ae195dbf.1750f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6fd8eb5.369a58",\r
+        "id": "1d7b95c6.606562",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 2945.883331298828,\r
         "y": 831.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "568abbfd.c78f14"\r
+                "f12ba9c8.9a28f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81786826.f1adc",\r
+        "id": "ae195dbf.1750f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3105.945831298828,\r
         "y": 787.1455078125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "568abbfd.c78f14",\r
+        "id": "f12ba9c8.9a28f8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3104.883331298828,\r
         "y": 831.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b0ba9e98.5ef29",\r
+        "id": "7f820a8.8f172f4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 2952.883331298828,\r
         "y": 910.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "56d4032d.446f0c"\r
+                "344a6e64.f3725a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56d4032d.446f0c",\r
+        "id": "344a6e64.f3725a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 3091.883331298828,\r
         "y": 910.2857666015625,\r
-        "z": "1806503a.76a7a",\r
-        "wires": [\r
-            [\r
-                "a588efb1.b17fd",\r
-                "9c7e31dc.43bc2",\r
-                "64cc49aa.338118",\r
-                "a266d487.c02dd",\r
-                "f1099f4d.7efe5",\r
-                "6aa3951e.157a4c",\r
-                "4618e1c0.461d88",\r
-                "d38e0865.514348",\r
-                "eef6ad07.9c7d5",\r
-                "78d4922e.8ebe04",\r
-                "c220ecdf.76a978",\r
-                "940f9aa.5464fe8",\r
-                "14f1d608.fff342",\r
-                "5e5dd175.2ee1b",\r
-                "95f11825.f517d8",\r
-                "79dba259.2612cc",\r
-                "11c024cf.1cb7db",\r
-                "8bfce836.dcd148",\r
-                "ec6aad53.7d628",\r
-                "c02bc34.16c814",\r
-                "ad2e0fde.b44de8",\r
-                "d87e7a94.9bda08"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "6986f9e3.b25bc8",\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "fb96464b.51f05",\r
+                "51750f01.3f406",\r
+                "63f47c85.a7fa6c",\r
+                "96258457.425ae8",\r
+                "f469e44d.0f84d",\r
+                "f7610f35.e81b98",\r
+                "d89362f7.406e48",\r
+                "87d9c57.361fa38",\r
+                "ab43f120.02b19",\r
+                "7042856b.1828cc",\r
+                "f434b230.257eb8",\r
+                "2ac41e54.9dfb2a",\r
+                "ebbe2f0a.10f36",\r
+                "7162acbd.73776c",\r
+                "2683d5ea.5fda52",\r
+                "da74bb6.e442948",\r
+                "feffc86e.486bc",\r
+                "12bfceb8.d75889",\r
+                "3b541994.2db38e",\r
+                "b3267f6f.ff1998",\r
+                "729e2fc5.81fb",\r
+                "62f42d2.2eff654"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e06cec26.4f9a08",\r
         "type": "execute",\r
         "name": "execute UUID generator for ethernet-service-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
         "outputs": 1,\r
         "x": 3435.883270263672,\r
         "y": 384.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a588efb1.b17fd",\r
+        "id": "fb96464b.51f05",\r
         "type": "execute",\r
         "name": "execute UUID generator for otn-tunnel-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",\r
         "outputs": 1,\r
         "x": 3416.883270263672,\r
         "y": 484.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "940f9aa.5464fe8",\r
+        "id": "2ac41e54.9dfb2a",\r
         "type": "set",\r
         "name": "set new ethernet-service-name",\r
         "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",\r
         "comments": "",\r
         "x": 3370.883270263672,\r
         "y": 535.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9c7e31dc.43bc2",\r
+        "id": "51750f01.3f406",\r
         "type": "set",\r
         "name": "set network-route-one",\r
         "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",\r
         "comments": "",\r
         "x": 3344.883270263672,\r
         "y": 584.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "64cc49aa.338118",\r
+        "id": "63f47c85.a7fa6c",\r
         "type": "set",\r
         "name": "set network-route-two",\r
         "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",\r
         "comments": "",\r
         "x": 3343.883270263672,\r
         "y": 633.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a266d487.c02dd",\r
+        "id": "96258457.425ae8",\r
         "type": "save",\r
         "name": "get network-route-one from aai",\r
         "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\">",\r
         "outputs": 1,\r
         "x": 3352.883270263672,\r
         "y": 771.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1276721a.95abce",\r
-                "59c480c0.a5bb2",\r
-                "56433b78.3dde04"\r
+                "9bd02754.7964a8",\r
+                "8e7e5fd2.7d02c8",\r
+                "6675b2ad.72fd8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1099f4d.7efe5",\r
+        "id": "f469e44d.0f84d",\r
         "type": "save",\r
         "name": "get network-route-two from aai",\r
         "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\">",\r
         "outputs": 1,\r
         "x": 3345.883270263672,\r
         "y": 832.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "194bfca3.59d3d3",\r
-                "f16b27ad.e4a0d",\r
-                "a3a5e961.07f0a"\r
+                "772ff0fe.2f34f",\r
+                "8d67ee85.1205f",\r
+                "96627f08.cbe71"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1276721a.95abce",\r
+        "id": "9bd02754.7964a8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 3601.883026123047,\r
         "y": 666.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5d3d475c.e8e038"\r
+                "4d13468a.d3ecb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59c480c0.a5bb2",\r
+        "id": "8e7e5fd2.7d02c8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 3595.392059326172,\r
         "y": 707.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c3e2bb46.01e6a"\r
+                "ff1b9a29.a11d98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56433b78.3dde04",\r
+        "id": "6675b2ad.72fd8c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3590.392059326172,\r
         "y": 757.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1b66d741.6f4631"\r
+                "97bfc6e9.fba1d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d3d475c.e8e038",\r
+        "id": "4d13468a.d3ecb8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3750.454559326172,\r
         "y": 665.571533203125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c3e2bb46.01e6a",\r
+        "id": "ff1b9a29.a11d98",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3740.392059326172,\r
         "y": 715.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "194bfca3.59d3d3",\r
+        "id": "772ff0fe.2f34f",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 3566.883270263672,\r
         "y": 818.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "8a4c46dd.2c996"\r
+                "d6ce8ecd.6264d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f16b27ad.e4a0d",\r
+        "id": "8d67ee85.1205f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 3562.392303466797,\r
         "y": 867.711669921875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "171f1743.fcb899"\r
+                "cdc0e121.35daf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3a5e961.07f0a",\r
+        "id": "96627f08.cbe71",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3563.392303466797,\r
         "y": 920.711669921875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c731b8e7.238d38"\r
+                "58d9f56e.c48314"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a4c46dd.2c996",\r
+        "id": "d6ce8ecd.6264d",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3719.4546508789062,\r
         "y": 823.5714111328125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "171f1743.fcb899",\r
+        "id": "cdc0e121.35daf",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3705.392303466797,\r
         "y": 867.711669921875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b66d741.6f4631",\r
+        "id": "97bfc6e9.fba1d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 3762.883026123047,\r
         "y": 768.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "cecd018.605a88"\r
+                "15d53662.387c32"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c731b8e7.238d38",\r
+        "id": "58d9f56e.c48314",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 3716.883270263672,\r
         "y": 920.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f9f52da3.b95878"\r
+                "46dc8745.e3cd18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cecd018.605a88",\r
+        "id": "15d53662.387c32",\r
         "type": "switchNode",\r
         "name": "switch nr type",\r
         "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",\r
         "outputs": 1,\r
         "x": 3923.883270263672,\r
         "y": 655.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f0539c95.2ea1d",\r
-                "44b1b904.08834",\r
-                "41d8ce05.5caae"\r
+                "5f27def0.590658",\r
+                "b4572ec6.b95d6",\r
+                "50bdde17.ca9b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9f52da3.b95878",\r
+        "id": "46dc8745.e3cd18",\r
         "type": "switchNode",\r
         "name": "switch nr type",\r
         "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",\r
         "outputs": 1,\r
         "x": 3915.883270263672,\r
         "y": 840.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "abd0f375.c30ff",\r
-                "eba9832a.ffee4",\r
-                "4bc67983.47c6f"\r
+                "be87179f.d632f8",\r
+                "ace0b3c8.e628e",\r
+                "f2575655.f8e378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0539c95.2ea1d",\r
+        "id": "5f27def0.590658",\r
         "type": "outcome",\r
         "name": "ROOT",\r
         "xml": "<outcome value='ROOT'>\n",\r
         "outputs": 1,\r
         "x": 4147.883758544922,\r
         "y": 359.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "653aef18.035f68"\r
+                "61b5f01d.b80d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44b1b904.08834",\r
+        "id": "b4572ec6.b95d6",\r
         "type": "outcome",\r
         "name": "LEAF",\r
         "xml": "<outcome value='LEAF'>\n",\r
         "outputs": 1,\r
         "x": 4149.883758544922,\r
         "y": 413.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "4456e14a.c61538"\r
+                "c4a12276.3b1638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abd0f375.c30ff",\r
+        "id": "be87179f.d632f8",\r
         "type": "outcome",\r
         "name": "ROOT",\r
         "xml": "<outcome value='ROOT'>\n",\r
         "outputs": 1,\r
         "x": 4113.883758544922,\r
         "y": 619.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "dc25cb2f.e0da48"\r
+                "d3817023.608058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eba9832a.ffee4",\r
+        "id": "ace0b3c8.e628e",\r
         "type": "outcome",\r
         "name": "LEAF",\r
         "xml": "<outcome value='LEAF'>\n",\r
         "outputs": 1,\r
         "x": 4115.883758544922,\r
         "y": 673.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7b200b08.d1724c"\r
+                "515f06a6.62b11"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a11ab8.c3c2f548",\r
+        "id": "be2b27bb.08a9c8",\r
         "type": "set",\r
         "name": "set network-route-ROOT",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4457.883758544922,\r
         "y": 311.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7e53eaf1.53c434",\r
+        "id": "b06c3c05.9b2298",\r
         "type": "set",\r
         "name": "set network-route-LEAF",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4450.883758544922,\r
         "y": 409.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "231b0ffb.372688",\r
+        "id": "d2d6cd47.633ea8",\r
         "type": "set",\r
         "name": "set network-route-ROOT",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4429.883758544922,\r
         "y": 592.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b4ef1ae.221bae",\r
+        "id": "1e090814.77ece",\r
         "type": "set",\r
         "name": "set network-route-LEAF",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4433.883758544922,\r
         "y": 685.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f61c43e6.4dbe28",\r
+        "id": "6f64ab1a.72d4ac",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3609.88330078125,\r
         "y": 1345.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "58e01c76.2a233c"\r
+                "fcfd7965.d24e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f239d755.e3888",\r
+        "id": "670e6fe3.827898",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 3619.374267578125,\r
         "y": 1387.8598022460938,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ffe24b12.95af4"\r
+                "329f67fd.7314c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7fecb9.d188bb48",\r
+        "id": "69392cc6.84928c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 3607.88330078125,\r
         "y": 1434.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6af9609c.4c1ea"\r
+                "a3d0ff69.d983b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6132f0e6.1cd1a8",\r
+        "id": "dee477e6.792e68",\r
         "type": "comment",\r
         "name": "Question?",\r
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
         "comments": "",\r
         "x": 3309.88330078125,\r
         "y": 1307.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4618e1c0.461d88",\r
+        "id": "d89362f7.406e48",\r
         "type": "save",\r
         "name": "get p-interface-src from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 3352.88330078125,\r
         "y": 1372.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f61c43e6.4dbe28",\r
-                "f239d755.e3888",\r
-                "7fecb9.d188bb48"\r
+                "6f64ab1a.72d4ac",\r
+                "670e6fe3.827898",\r
+                "69392cc6.84928c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6aa3951e.157a4c",\r
+        "id": "f7610f35.e81b98",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "outputs": 1,\r
         "x": 3353.883270263672,\r
         "y": 1124.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "273ca4a1.1ba064",\r
-                "4a30eba.076bb14"\r
+                "c7f5f619.d51258",\r
+                "a4e5ad2b.c867e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a30eba.076bb14",\r
+        "id": "a4e5ad2b.c867e",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3576.883270263672,\r
         "y": 1110.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "3b0c1a6c.5d807e"\r
+                "8e8c42f1.638b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "273ca4a1.1ba064",\r
+        "id": "c7f5f619.d51258",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 3578.883270263672,\r
         "y": 1143.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1277d9f.69171a6"\r
+                "5f49f3a7.a8042c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58e01c76.2a233c",\r
+        "id": "fcfd7965.d24e6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 3782.5498046875,\r
         "y": 1344.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f718a065.a6f86",\r
-                "66055190.fb6538"\r
+                "6f4130f2.684b3",\r
+                "363079f1.761036"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffe24b12.95af4",\r
+        "id": "329f67fd.7314c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3772.9456787109375,\r
         "y": 1391.1455383300781,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6af9609c.4c1ea",\r
+        "id": "a3d0ff69.d983b",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3776.88330078125,\r
         "y": 1435.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f718a065.a6f86",\r
+        "id": "6f4130f2.684b3",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "outputs": 1,\r
         "x": 4046.88330078125,\r
         "y": 1328.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "97c35025.9a9a9",\r
-                "3a478d5e.f8179a"\r
+                "1e584023.51383",\r
+                "f8d90041.f96538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a478d5e.f8179a",\r
+        "id": "f8d90041.f96538",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4269.88330078125,\r
         "y": 1283.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e66b8dbe.739f2"\r
+                "9697fa74.602bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "97c35025.9a9a9",\r
+        "id": "1e584023.51383",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 4271.88330078125,\r
         "y": 1347.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "8b5a4d36.3a2bb8"\r
+                "c43abb24.f757f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b5a4d36.3a2bb8",\r
+        "id": "c43abb24.f757f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 4433.88330078125,\r
         "y": 1343.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e66b8dbe.739f2",\r
+        "id": "9697fa74.602bc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4434.88330078125,\r
         "y": 1280.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9ab6076f.b64fb",\r
-                "39801818.ba2ad"\r
+                "3aa59d52.2c8e1a",\r
+                "83c5954c.7a838"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1277d9f.69171a6",\r
+        "id": "5f49f3a7.a8042c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 3721.883270263672,\r
         "y": 1140.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3b0c1a6c.5d807e",\r
+        "id": "8e8c42f1.638b2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 3724.883270263672,\r
         "y": 1103.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "67f68b93.dc06f4",\r
-                "41f439c7.6c07f8"\r
+                "3b3764ed.353b8c",\r
+                "1fd3d7ac.934188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67f68b93.dc06f4",\r
+        "id": "3b3764ed.353b8c",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 3916.883270263672,\r
         "y": 1105.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "66055190.fb6538",\r
+        "id": "363079f1.761036",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 4006.88330078125,\r
         "y": 1460.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c328fdc0.a05af"\r
+                "9254521f.b3181"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c328fdc0.a05af",\r
+        "id": "9254521f.b3181",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 4212.88330078125,\r
         "y": 1460.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "23ec2727.c8e7f"\r
+                "4418ce2f.a0c9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23ec2727.c8e7f",\r
+        "id": "4418ce2f.a0c9d",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "outputs": 1,\r
         "x": 4428.1689453125,\r
         "y": 1460.1075439453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e1b77e00.282c4"\r
+                "8ea77952.a62e58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41f439c7.6c07f8",\r
+        "id": "1fd3d7ac.934188",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "outputs": 1,\r
         "x": 3913.883270263672,\r
         "y": 1170.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "89a8d2d0.88f3",\r
-                "6334a351.696854",\r
-                "c542e0e0.bf42b"\r
+                "8290c612.7a239",\r
+                "966ac70d.6028c8",\r
+                "1ce11a36.13fbae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89a8d2d0.88f3",\r
+        "id": "8290c612.7a239",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4109.383392333984,\r
         "y": 1122.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c62cbf2d.6fa458"\r
+                "14e203c.361db7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6334a351.696854",\r
+        "id": "966ac70d.6028c8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 4101.383392333984,\r
         "y": 1177.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "143c4bf3.014b4c"\r
+                "ed056b5d.302798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c542e0e0.bf42b",\r
+        "id": "1ce11a36.13fbae",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 4106.383392333984,\r
         "y": 1234.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ca788cf9.3c8038"\r
+                "cd3e83f.158db8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca788cf9.3c8038",\r
+        "id": "cd3e83f.158db8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4258.383392333984,\r
         "y": 1235.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "143c4bf3.014b4c",\r
+        "id": "ed056b5d.302798",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4269.383392333984,\r
         "y": 1180.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c62cbf2d.6fa458",\r
+        "id": "14e203c.361db7c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4253.765716552734,\r
         "y": 1119.9414367675781,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "aab3feab.bcb5b"\r
+                "618a03ad.e0bdc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aab3feab.bcb5b",\r
+        "id": "618a03ad.e0bdc4",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 4447.883270263672,\r
         "y": 1164.2857055664062,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ac9dba33.9ee3a8"\r
+                "2cbaaf2e.c8d728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39801818.ba2ad",\r
+        "id": "83c5954c.7a838",\r
         "type": "set",\r
         "name": "set ltpId",\r
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",\r
         "comments": "",\r
         "x": 4604.88330078125,\r
         "y": 1238.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9ab6076f.b64fb",\r
+        "id": "3aa59d52.2c8e1a",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",\r
         "comments": "",\r
         "x": 4605.88330078125,\r
         "y": 1346.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6381354a.11146c",\r
+        "id": "7cc13839.b2e03",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "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",\r
         "comments": "",\r
         "x": 4606.88330078125,\r
         "y": 1295.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e1b77e00.282c4",\r
+        "id": "8ea77952.a62e58",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4635.00048828125,\r
         "y": 1460.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a1ad6a91.cdad1",\r
-                "bef51671.772a1",\r
-                "55e08f7a.b87978"\r
+                "f27b51c4.4be918",\r
+                "106457d2.e488d",\r
+                "3867b2c0.836c9e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1ad6a91.cdad1",\r
+        "id": "f27b51c4.4be918",\r
         "type": "set",\r
         "name": "set source ttp-id",\r
         "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",\r
         "comments": "",\r
         "x": 4850.00048828125,\r
         "y": 1422.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bef51671.772a1",\r
+        "id": "106457d2.e488d",\r
         "type": "get-resource",\r
         "name": "get-resource src TTP",\r
         "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",\r
         "outputs": 1,\r
         "x": 4847.00048828125,\r
         "y": 1461.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "db81e8e0.68e13"\r
+                "d07dc21f.bf396"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55e08f7a.b87978",\r
+        "id": "3867b2c0.836c9e",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4802.50048828125,\r
         "y": 1503.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "db81e8e0.68e13",\r
+        "id": "d07dc21f.bf396",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 5027.50048828125,\r
         "y": 1460.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "52661a57.fe0a3c"\r
+                "a0338f35.aa887"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "409a042d.2fadac",\r
+        "id": "7ad015c9.163974",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "outputs": 1,\r
         "x": 4835.88330078125,\r
         "y": 1056.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f76f51b8.a98b3"\r
+                "79e701a7.e6bda"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f76f51b8.a98b3",\r
+        "id": "79e701a7.e6bda",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5012.88330078125,\r
         "y": 1048.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f1cd5bd3.ddbdb8",\r
-                "b8b89faf.7ac19"\r
+                "74575ab5.dab66c",\r
+                "bb3b928a.241048"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac9dba33.9ee3a8",\r
+        "id": "2cbaaf2e.c8d728",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 4638.883270263672,\r
         "y": 1154.2857055664062,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "409a042d.2fadac",\r
-                "80f5aaec.b0ffc8"\r
+                "7ad015c9.163974",\r
+                "67f00ea1.c4a38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80f5aaec.b0ffc8",\r
+        "id": "67f00ea1.c4a38",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "outputs": 1,\r
         "x": 4838.88330078125,\r
         "y": 1130.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "bf72647d.49f538"\r
+                "b8dbf273.d60738"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf72647d.49f538",\r
+        "id": "b8dbf273.d60738",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5015.88330078125,\r
         "y": 1122.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "97239b14.6f12c8"\r
+                "36a761a6.6edbc6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "52661a57.fe0a3c",\r
+        "id": "a0338f35.aa887",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5185.50048828125,\r
         "y": 1460.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5700a19e.1dbeb8"\r
+                "ac7f5dcb.abfbe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5700a19e.1dbeb8",\r
+        "id": "ac7f5dcb.abfbe",\r
         "type": "set",\r
         "name": "set source tunnel tp ip",\r
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
         "x": 5392.50048828125,\r
         "y": 1460.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b8b89faf.7ac19",\r
+        "id": "bb3b928a.241048",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "outputs": 1,\r
         "x": 5220.88330078125,\r
         "y": 1055.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5d74c4c9.fd207c",\r
-                "bdb7d238.f96a08",\r
-                "7cf71a83.19030c"\r
+                "14a2b948.3a7307",\r
+                "4db5fa80.8a7584",\r
+                "1d1f45c7.aa8332"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1cd5bd3.ddbdb8",\r
+        "id": "74575ab5.dab66c",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainA id",\r
         "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",\r
         "comments": "",\r
         "x": 5250.88330078125,\r
         "y": 1003.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5d74c4c9.fd207c",\r
+        "id": "14a2b948.3a7307",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 5430.88330078125,\r
         "y": 1046.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e430f4b5.90b5d"\r
+                "755aafd7.9f4fa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bdb7d238.f96a08",\r
+        "id": "4db5fa80.8a7584",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 5422.88330078125,\r
         "y": 1101.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "46b0e213.0f69d4"\r
+                "70535561.166e44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7cf71a83.19030c",\r
+        "id": "1d1f45c7.aa8332",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 5427.88330078125,\r
         "y": 1158.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "99bfc958.cc2928"\r
+                "91b4ba95.e0ecd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99bfc958.cc2928",\r
+        "id": "91b4ba95.e0ecd8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 5579.88330078125,\r
         "y": 1159.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46b0e213.0f69d4",\r
+        "id": "70535561.166e44",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 5590.88330078125,\r
         "y": 1104.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e430f4b5.90b5d",\r
+        "id": "755aafd7.9f4fa8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 5575.265625,\r
         "y": 1043.9414367675781,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "3d0751e6.cf382e"\r
+                "be3e1006.2c5ef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "97239b14.6f12c8",\r
+        "id": "36a761a6.6edbc6",\r
         "type": "set",\r
         "name": "set domainA ethernet layer network-id",\r
         "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",\r
         "comments": "",\r
         "x": 5250.88330078125,\r
         "y": 1246.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d0751e6.cf382e",\r
+        "id": "be3e1006.2c5ef",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "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",\r
         "comments": "",\r
         "x": 5789.88330078125,\r
         "y": 1040.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "33b11d1b.98a69a",\r
+        "id": "9e818253.3db4c8",\r
         "type": "set",\r
         "name": "set network-route-B",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4445.883758544922,\r
         "y": 347.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2dc9cffb.3878b8",\r
+        "id": "e41aea83.6c1b9",\r
         "type": "set",\r
         "name": "set network-route-A",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4446.883728027344,\r
         "y": 451.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "653aef18.035f68",\r
+        "id": "61b5f01d.b80d4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4270.883758544922,\r
         "y": 353.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a11ab8.c3c2f548",\r
-                "33b11d1b.98a69a"\r
+                "be2b27bb.08a9c8",\r
+                "9e818253.3db4c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4456e14a.c61538",\r
+        "id": "c4a12276.3b1638",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4276.883758544922,\r
         "y": 417.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7e53eaf1.53c434",\r
-                "2dc9cffb.3878b8"\r
+                "b06c3c05.9b2298",\r
+                "e41aea83.6c1b9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc25cb2f.e0da48",\r
+        "id": "d3817023.608058",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4241.883758544922,\r
         "y": 619.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "231b0ffb.372688",\r
-                "3979d153.538ee6"\r
+                "d2d6cd47.633ea8",\r
+                "8a84a541.05baa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b200b08.d1724c",\r
+        "id": "515f06a6.62b11",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4244.883758544922,\r
         "y": 672.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1b4ef1ae.221bae",\r
-                "49dc9fac.676fe"\r
+                "1e090814.77ece",\r
+                "f18416f.b59a2e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3979d153.538ee6",\r
+        "id": "8a84a541.05baa8",\r
         "type": "set",\r
         "name": "set network-route-B",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4415.883758544922,\r
         "y": 632.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "49dc9fac.676fe",\r
+        "id": "f18416f.b59a2e8",\r
         "type": "set",\r
         "name": "set network-route-A",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4418.883758544922,\r
         "y": 723.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f7cb7391.6f67a",\r
+        "id": "e3b8353b.1a716",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 3741.88330078125,\r
         "y": 1802.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9a5ca37c.910178",\r
-                "2a8d98c8.2c78a"\r
+                "ff7eb3f1.2b5db",\r
+                "e41a1903.8d6c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd44019f.688f6",\r
+        "id": "cfbe25d.9897558",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3569.216796875,\r
         "y": 1803.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f7cb7391.6f67a"\r
+                "e3b8353b.1a716"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3eb019bb.1ee706",\r
+        "id": "c7184b04.7c3a48",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 3578.707763671875,\r
         "y": 1845.8599243164062,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f4d10bee.1b32c"\r
+                "1df80989.06ffa6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef74e13b.116b3",\r
+        "id": "6421e4be.cfd334",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 3567.216796875,\r
         "y": 1892.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7a977b6c.124a74"\r
+                "61347385.0e669c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4d10bee.1b32c",\r
+        "id": "1df80989.06ffa6",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3732.2791748046875,\r
         "y": 1849.1456604003906,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a977b6c.124a74",\r
+        "id": "61347385.0e669c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3736.216796875,\r
         "y": 1893.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9a5ca37c.910178",\r
+        "id": "ff7eb3f1.2b5db",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "outputs": 1,\r
         "x": 4028.216796875,\r
         "y": 1806.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "efd0a9b7.e547a8",\r
-                "caaf5e66.b1cb"\r
+                "2c9a5d35.edc2ea",\r
+                "e16f62ba.253eb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "caaf5e66.b1cb",\r
+        "id": "e16f62ba.253eb",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4251.216796875,\r
         "y": 1761.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5ec876cd.f1dea8"\r
+                "9d889672.fd9088"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "efd0a9b7.e547a8",\r
+        "id": "2c9a5d35.edc2ea",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 4253.216796875,\r
         "y": 1825.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "72d34df6.13ce64"\r
+                "67c6ff18.c6a758"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72d34df6.13ce64",\r
+        "id": "67c6ff18.c6a758",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 4412.216796875,\r
         "y": 1844.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5ec876cd.f1dea8",\r
+        "id": "9d889672.fd9088",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4416.216796875,\r
         "y": 1758.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2854b6e2.b50402",\r
-                "1fbd987b.e2c578"\r
+                "acf9d743.7735b8",\r
+                "dd400cb5.f9a5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eef6ad07.9c7d5",\r
+        "id": "ab43f120.02b19",\r
         "type": "save",\r
         "name": "get p-interface-dst from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 3341.216796875,\r
         "y": 1838.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "fd44019f.688f6",\r
-                "3eb019bb.1ee706",\r
-                "ef74e13b.116b3"\r
+                "cfbe25d.9897558",\r
+                "c7184b04.7c3a48",\r
+                "6421e4be.cfd334"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46101f8f.1fb8b8",\r
+        "id": "443ec13c.3b1388",\r
         "type": "comment",\r
         "name": "Question?",\r
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
         "comments": "",\r
         "x": 3302.216796875,\r
         "y": 1782.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d38e0865.514348",\r
+        "id": "87d9c57.361fa38",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "outputs": 1,\r
         "x": 3353.216796875,\r
         "y": 1577.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f536d783.2e1028",\r
-                "54ea75a9.fca1c4"\r
+                "47939321.8d0314",\r
+                "28e1d4e9.ca62fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54ea75a9.fca1c4",\r
+        "id": "28e1d4e9.ca62fc",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3576.216796875,\r
         "y": 1563.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "3ffa66c6.048e62"\r
+                "97457e61.73e3d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f536d783.2e1028",\r
+        "id": "47939321.8d0314",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 3578.216796875,\r
         "y": 1596.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "73c7be78.48771"\r
+                "4d6d8144.ded038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73c7be78.48771",\r
+        "id": "4d6d8144.ded038",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 3721.216796875,\r
         "y": 1593.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3ffa66c6.048e62",\r
+        "id": "97457e61.73e3d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 3724.216796875,\r
         "y": 1556.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "116bcef1.41b689",\r
-                "bd9fbc09.ccb15"\r
+                "a9d92823.960608",\r
+                "aea3c9c3.593308"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "116bcef1.41b689",\r
+        "id": "a9d92823.960608",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 3918.216796875,\r
         "y": 1559.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a8d98c8.2c78a",\r
+        "id": "e41a1903.8d6c4",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 3969.216766357422,\r
         "y": 1939.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "821e2eef.7d9ce8"\r
+                "6ce2701b.388768"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "821e2eef.7d9ce8",\r
+        "id": "6ce2701b.388768",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 4175.216766357422,\r
         "y": 1939.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b9228d23.f35b1"\r
+                "879de70.58c1218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9228d23.f35b1",\r
+        "id": "879de70.58c1218",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "outputs": 1,\r
         "x": 4392.502410888672,\r
         "y": 1938.1075439453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1db12922.ce9147"\r
+                "3d45c8a4.47e81"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd9fbc09.ccb15",\r
+        "id": "aea3c9c3.593308",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "outputs": 1,\r
         "x": 3940.216796875,\r
         "y": 1627.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "71a75cfd.cb2324",\r
-                "c5a92d1c.748898",\r
-                "d4c41231.0d38f"\r
+                "ce24caf2.6cde98",\r
+                "b9bbe7dc.00f29",\r
+                "76cad8df.00ad38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71a75cfd.cb2324",\r
+        "id": "ce24caf2.6cde98",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4135.7169189453125,\r
         "y": 1579.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "55c143a3.bf5e9c"\r
+                "c03aa3dc.16bd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5a92d1c.748898",\r
+        "id": "b9bbe7dc.00f29",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 4127.7169189453125,\r
         "y": 1634.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a19a5afd.bfc2c"\r
+                "c287be98.ae3d3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4c41231.0d38f",\r
+        "id": "76cad8df.00ad38",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 4132.7169189453125,\r
         "y": 1691.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5c56b620.c82d88"\r
+                "eb7ced2b.1fef2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c56b620.c82d88",\r
+        "id": "eb7ced2b.1fef2",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4284.7169189453125,\r
         "y": 1692.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a19a5afd.bfc2c",\r
+        "id": "c287be98.ae3d3",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4295.7169189453125,\r
         "y": 1637.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "55c143a3.bf5e9c",\r
+        "id": "c03aa3dc.16bd",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4280.0992431640625,\r
         "y": 1576.9415588378906,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "79a34acd.c9a0bc"\r
+                "5afd22fd.80941c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2854b6e2.b50402",\r
+        "id": "acf9d743.7735b8",\r
         "type": "set",\r
         "name": "set ltpId",\r
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",\r
         "comments": "",\r
         "x": 4586.216796875,\r
         "y": 1719.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1fbd987b.e2c578",\r
+        "id": "dd400cb5.f9a5e",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",\r
         "comments": "",\r
         "x": 4587.216796875,\r
         "y": 1824.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8823cb9b.b21f5",\r
+        "id": "d2c0902b.6c4ea",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "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",\r
         "comments": "",\r
         "x": 4582.216796875,\r
         "y": 1773.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1db12922.ce9147",\r
+        "id": "3d45c8a4.47e81",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4599.333953857422,\r
         "y": 1927.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "4fe8713d.4f503",\r
-                "c4b73dd8.f86748",\r
-                "cf5e37a1.834b48"\r
+                "616411e3.181da",\r
+                "d5236702.85efc8",\r
+                "63f505ec.f0050c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4fe8713d.4f503",\r
+        "id": "616411e3.181da",\r
         "type": "set",\r
         "name": "set destination ttp-id",\r
         "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",\r
         "comments": "",\r
         "x": 4814.333953857422,\r
         "y": 1889.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c4b73dd8.f86748",\r
+        "id": "d5236702.85efc8",\r
         "type": "get-resource",\r
         "name": "get-resource src TTP",\r
         "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",\r
         "outputs": 1,\r
         "x": 4811.333953857422,\r
         "y": 1928.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "fd454717.5864e8"\r
+                "e9e8b1b.05378d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf5e37a1.834b48",\r
+        "id": "63f505ec.f0050c",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4766.833953857422,\r
         "y": 1970.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fd454717.5864e8",\r
+        "id": "e9e8b1b.05378d",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4991.833953857422,\r
         "y": 1927.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6021f32a.54d8fc"\r
+                "9850361c.da76c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6021f32a.54d8fc",\r
+        "id": "9850361c.da76c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5149.833953857422,\r
         "y": 1927.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1a613df3.ff444a"\r
+                "db66a9b.93619d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a613df3.ff444a",\r
+        "id": "db66a9b.93619d8",\r
         "type": "set",\r
         "name": "set destination tunnel tp ip",\r
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
         "x": 5356.833953857422,\r
         "y": 1927.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1465bad2.a0d805",\r
+        "id": "84b58dac.88eef8",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "outputs": 1,\r
         "x": 4862.216796875,\r
         "y": 1595.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f75a0195.2a4c5"\r
+                "26e5751a.9712e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f75a0195.2a4c5",\r
+        "id": "26e5751a.9712e2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5039.216796875,\r
         "y": 1587.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1de23279.e8bad6",\r
-                "95237093.1f1c18"\r
+                "6aba367d.688578",\r
+                "e91a3d87.4731c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79a34acd.c9a0bc",\r
+        "id": "5afd22fd.80941c",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 4464.216796875,\r
         "y": 1591.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b5cddb2a.47fb5"\r
+                "c4ef25e3.8547c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5cddb2a.47fb5",\r
+        "id": "c4ef25e3.8547c",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 4659.216796875,\r
         "y": 1591.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1465bad2.a0d805",\r
-                "a6e303e4.3eb668"\r
+                "84b58dac.88eef8",\r
+                "70651805.f7aa38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "95237093.1f1c18",\r
+        "id": "e91a3d87.4731c",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "outputs": 1,\r
         "x": 5247.216796875,\r
         "y": 1594.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2d3d2acb.c107b6",\r
-                "fb5337e0.94ced8",\r
-                "752448e6.ec72a8"\r
+                "52bb494b.9e9548",\r
+                "1f1e43c3.bd50ac",\r
+                "27bf06a9.82b122"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6879e9be.d7aee",\r
+        "id": "13e72829.65bf18",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5041.216796875,\r
         "y": 1660.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "8691b2ec.22b9d8"\r
+                "f997c96d.8efde"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6e303e4.3eb668",\r
+        "id": "70651805.f7aa38",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "outputs": 1,\r
         "x": 4864.216796875,\r
         "y": 1668.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6879e9be.d7aee"\r
+                "13e72829.65bf18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1de23279.e8bad6",\r
+        "id": "6aba367d.688578",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainB id",\r
         "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",\r
         "comments": "",\r
         "x": 5277.216796875,\r
         "y": 1542.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8691b2ec.22b9d8",\r
+        "id": "f997c96d.8efde",\r
         "type": "set",\r
         "name": "set domainB ethernet layer network-id",\r
         "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",\r
         "comments": "",\r
         "x": 5254.216796875,\r
         "y": 1726.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d3d2acb.c107b6",\r
+        "id": "52bb494b.9e9548",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 5457.216796875,\r
         "y": 1585.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a3e7410.2b3c44"\r
+                "32b0560b.723342"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fb5337e0.94ced8",\r
+        "id": "1f1e43c3.bd50ac",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 5449.216796875,\r
         "y": 1640.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "656cbbf6.41438c"\r
+                "6c345a14.f54524"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "752448e6.ec72a8",\r
+        "id": "27bf06a9.82b122",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 5454.216796875,\r
         "y": 1697.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6bb525a1.9cb52c"\r
+                "6641f5b5.b5523c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6bb525a1.9cb52c",\r
+        "id": "6641f5b5.b5523c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 5606.216796875,\r
         "y": 1698.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "656cbbf6.41438c",\r
+        "id": "6c345a14.f54524",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 5617.216796875,\r
         "y": 1643.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a3e7410.2b3c44",\r
+        "id": "32b0560b.723342",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 5601.59912109375,\r
         "y": 1582.9415588378906,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "99742e42.2fdbd8"\r
+                "1b5e2086.1509ff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99742e42.2fdbd8",\r
+        "id": "1b5e2086.1509ff",\r
         "type": "set",\r
         "name": "set controller domainB data",\r
         "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",\r
         "comments": "",\r
         "x": 5816.216796875,\r
         "y": 1579.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "78d4922e.8ebe04",\r
+        "id": "7042856b.1828cc",\r
         "type": "set",\r
         "name": "set LEAF stuff",\r
         "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",\r
         "comments": "",\r
         "x": 3314.88330078125,\r
         "y": 1449.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c220ecdf.76a978",\r
+        "id": "f434b230.257eb8",\r
         "type": "set",\r
         "name": "set ROOT stuff",\r
         "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",\r
         "comments": "",\r
         "x": 3301.88330078125,\r
         "y": 1969.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b4f5dada.48378",\r
+        "id": "c9139602.db9618",\r
         "type": "execute",\r
         "name": "execute UUID generator for ethernet-service-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
         "outputs": 1,\r
         "x": 2426.883331298828,\r
         "y": 162.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5db562b1.71111c",\r
+        "id": "aadbe6b3.d2bba",\r
         "type": "set",\r
         "name": "set new ethernet-service-name",\r
         "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",\r
         "comments": "",\r
         "x": 2360.883331298828,\r
         "y": 198.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3f2dec8d.5c3844",\r
+        "id": "e7f44e9f.7383a",\r
         "type": "comment",\r
         "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",\r
         "info": "",\r
         "comments": "",\r
         "x": 2545.883331298828,\r
         "y": 125.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ae1ae92.9d4708",\r
+        "id": "106d7d06.a5399b",\r
         "type": "comment",\r
         "name": "NOT NEEDED ANYMORE?",\r
         "info": "",\r
         "comments": "",\r
         "x": 4072.88330078125,\r
         "y": 1427.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f4b4f4b0.73db2",\r
+        "id": "f63837b1.4cefc",\r
         "type": "comment",\r
         "name": "NOT NEEDED ANYMORE?",\r
         "info": "",\r
         "comments": "",\r
         "x": 4028.883270263672,\r
         "y": 1891.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4304e2aa.cc073c",\r
+        "id": "7226ce6d.bf87d8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 2737.8836669921875,\r
         "y": 7259.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f849984b.dddac",\r
+        "id": "56edb3ef.738a04",\r
         "type": "comment",\r
         "name": "START OF DELETE OPERATION",\r
         "info": "",\r
         "comments": "",\r
         "x": 3296.88330078125,\r
         "y": 2451.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ff6310d.2048a7",\r
+        "id": "3c54c8c2.c90b98",\r
         "type": "save",\r
         "name": "delete LEAF uni resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",\r
         "outputs": 1,\r
         "x": 3880.566650390625,\r
         "y": 2552.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "14f1d608.fff342",\r
+        "id": "ebbe2f0a.10f36",\r
         "type": "save",\r
         "name": "get LEAF uni from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 3251.566650390625,\r
         "y": 2532.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "30a4f59e.3fde12",\r
-                "98adc704.004778",\r
-                "91611e7f.d3eaa8"\r
+                "2be68b52.20aa24",\r
+                "81d3f50b.6c4d9",\r
+                "2035d36a.c81f14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "98adc704.004778",\r
+        "id": "81d3f50b.6c4d9",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 3479.0576171875,\r
         "y": 2505.2598266601562,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "94257401.34831"\r
+                "13ee2347.80286d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91611e7f.d3eaa8",\r
+        "id": "2035d36a.c81f14",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 3474.566650390625,\r
         "y": 2549.685791015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c2c26a41.57e9c"\r
+                "991792d0.e4e98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94257401.34831",\r
+        "id": "13ee2347.80286d",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3641.629150390625,\r
         "y": 2504.5455322265625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c2c26a41.57e9c",\r
+        "id": "991792d0.e4e98",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3642.566650390625,\r
         "y": 2549.685791015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "30a4f59e.3fde12",\r
+        "id": "2be68b52.20aa24",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3486.566650390625,\r
         "y": 2599.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "4d0f2575.137edc"\r
+                "f8565a8c.b30f28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d0f2575.137edc",\r
+        "id": "f8565a8c.b30f28",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "outputs": 1,\r
         "x": 3638.88330078125,\r
         "y": 2603.2857055664062,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "589d867c.eeacb",\r
-                "ff6310d.2048a7",\r
-                "84152b78.a442c8",\r
-                "1e88543b.84a814"\r
+                "133776d8.0b0dc9",\r
+                "3c54c8c2.c90b98",\r
+                "95fcacf8.b9d6a8",\r
+                "70f331ff.6983c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "589d867c.eeacb",\r
+        "id": "133776d8.0b0dc9",\r
         "type": "set",\r
         "name": "set bwToBeDecreased tpid cvlan",\r
         "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",\r
         "comments": "",\r
         "x": 3883.566650390625,\r
         "y": 2495.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "243640c4.1190f8",\r
+        "id": "5f7e58ce.54f7f8",\r
         "type": "comment",\r
         "name": "Update ROOT UNI's bw",\r
         "info": "",\r
         "comments": "",\r
         "x": 3845.566650390625,\r
         "y": 2606.4857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "83d2a0c.fbf83e",\r
+        "id": "9cf7d79b.0475e8",\r
         "type": "save",\r
         "name": "update ROOT UNI in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 4523.566650390625,\r
         "y": 2649.4857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "84152b78.a442c8",\r
+        "id": "95fcacf8.b9d6a8",\r
         "type": "save",\r
         "name": "get root uni from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 3837.56640625,\r
         "y": 2652.4857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ee63dcff.30bad",\r
-                "80208a9d.4e9bb",\r
-                "3e7ba9dc.c77e76"\r
+                "8e888721.2a9c48",\r
+                "ad21a1a0.49ccd8",\r
+                "92e1736a.a036e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80208a9d.4e9bb",\r
+        "id": "ad21a1a0.49ccd8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 4141.057373046875,\r
         "y": 2563.0596923828125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ee49c3d8.4041d8"\r
+                "b3d3b1a9.2b5fb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e7ba9dc.c77e76",\r
+        "id": "92e1736a.a036e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 4136.56640625,\r
         "y": 2607.4856567382812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e34757d5.3f1ff8"\r
+                "d5ecd5d7.ea0b88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee49c3d8.4041d8",\r
+        "id": "b3d3b1a9.2b5fb",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4303.62890625,\r
         "y": 2562.3453979492188,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e34757d5.3f1ff8",\r
+        "id": "d5ecd5d7.ea0b88",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 4304.56640625,\r
         "y": 2607.4856567382812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "be9d3338.5121d",\r
+        "id": "70cc9613.b0a74",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4301.56640625,\r
         "y": 2657.4857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "933a8e8f.7ef918",\r
-                "83d2a0c.fbf83e"\r
+                "b767bcd4.bb2b6",\r
+                "9cf7d79b.0475e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee63dcff.30bad",\r
+        "id": "8e888721.2a9c48",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4132.56640625,\r
         "y": 2657.4857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "be9d3338.5121d"\r
+                "70cc9613.b0a74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "933a8e8f.7ef918",\r
+        "id": "b767bcd4.bb2b6",\r
         "type": "set",\r
         "name": "set new bw",\r
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",\r
         "comments": "",\r
         "x": 4483.567138671875,\r
         "y": 2599.4857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "21e69316.d31a3c",\r
+        "id": "f9bbca0d.1c46f8",\r
         "type": "comment",\r
         "name": "Delete LEAF UNI",\r
         "info": "",\r
         "comments": "",\r
         "x": 3831.88330078125,\r
         "y": 2437.2857055664062,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "45cb1d93.9cef0c",\r
+        "id": "e994ec3a.2da648",\r
         "type": "set",\r
         "name": "set current-provider-id and current-cvlan-id",\r
         "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`' />-->",\r
         "comments": "",\r
         "x": 3311.749969482422,\r
         "y": 3769.8858032226562,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "95cc6144.fb6bd8",\r
+        "id": "fbbab64f.85fdd8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 3444.749969482422,\r
         "y": 3817.8858032226562,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "21aeddc1.06f77a",\r
+        "id": "33b02c47.fcccbc",\r
         "type": "switchNode",\r
         "name": "switch found-connectivity?",\r
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
         "outputs": 1,\r
         "x": 3266.749969482422,\r
         "y": 3869.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "218077ad.f30d3",\r
-                "a4239ce5.8829c"\r
+                "6fdf1010.01d5e",\r
+                "10c0f7ca.be20e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "218077ad.f30d3",\r
+        "id": "6fdf1010.01d5e",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 3459.749969482422,\r
         "y": 3870.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "dcbbe6d2.fa9028"\r
+                "7864f46c.db26a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dcbbe6d2.fa9028",\r
+        "id": "7864f46c.db26a4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3603.749969482422,\r
         "y": 3866.8858032226562,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a4239ce5.8829c",\r
+        "id": "10c0f7ca.be20e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 3463.749969482422,\r
         "y": 3914.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "338c28da.4908c8"\r
+                "8add2f88.61a8b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "338c28da.4908c8",\r
+        "id": "8add2f88.61a8b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "outputs": 1,\r
         "x": 3602.749969482422,\r
         "y": 3909.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "40a81b6.e879ce4",\r
-                "fe7c3ff6.ce34b8",\r
-                "af03ee84.d16068"\r
+                "9b6852b0.a93d98",\r
+                "b900318c.bfd908",\r
+                "4cb0c066.1db128"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40a81b6.e879ce4",\r
+        "id": "9b6852b0.a93d98",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 3853.149627685547,\r
         "y": 3918.2024536132812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "3fc00cbe.f344f4"\r
+                "54f58bcc.441714"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3fc00cbe.f344f4",\r
+        "id": "54f58bcc.441714",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 4075.149627685547,\r
         "y": 3896.2024536132812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "57d9d04a.beb888"\r
+                "7083e1.a84c342"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57d9d04a.beb888",\r
+        "id": "7083e1.a84c342",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "outputs": 1,\r
         "x": 4235.149139404297,\r
         "y": 3876.2024536132812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5fa67fdd.e511b8"\r
+                "94bd3415.1f22d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9bbd69a.136aa8",\r
+        "id": "c56c894c.5bdb1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4388.149658203125,\r
         "y": 3857.2024841308594,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "17e2ea6.f8df196",\r
-                "947c4850.aa8df"\r
+                "b6fdc844.b0e6b",\r
+                "1a640b2c.739935"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17e2ea6.f8df196",\r
+        "id": "b6fdc844.b0e6b",\r
         "type": "set",\r
         "name": "set tmp.stillHasUni to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",\r
         "comments": "",\r
         "x": 4584.649871826172,\r
         "y": 3825.2857055664062,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe7c3ff6.ce34b8",\r
+        "id": "b900318c.bfd908",\r
         "type": "set",\r
         "name": "set tmp.stillHasUn tmp.keepVPNBs to FALSE",\r
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='false' />\n<parameter name='tmp.keepVPNBs' value='false' />\n",\r
         "comments": "",\r
         "x": 3959.64990234375,\r
         "y": 3837.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af03ee84.d16068",\r
+        "id": "4cb0c066.1db128",\r
         "type": "switchNode",\r
         "name": "switch tmp.keepVPNBs?",\r
         "xml": "\n<switch test=\"`$tmp.keepVPNBs`\">\n\n",\r
         "outputs": 1,\r
         "x": 3767.64990234375,\r
         "y": 4258.285980224609,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "77a80484.fb13cc",\r
-                "a722846c.585ad"\r
+                "ae543eb1.206b4",\r
+                "219c19f6.cbd26e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "947c4850.aa8df",\r
+        "id": "1a640b2c.739935",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4552.88330078125,\r
         "y": 3893.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a722846c.585ad",\r
+        "id": "219c19f6.cbd26e",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 154.65066528320312,\r
         "y": 5322.286224365234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c0a1014a.3ea75"\r
+                "2520c605.40a22a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77a80484.fb13cc",\r
+        "id": "ae543eb1.206b4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 3988.650634765625,\r
         "y": 4360.285980224609,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "8774c38d.ee5b7"\r
+                "8fd13dc7.dbef3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8774c38d.ee5b7",\r
+        "id": "8fd13dc7.dbef3",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "outputs": 1,\r
         "x": 4131.650634765625,\r
         "y": 4356.285980224609,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f67d6e8d.c4ab",\r
-                "1d885097.bf6b2f",\r
-                "bd8e5c03.dfc108",\r
-                "19328269.e896be",\r
-                "93e60704.65dbd",\r
-                "8b3d1eff.18e008",\r
-                "ffd8a757.b8a3f",\r
-                "b33560b0.1278c",\r
-                "fc616200.2baf58"\r
+                "6c48a46d.6b2974",\r
+                "de8af5e.f07e288",\r
+                "5285a28b.38c8dc",\r
+                "2212222d.1721a6",\r
+                "b943d622.b35cc",\r
+                "467c3bf.71cfdc4",\r
+                "cdd12e42.2ba1b8",\r
+                "7f0c132f.b1df44",\r
+                "dc36b830.307698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c91ac5e.705b8",\r
+        "id": "86b26306.89d478",\r
         "type": "comment",\r
         "name": "keepVPNBs == false, then check tmp.stillHasUni",\r
         "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",\r
         "comments": "",\r
         "x": 181,\r
         "y": 5278.286224365234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa1b93d9.936e7",\r
+        "id": "10b960d7.987777",\r
         "type": "comment",\r
         "name": "There are still other UNIs in this connectivity that share same OLT node. Only update bw of the vpn-bindings involved",\r
         "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",\r
         "comments": "",\r
         "x": 4007.884033203125,\r
         "y": 4323.285980224609,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "30095233.787426",\r
+        "id": "e29766c.069bc98",\r
         "type": "set",\r
         "name": "set srcTtp OTN layer",\r
         "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",\r
         "comments": "",\r
         "x": 4820.667724609375,\r
         "y": 4514.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "298f2b5b.0aab2c",\r
+        "id": "70e9715b.943958",\r
         "type": "switchNode",\r
         "name": "switch provider-id domainA",\r
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",\r
         "outputs": 1,\r
         "x": 5165.667724609375,\r
         "y": 4376.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1597a82b.d6bf2"\r
+                "6e757b83.cb351c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1126bc47.b4d98c",\r
+        "id": "b42b3ac.1b570c8",\r
         "type": "for",\r
         "name": "for netwidx..allNetworksList_length",\r
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",\r
         "outputs": 1,\r
         "x": 4872.667724609375,\r
         "y": 4370.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "298f2b5b.0aab2c"\r
+                "70e9715b.943958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ba49429.2785d",\r
+        "id": "b4fe4da5.f121d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 5127.667724609375,\r
         "y": 4327.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ace3cbea.15731",\r
+        "id": "574f0028.fbd13",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
         "comments": "",\r
         "x": 4816.667724609375,\r
         "y": 4422.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1d3af694.aab3a1",\r
+        "id": "d130fc75.80466",\r
         "type": "set",\r
         "name": "set tmp.pce-src-node",\r
         "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]`\" />",\r
         "comments": "",\r
         "x": 4824.667724609375,\r
         "y": 4467.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a0d3acc.4e0354",\r
+        "id": "84c9d585.1543d",\r
         "type": "set",\r
         "name": "unset otnTopoIdSrc",\r
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
         "comments": "",\r
         "x": 4821.667724609375,\r
         "y": 4320.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1597a82b.d6bf2",\r
+        "id": "6e757b83.cb351c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 5074.667724609375,\r
         "y": 4444.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "247fb61.2b27f4a"\r
+                "c54be700.be4fd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "247fb61.2b27f4a",\r
+        "id": "c54be700.be4fd",\r
         "type": "switchNode",\r
         "name": "switch te-topo-id",\r
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",\r
         "outputs": 1,\r
         "x": 5259.667724609375,\r
         "y": 4443.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d2d679f0.fa9e7"\r
+                "820246eb.c84c18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d2d679f0.fa9e7",\r
+        "id": "820246eb.c84c18",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 5451.667724609375,\r
         "y": 4446.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7d11177c.7fa498"\r
+                "3a1b08b9.047658"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d11177c.7fa498",\r
+        "id": "3a1b08b9.047658",\r
         "type": "set",\r
         "name": "set otnTopoIdSrc",\r
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
         "comments": "",\r
         "x": 5623.667724609375,\r
         "y": 4442.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b338f208.2e8e8",\r
+        "id": "c9b94557.850d48",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 4999.667724609375,\r
         "y": 4557.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f67d6e8d.c4ab",\r
+        "id": "6c48a46d.6b2974",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4516.667724609375,\r
         "y": 4342.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6c238e2f.cfa52",\r
-                "97e28bb1.9f6bb8",\r
-                "ace3cbea.15731",\r
-                "1d3af694.aab3a1",\r
-                "30095233.787426",\r
-                "1126bc47.b4d98c",\r
-                "b338f208.2e8e8"\r
+                "2a754e6c.bbb83a",\r
+                "94fc5eb6.895cc",\r
+                "574f0028.fbd13",\r
+                "d130fc75.80466",\r
+                "e29766c.069bc98",\r
+                "b42b3ac.1b570c8",\r
+                "c9b94557.850d48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44415c7f.4f5f24",\r
+        "id": "cd78afa3.c104f8",\r
         "type": "comment",\r
         "name": "The following section is to find srcTtp OTN layer (its long name)",\r
         "info": "The following section is to find srcTtp OTN layer (its long name)",\r
         "comments": "",\r
         "x": 4501.667724609375,\r
         "y": 4276.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "97e28bb1.9f6bb8",\r
+        "id": "94fc5eb6.895cc",\r
         "type": "get-resource",\r
         "name": "get-resource network-resources-list",\r
         "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\" >",\r
         "outputs": 1,\r
         "x": 4880.667724609375,\r
         "y": 4263.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "153999c3.0eb42e",\r
-                "a208bb99.66b2e8",\r
-                "9ba49429.2785d"\r
+                "17a57be5.3979b4",\r
+                "670b39d7.0b3ba",\r
+                "b4fe4da5.f121d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "153999c3.0eb42e",\r
+        "id": "17a57be5.3979b4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 5116.667724609375,\r
         "y": 4246.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a208bb99.66b2e8",\r
+        "id": "670b39d7.0b3ba",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 5113.667724609375,\r
         "y": 4287.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6c238e2f.cfa52",\r
+        "id": "2a754e6c.bbb83a",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
         "comments": "",\r
         "x": 4829.667724609375,\r
         "y": 4220.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1d885097.bf6b2f",\r
+        "id": "de8af5e.f07e288",\r
         "type": "set",\r
         "name": "unset tmp.aai.all-vpn-bindings",\r
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",\r
         "comments": "",\r
         "x": 4336.667724609375,\r
         "y": 4674.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "582ea235.e6de1c",\r
+        "id": "afb6c845.26534",\r
         "type": "comment",\r
         "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",\r
         "info": "",\r
         "comments": "",\r
         "x": 4459.968017578125,\r
         "y": 4713.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bd8e5c03.dfc108",\r
+        "id": "5285a28b.38c8dc",\r
         "type": "save",\r
         "name": "get all-vpn-bindings from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 4357.968017578125,\r
         "y": 4748.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d0e71616.8c817",\r
-                "148e0bed.377164",\r
-                "3b175283.95d6be"\r
+                "c3de387c.6460a",\r
+                "b57ba7f8.c1c99",\r
+                "9da86502.5d643"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0e71616.8c817",\r
+        "id": "c3de387c.6460a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4562.968017578125,\r
         "y": 4745.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "39c739fc.a6fe6e"\r
+                "4e1f19c.9621d68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "148e0bed.377164",\r
+        "id": "b57ba7f8.c1c99",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 4546.458984375,\r
         "y": 4807.043365478516,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "3e1fb649.3101ea"\r
+                "ec0e24f9.a11f7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b175283.95d6be",\r
+        "id": "9da86502.5d643",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 4543.968017578125,\r
         "y": 4850.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "681b836.365687c"\r
+                "182c3589.c7acda"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39c739fc.a6fe6e",\r
+        "id": "4e1f19c.9621d68",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4730.96826171875,\r
         "y": 4740.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "93e92e1a.778be8"\r
+                "af4afceb.006698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e1fb649.3101ea",\r
+        "id": "ec0e24f9.a11f7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4709.0303955078125,\r
         "y": 4807.3291015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "681b836.365687c",\r
+        "id": "182c3589.c7acda",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 4710.968017578125,\r
         "y": 4849.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "93e92e1a.778be8",\r
+        "id": "af4afceb.006698",\r
         "type": "for",\r
         "name": "for vpnidx in all-vpn-bindings",\r
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
         "outputs": 1,\r
         "x": 4968.96826171875,\r
         "y": 4745.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "27f30922.4e6a66"\r
+                "31f75628.5330d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27f30922.4e6a66",\r
+        "id": "31f75628.5330d2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "outputs": 1,\r
         "x": 5202.968017578125,\r
         "y": 4752.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e449a33.b8b696"\r
+                "ceae5964.7d9d38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e77a7161.49d068",\r
+        "id": "b40ed0f.db80e3",\r
         "type": "comment",\r
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
         "info": "",\r
         "comments": "",\r
         "x": 5119.783935546875,\r
         "y": 4823.635650634766,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e449a33.b8b696",\r
+        "id": "ceae5964.7d9d38",\r
         "type": "switchNode",\r
         "name": "switch ops-note is srcTtpOtnLayer",\r
         "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",\r
         "outputs": 1,\r
         "x": 5063.783935546875,\r
         "y": 4872.635650634766,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "62a1336b.ab309c",\r
-                "57ed2482.36942c"\r
+                "5a8ad6ff.27624",\r
+                "4b278311.73bb1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57ed2482.36942c",\r
+        "id": "4b278311.73bb1c",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 5306.784423828125,\r
         "y": 4913.635162353516,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "62a1336b.ab309c",\r
+        "id": "5a8ad6ff.27624",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 5317.7841796875,\r
         "y": 4870.6353759765625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6f96293b.020fc"\r
+                "e95ba342.193f38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48fa24ff.a12f6c",\r
+        "id": "9b07993f.50303",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "outputs": 1,\r
         "x": 5544.767578125,\r
         "y": 4878.0518798828125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d949e407.7d96c8",\r
-                "ba00ef86.599998",\r
-                "e04480f3.8af1b"\r
+                "574e2cd3.b5ba0c",\r
+                "e0ae9339.0aa92",\r
+                "e02f1f89.ad2d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a4fcb041.b0aaf8",\r
+        "id": "c3321d25.6b65f",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 5709.8173828125,\r
         "y": 4763.052337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "dc33bc78.b33dc"\r
+                "88b3d964.1a518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc33bc78.b33dc",\r
+        "id": "88b3d964.1a518",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 5901.8173828125,\r
         "y": 4752.052581787109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "88251130.694fa8"\r
+                "949f67cc.1ebd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d949e407.7d96c8",\r
+        "id": "574e2cd3.b5ba0c",\r
         "type": "set",\r
         "name": "unset tmp.aai.the-vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",\r
         "comments": "",\r
         "x": 5658.334228515625,\r
         "y": 4653.269378662109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ba00ef86.599998",\r
+        "id": "e0ae9339.0aa92",\r
         "type": "set",\r
         "name": "set tmp.aai.the-vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
         "comments": "",\r
         "x": 5650.334228515625,\r
         "y": 4702.269378662109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e04480f3.8af1b",\r
+        "id": "e02f1f89.ad2d2",\r
         "type": "save",\r
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 5881.751220703125,\r
         "y": 4883.435394287109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e369ae1d.045348",\r
+        "id": "2481a087.0bf1c",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 5833.401123046875,\r
         "y": 4930.752288818359,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7bcaed73.c4335c",\r
+        "id": "f95d52e7.62b688",\r
         "type": "comment",\r
         "name": "decrease the bw of the-vpn-binding and change status to modified",\r
         "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",\r
         "comments": "",\r
         "x": 5905.751220703125,\r
         "y": 4844.435394287109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "88251130.694fa8",\r
+        "id": "949f67cc.1ebd",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "outputs": 1,\r
         "x": 6083.8173828125,\r
         "y": 4731.052581787109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "3faa0ed9.e49512"\r
+                "121ace63.3c455a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3faa0ed9.e49512",\r
+        "id": "121ace63.3c455a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 6245.8173828125,\r
         "y": 4720.052581787109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1f4e4f1d.0faeb9",\r
-                "71f57a2d.ed1434"\r
+                "776f73a4.7e64dc",\r
+                "1667f272.dd2c96"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f4e4f1d.0faeb9",\r
+        "id": "776f73a4.7e64dc",\r
         "type": "set",\r
         "name": "unset tmp.the-connectivity",\r
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",\r
         "comments": "",\r
         "x": 6442.8173828125,\r
         "y": 4649.052581787109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "71f57a2d.ed1434",\r
+        "id": "1667f272.dd2c96",\r
         "type": "set",\r
         "name": "set tmp.the-connectivity",\r
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",\r
         "comments": "",\r
         "x": 6440.2841796875,\r
         "y": 4748.269378662109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5e5dd175.2ee1b",\r
+        "id": "7162acbd.73776c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 3097.800048828125,\r
         "y": 3207.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "95f11825.f517d8",\r
+        "id": "2683d5ea.5fda52",\r
         "type": "switchNode",\r
         "name": "switch found-middle-man?",\r
         "xml": "<switch test='`$found-middle-man`'>\n",\r
         "outputs": 1,\r
         "x": 2974.800048828125,\r
         "y": 3317.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "eda02ee3.547818",\r
-                "24ae5a23.6efcde"\r
+                "111b3018.d0a418",\r
+                "b6f13f54.b0b718"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eda02ee3.547818",\r
+        "id": "111b3018.d0a418",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 3158.800048828125,\r
         "y": 3296.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "25d89b5b.fea624"\r
+                "d9364482.82062"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25d89b5b.fea624",\r
+        "id": "d9364482.82062",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "outputs": 1,\r
         "x": 3301.800048828125,\r
         "y": 3296.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a5e21959.30c488"\r
+                "cf188c9f.ecc3c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5e21959.30c488",\r
+        "id": "cf188c9f.ecc3c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3477.800048828125,\r
         "y": 3294.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24ae5a23.6efcde",\r
+        "id": "b6f13f54.b0b718",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 3156.800048828125,\r
         "y": 3351.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2aa846fb.1fdfe2"\r
+                "fa2c2e9e.fbd89"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2aa846fb.1fdfe2",\r
+        "id": "fa2c2e9e.fbd89",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "outputs": 1,\r
         "x": 3003.800048828125,\r
         "y": 3484.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "45cb1d93.9cef0c",\r
-                "95cc6144.fb6bd8",\r
-                "21aeddc1.06f77a",\r
-                "ab0940a1.911a68",\r
-                "6d6cc518.e0ec9c",\r
-                "3c679d7f.fbbb22"\r
+                "e994ec3a.2da648",\r
+                "fbbab64f.85fdd8",\r
+                "33b02c47.fcccbc",\r
+                "e05b8262.c1f5c8",\r
+                "b8b4eeda.6b348",\r
+                "3a07e59d.95a52a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "522b1854.031bc",\r
+        "id": "aa1b84fb.ddf7b",\r
         "type": "comment",\r
         "name": "Find LEAF connectivity",\r
         "info": "",\r
         "comments": "",\r
         "x": 3225.88330078125,\r
         "y": 3724.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ab0940a1.911a68",\r
+        "id": "e05b8262.c1f5c8",\r
         "type": "set",\r
         "name": "set tmp.MMstillHasUni to FALSE",\r
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='false' />\n",\r
         "comments": "",\r
         "x": 3308.333251953125,\r
         "y": 3497.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6d6cc518.e0ec9c",\r
+        "id": "b8b4eeda.6b348",\r
         "type": "for",\r
         "name": "for each relationship of middle-man-conn",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 3306.8330078125,\r
         "y": 3543.0025329589844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f5f202e7.9ae08"\r
+                "28597309.d39dac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5f202e7.9ae08",\r
+        "id": "28597309.d39dac",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 3569.8330078125,\r
         "y": 3538.0025329589844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "186eedb6.79ae82"\r
+                "d8dec514.e87428"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "186eedb6.79ae82",\r
+        "id": "d8dec514.e87428",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "outputs": 1,\r
         "x": 3729.83251953125,\r
         "y": 3518.0025329589844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e8fee7bd.fc2ef8"\r
+                "5a2012d5.a1cef4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "774ecc4a.3ad124",\r
+        "id": "3416f94d.d55766",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5066.834228515625,\r
         "y": 3549.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9464a805.69d21",\r
-                "af3bd9a1.948688",\r
-                "da386631.67d8c8"\r
+                "d47c10e5.abb1a",\r
+                "37972450.3f34e4",\r
+                "9d62dddf.19f4b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9464a805.69d21",\r
+        "id": "d47c10e5.abb1a",\r
         "type": "set",\r
         "name": "set tmp.MMstillHasUni to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='true' />\n",\r
         "comments": "",\r
         "x": 5306.334716796875,\r
         "y": 3498.0858154296875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af3bd9a1.948688",\r
+        "id": "37972450.3f34e4",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 5239.568145751953,\r
         "y": 3571.0858459472656,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "17da0805.f3e8a8",\r
+        "id": "81bb4a2a.7bc33",\r
         "type": "comment",\r
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",\r
         "info": "",\r
         "comments": "",\r
         "x": 4432.88427734375,\r
         "y": 5105.285980224609,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "19328269.e896be",\r
+        "id": "2212222d.1721a6",\r
         "type": "set",\r
         "name": "set tmp.leafconn.",\r
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",\r
         "comments": "",\r
         "x": 4331.317138671875,\r
         "y": 5157.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ffd8a757.b8a3f",\r
+        "id": "cdd12e42.2ba1b8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 4482.317138671875,\r
         "y": 5600.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b33560b0.1278c",\r
+        "id": "7f0c132f.b1df44",\r
         "type": "switchNode",\r
         "name": "switch found-root-connectivity",\r
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
         "outputs": 1,\r
         "x": 4297.317138671875,\r
         "y": 5667.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e0079417.8b765",\r
-                "94134a14.38a09"\r
+                "926aab17.e275a",\r
+                "bc8bcaa1.d641e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0079417.8b765",\r
+        "id": "926aab17.e275a",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 4562.317138671875,\r
         "y": 5652.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c191059e.ace948"\r
+                "749c0d73.9fee4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94134a14.38a09",\r
+        "id": "bc8bcaa1.d641e8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 4558.317138671875,\r
         "y": 5700.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "21c0ccb3.89b3cc"\r
+                "49001f8f.249f28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c191059e.ace948",\r
+        "id": "749c0d73.9fee4c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "outputs": 1,\r
         "x": 4718.317138671875,\r
         "y": 5648.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ea983e85.321ce"\r
+                "17e137f7.f9138"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21c0ccb3.89b3cc",\r
+        "id": "49001f8f.249f28",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
         "comments": "",\r
         "x": 4706.317138671875,\r
         "y": 5695.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "11ee9928.b9a3cf",\r
+        "id": "e9eb95a.e0ce568",\r
         "type": "set",\r
         "name": "set tmp.rootconn.",\r
         "xml": "<set>\n<parameter name='tmp.rootconn.' value=\"`$tmp.aai.ROOT.connectivity.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 5138.3173828125,\r
         "y": 5590.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3a447acf.2b1f0e",\r
+        "id": "7c03a888.d651",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 4540.734130859375,\r
         "y": 5186.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "93e60704.65dbd",\r
+        "id": "b943d622.b35cc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4311.734130859375,\r
         "y": 5275.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "3a447acf.2b1f0e",\r
-                "a0d0d144.703df8"\r
+                "7c03a888.d651",\r
+                "741f789d.c1701"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0d0d144.703df8",\r
+        "id": "741f789d.c1701",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "outputs": 1,\r
         "x": 4547.734130859375,\r
         "y": 5268.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "93bdcc8d.eca238",\r
-                "76b31045.74e9",\r
-                "e9dc2865.72e928"\r
+                "8e631709.9703e",\r
+                "67d67460.c609e4",\r
+                "d648c0fa.0b77a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93bdcc8d.eca238",\r
+        "id": "8e631709.9703e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4743.2342529296875,\r
         "y": 5220.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "87ddaf65.395498"\r
+                "557dbe85.6b2148"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76b31045.74e9",\r
+        "id": "67d67460.c609e4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 4735.2342529296875,\r
         "y": 5275.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "fe3d7591.8ed12"\r
+                "5bf448c8.1a6988"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "87ddaf65.395498",\r
+        "id": "557dbe85.6b2148",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4887.6165771484375,\r
         "y": 5220.141845703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ad455c8f.ae00e8"\r
+                "fe2fb306.35f718"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad455c8f.ae00e8",\r
+        "id": "fe2fb306.35f718",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 5071.734130859375,\r
         "y": 5218.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d25e267a.3e533"\r
+                "623662a6.321084"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d25e267a.3e533",\r
+        "id": "623662a6.321084",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 5266.734130859375,\r
         "y": 5218.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "93445f98.6a2b88"\r
+                "e938fab.b235908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9dc2865.72e928",\r
+        "id": "d648c0fa.0b77a8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 4740.2342529296875,\r
         "y": 5332.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d3c476f6.a94bf"\r
+                "b12af343.8616c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d3c476f6.a94bf",\r
+        "id": "b12af343.8616c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4892.2342529296875,\r
         "y": 5333.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe3d7591.8ed12",\r
+        "id": "5bf448c8.1a6988",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4903.2342529296875,\r
         "y": 5276.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a6955939.7a731",\r
+        "id": "45e37676.b3ae38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5648.734130859375,\r
         "y": 5222.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9484e895.44a448",\r
-                "50aee0a4.445958",\r
-                "f7a12344.c8bde8"\r
+                "ab290c95.7c31f8",\r
+                "9018bd5e.6b648",\r
+                "b0b7686a.f22a48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93445f98.6a2b88",\r
+        "id": "e938fab.b235908",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "outputs": 1,\r
         "x": 5469.734130859375,\r
         "y": 5222.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a6955939.7a731"\r
+                "45e37676.b3ae38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50aee0a4.445958",\r
+        "id": "9018bd5e.6b648",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "outputs": 1,\r
         "x": 5854.734130859375,\r
         "y": 5235.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1af8bb44.7d7ad5",\r
-                "48532c3d.63b2f4",\r
-                "af6d67e.1e33f98"\r
+                "6880c853.571ac",\r
+                "27b0dc8.dc2bca4",\r
+                "88c18631.ac0cc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9484e895.44a448",\r
+        "id": "ab290c95.7c31f8",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
         "x": 5884.734130859375,\r
         "y": 5183.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1af8bb44.7d7ad5",\r
+        "id": "6880c853.571ac",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 6064.734130859375,\r
         "y": 5226.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "751438ac.f3ea9"\r
+                "23e6d39c.ca6f94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48532c3d.63b2f4",\r
+        "id": "27b0dc8.dc2bca4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 6056.734130859375,\r
         "y": 5281.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1ab525ea.2aee0a"\r
+                "c0508cff.258128"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af6d67e.1e33f98",\r
+        "id": "88c18631.ac0cc8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 6061.734130859375,\r
         "y": 5338.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "658bf37d.2cc724"\r
+                "9fe983fa.692458"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "658bf37d.2cc724",\r
+        "id": "9fe983fa.692458",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 6213.734130859375,\r
         "y": 5339.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1ab525ea.2aee0a",\r
+        "id": "c0508cff.258128",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 6224.734130859375,\r
         "y": 5284.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "751438ac.f3ea9",\r
+        "id": "23e6d39c.ca6f94",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 6209.116455078125,\r
         "y": 5224.141845703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "3d7e0062.7d2af"\r
+                "e1b89291.825068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d7e0062.7d2af",\r
+        "id": "e1b89291.825068",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
         "x": 6423.734130859375,\r
         "y": 5220.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f7a12344.c8bde8",\r
+        "id": "b0b7686a.f22a48",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 5804.734130859375,\r
         "y": 5299.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8b3d1eff.18e008",\r
+        "id": "467c3bf.71cfdc4",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",\r
         "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",\r
         "outputs": 1,\r
         "x": 4453.234375,\r
         "y": 5380.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ee0f617b.5bd02",\r
-                "8e2d6022.079658"\r
+                "475456de.095b28",\r
+                "e46dba62.d133c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee0f617b.5bd02",\r
+        "id": "475456de.095b28",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 4813.734130859375,\r
         "y": 5388.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e5f9197d.04b6c"\r
+                "e4100738.bedad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5f9197d.04b6c",\r
+        "id": "e4100738.bedad8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4971.734130859375,\r
         "y": 5388.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b5f90852.29b69",\r
+        "id": "2c862c6c.12858c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4975.234130859375,\r
         "y": 5428.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8e2d6022.079658",\r
+        "id": "e46dba62.d133c8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4817.734130859375,\r
         "y": 5428.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b5f90852.29b69"\r
+                "2c862c6c.12858c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffe0ea3.8a4d998",\r
+        "id": "4be3ffba.2e7d2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5126.451171875,\r
         "y": 5642.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6146efb2.cf13d",\r
-                "9351cf54.365048"\r
+                "6bb3bb26.aa81b4",\r
+                "1977e509.6db2ab"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9351cf54.365048",\r
+        "id": "1977e509.6db2ab",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "outputs": 1,\r
         "x": 5368.450927734375,\r
         "y": 5592.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d35be3cf.cc2028",\r
-                "74f2b735.4a4b38",\r
-                "4e1edc90.74b29c"\r
+                "b10ef966.1e9bd8",\r
+                "14377f23.b76f19",\r
+                "338fe6b.9e69f9a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d35be3cf.cc2028",\r
+        "id": "b10ef966.1e9bd8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 5563.951171875,\r
         "y": 5526.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "8c6be2ce.3abef8"\r
+                "ca399707.489dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74f2b735.4a4b38",\r
+        "id": "14377f23.b76f19",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 5559.951171875,\r
         "y": 5582.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "17a91916.50ea6f"\r
+                "9a688c1c.979b18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c6be2ce.3abef8",\r
+        "id": "ca399707.489dc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 5708.3333740234375,\r
         "y": 5543.741455078125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "41f50adf.154854"\r
+                "518bb115.3e1828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41f50adf.154854",\r
+        "id": "518bb115.3e1828",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 5892.450927734375,\r
         "y": 5542.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "92f6a716.223fa8"\r
+                "a95efbd.96c1f88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e1edc90.74b29c",\r
+        "id": "338fe6b.9e69f9a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 5569.951171875,\r
         "y": 5627.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9e924b4c.b75db"\r
+                "2bd9cd74.b57772"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e924b4c.b75db",\r
+        "id": "2bd9cd74.b57772",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 5748.951171875,\r
         "y": 5643.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "17a91916.50ea6f",\r
+        "id": "9a688c1c.979b18",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 5730.951171875,\r
         "y": 5595.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "21c4fa1a.b93b46",\r
+        "id": "a5be160b.7233f8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete UNI of ethernet Service without token",\r
         "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",\r
         "outputs": 1,\r
         "x": 5279.951171875,\r
         "y": 5697.685394287109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "95033c2a.09c67",\r
-                "f1a877c4.a203d8"\r
+                "21841842.1d8ad8",\r
+                "25d11f87.0e38d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "95033c2a.09c67",\r
+        "id": "21841842.1d8ad8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 5628.451171875,\r
         "y": 5679.685394287109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "76c41eff.4cfe88"\r
+                "77a65248.1f8454"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76c41eff.4cfe88",\r
+        "id": "77a65248.1f8454",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 5884.451171875,\r
         "y": 5682.685394287109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb3b6335.123de8",\r
+        "id": "36c31917.4e963e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5836.951171875,\r
         "y": 5723.685394287109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f1a877c4.a203d8",\r
+        "id": "25d11f87.0e38d",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 5638.451171875,\r
         "y": 5728.685394287109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "eb3b6335.123de8"\r
+                "36c31917.4e963e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6146efb2.cf13d",\r
+        "id": "6bb3bb26.aa81b4",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 5361.450927734375,\r
         "y": 5510.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "92f6a716.223fa8",\r
+        "id": "a95efbd.96c1f88",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 6087.450927734375,\r
         "y": 5542.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "bd55517c.f87f1"\r
+                "5b53283.237bd58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8bf8b16.3c18f5",\r
+        "id": "32954f05.a0f998",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 6469.450927734375,\r
         "y": 5546.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1bd48f8a.cba628",\r
-                "1ea10909.ec8b57",\r
-                "ecac1508.b763"\r
+                "77ce96c2.5602e8",\r
+                "3fe633a6.1c94b4",\r
+                "2e5333ff.9beaf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd55517c.f87f1",\r
+        "id": "5b53283.237bd58",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "outputs": 1,\r
         "x": 6290.450927734375,\r
         "y": 5546.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "8bf8b16.3c18f5"\r
+                "32954f05.a0f998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1ea10909.ec8b57",\r
+        "id": "3fe633a6.1c94b4",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "outputs": 1,\r
         "x": 6675.450927734375,\r
         "y": 5559.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "830127bc.8c4c18",\r
-                "adc00906.538428",\r
-                "5c009e0.e4c98e4"\r
+                "6653ee89.119c48",\r
+                "90d289d3.d64128",\r
+                "65b6f2f3.cb40dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1bd48f8a.cba628",\r
+        "id": "77ce96c2.5602e8",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
         "x": 6705.450927734375,\r
         "y": 5507.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "830127bc.8c4c18",\r
+        "id": "6653ee89.119c48",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 6885.450927734375,\r
         "y": 5550.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ea1d97d5.52d0a"\r
+                "e4a1281d.94a088"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "adc00906.538428",\r
+        "id": "90d289d3.d64128",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 6877.450927734375,\r
         "y": 5605.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "283c974a.c2fc28"\r
+                "c0981577.68ad28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c009e0.e4c98e4",\r
+        "id": "65b6f2f3.cb40dc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 6882.450927734375,\r
         "y": 5662.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "dbf169ab.c4c478"\r
+                "9cc01382.31d9c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbf169ab.c4c478",\r
+        "id": "9cc01382.31d9c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 7034.450927734375,\r
         "y": 5663.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "283c974a.c2fc28",\r
+        "id": "c0981577.68ad28",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 7045.450927734375,\r
         "y": 5608.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea1d97d5.52d0a",\r
+        "id": "e4a1281d.94a088",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 7029.833251953125,\r
         "y": 5547.741455078125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "eea057d1.d2c178"\r
+                "e0ec5a36.3fa468"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eea057d1.d2c178",\r
+        "id": "e0ec5a36.3fa468",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
         "x": 7244.450927734375,\r
         "y": 5544.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ecac1508.b763",\r
+        "id": "2e5333ff.9beaf4",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 6625.450927734375,\r
         "y": 5623.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e8fee7bd.fc2ef8",\r
+        "id": "5a2012d5.a1cef4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 3854.88330078125,\r
         "y": 3512.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "4b07eb9e.ad1084",\r
-                "449a6f75.ecc4d"\r
+                "2e4356c1.85e5c2",\r
+                "817ee67a.98bbb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b07eb9e.ad1084",\r
+        "id": "2e4356c1.85e5c2",\r
         "type": "set",\r
         "name": "set tmp.mmUNI-id-long",\r
         "xml": "<set>\n<parameter name='tmp.mmUNI-id-long' value='`$middle-man-conn.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",\r
         "comments": "",\r
         "x": 4045.466552734375,\r
         "y": 3455.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "449a6f75.ecc4d",\r
+        "id": "817ee67a.98bbb8",\r
         "type": "switchNode",\r
         "name": "switch tmp.mmUNI-id-long != ROOT UNI",\r
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.ROOT.uni-p-interface-long`\">\n\n",\r
         "outputs": 1,\r
         "x": 4092.466552734375,\r
         "y": 3526.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a5622a5e.b03c68",\r
-                "1b2b72f4.a20bdd"\r
+                "eff8b608.f4ac8",\r
+                "aeb603b8.1d9588"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5622a5e.b03c68",\r
+        "id": "eff8b608.f4ac8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 4330.884033203125,\r
         "y": 3485.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d22a60e2.fd2778"\r
+                "bb88d9bc.29cfc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b2b72f4.a20bdd",\r
+        "id": "aeb603b8.1d9588",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 4337.884246826172,\r
         "y": 3542.2857055664062,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b7814ecb.1580d"\r
+                "c59416d6.8ba4c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d22a60e2.fd2778",\r
+        "id": "bb88d9bc.29cfc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4458.884521484375,\r
         "y": 3481.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3c679d7f.fbbb22",\r
+        "id": "3a07e59d.95a52a",\r
         "type": "set",\r
         "name": "set tmp.MMonlyHasROOT to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='true' />\n",\r
         "comments": "",\r
         "x": 3314.083251953125,\r
         "y": 3439.6858825683594,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "da386631.67d8c8",\r
+        "id": "9d62dddf.19f4b",\r
         "type": "set",\r
         "name": "set tmp.MMonlyHasROOT to FALSE",\r
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='false' />\n",\r
         "comments": "",\r
         "x": 5295.91748046875,\r
         "y": 3441.6859130859375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5fa67fdd.e511b8",\r
+        "id": "94bd3415.1f22d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4407.6669921875,\r
         "y": 3961.9024353027344,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a814439f.bac2e",\r
-                "f8d770ba.37d44"\r
+                "6935663a.9d5408",\r
+                "be9be1c2.b73f18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a814439f.bac2e",\r
+        "id": "6935663a.9d5408",\r
         "type": "set",\r
         "name": "set tmp.uni.id",\r
         "xml": "<set>\n<parameter name='tmp.uni.id' value='`$tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",\r
         "comments": "",\r
         "x": 4580.5498046875,\r
         "y": 3957.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f8d770ba.37d44",\r
+        "id": "be9be1c2.b73f18",\r
         "type": "save",\r
         "name": "get uni from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 4583.5498046875,\r
         "y": 4004.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7fc95f5b.ec381",\r
-                "28603ae9.d6e726",\r
-                "f736ad43.136778"\r
+                "c0042631.4f4f28",\r
+                "22708d43.de1092",\r
+                "4a7fa995.9eae4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7fc95f5b.ec381",\r
+        "id": "c0042631.4f4f28",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4755.5498046875,\r
         "y": 3988.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "47e06d70.96544c"\r
+                "ca5dd9fd.1cc728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28603ae9.d6e726",\r
+        "id": "22708d43.de1092",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 4756.040771484375,\r
         "y": 4034.1361389160156,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f736ad43.136778",\r
+        "id": "4a7fa995.9eae4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 4756.5498046875,\r
         "y": 4074.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "47e06d70.96544c",\r
+        "id": "ca5dd9fd.1cc728",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "outputs": 1,\r
         "x": 4916.5498046875,\r
         "y": 3984.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "db3d2916.05167",\r
-                "b1e93bbf.154be8",\r
-                "2727d594.264d9a"\r
+                "47c9bf0a.a975f",\r
+                "7fbd75a1.7d6984",\r
+                "d27053b4.e2d198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3055c73f.990de",\r
+        "id": "4c40c5cd.79b95c",\r
         "type": "comment",\r
         "name": "find the node part of the uni.id (uni-tp-id-node-part)",\r
         "info": "",\r
         "comments": "",\r
         "x": 5249.5498046875,\r
         "y": 3915.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b1e93bbf.154be8",\r
+        "id": "7fbd75a1.7d6984",\r
         "type": "execute",\r
         "name": "execute split id to get pnf-name",\r
         "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",\r
         "outputs": 1,\r
         "x": 5184.5498046875,\r
         "y": 3972.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "8ed99d07.46ccf",\r
-                "dfad78a0.2e2798"\r
+                "daa849f8.0ba3e",\r
+                "4a912d90.87d7dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dfad78a0.2e2798",\r
+        "id": "4a912d90.87d7dc",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 5407.5498046875,\r
         "y": 3958.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "40b7643c.aa9b44"\r
+                "88c966fa.22614"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ed99d07.46ccf",\r
+        "id": "daa849f8.0ba3e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 5409.5498046875,\r
         "y": 3991.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2c3f5774.427218"\r
+                "9f641079.ba835"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40b7643c.aa9b44",\r
+        "id": "88c966fa.22614",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5555.5498046875,\r
         "y": 3951.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "49b755b0.ff456c"\r
+                "9a9d27fb.7b5ae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c3f5774.427218",\r
+        "id": "9f641079.ba835",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 5552.5498046875,\r
         "y": 3988.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "49b755b0.ff456c",\r
+        "id": "9a9d27fb.7b5ae",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 5732.5498046875,\r
         "y": 3951.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "db3d2916.05167",\r
+        "id": "47c9bf0a.a975f",\r
         "type": "switchNode",\r
         "name": "switch uni-tp-id-node-part is the same as the LEAF node",\r
         "xml": "<switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>\n",\r
         "outputs": 1,\r
         "x": 5228.5498046875,\r
         "y": 4106.562103271484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "76a8963f.4621b8",\r
-                "22179ab4.cea27e"\r
+                "9f7c3aad.53ed38",\r
+                "d508e81a.16c548"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76a8963f.4621b8",\r
+        "id": "9f7c3aad.53ed38",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 5509.5498046875,\r
         "y": 4083.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "cdc60b24.0ad9a8"\r
+                "6b5444ec.0e74cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22179ab4.cea27e",\r
+        "id": "d508e81a.16c548",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 5502.5498046875,\r
         "y": 4142.562103271484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5846229.a88c65c"\r
+                "a57a183a.4f512"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cdc60b24.0ad9a8",\r
+        "id": "6b5444ec.0e74cc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 5639.5498046875,\r
         "y": 4087.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5846229.a88c65c",\r
+        "id": "a57a183a.4f512",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "outputs": 1,\r
         "x": 5644.5498046875,\r
         "y": 4141.562103271484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a9c7c427.af4688",\r
-                "fe9fa034.5cb01"\r
+                "b18806a7.b3bfd",\r
+                "ccf1cec1.bc032"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9c7c427.af4688",\r
+        "id": "b18806a7.b3bfd",\r
         "type": "set",\r
         "name": "set no-pce-call",\r
         "xml": "<set>\n<parameter name='no-pce-call' value=\"true\" />\n",\r
         "comments": "",\r
         "x": 5836.5498046875,\r
         "y": 4108.562103271484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98a16c7e.29ab68",\r
+        "id": "2b23daed.de49a6",\r
         "type": "set",\r
         "name": "set middle-man-conn",\r
         "xml": "<set>\n<parameter name='middle-man-conn.' value='`$tmp.aai.all-connectivities.connectivity[$connidx].`' />\n",\r
         "comments": "",\r
         "x": 5852.5498046875,\r
         "y": 4160.562103271484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe9fa034.5cb01",\r
+        "id": "ccf1cec1.bc032",\r
         "type": "set",\r
         "name": "set tmp.stillHasUni and tmp.keepVPNBs to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n<parameter name='tmp.keepVPNBs' value='true' />\n",\r
         "comments": "",\r
         "x": 5870.83349609375,\r
         "y": 4230.152435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2727d594.264d9a",\r
+        "id": "d27053b4.e2d198",\r
         "type": "set",\r
         "name": "set tmp.stillHasUni to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",\r
         "comments": "",\r
         "x": 5147.533203125,\r
         "y": 4056.0523376464844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c0a1014a.3ea75",\r
+        "id": "2520c605.40a22a",\r
         "type": "switchNode",\r
         "name": "switch tmp.stillHasUni?",\r
         "xml": "\n<switch test=\"`$tmp.stillHasUni`\">\n\n",\r
         "outputs": 1,\r
         "x": 383.7339172363281,\r
         "y": 5326.252044677734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5bc4629f.a764e4",\r
-                "36ea940e.f6b704"\r
+                "c1b9af54.b56a3",\r
+                "ab60aff5.ef6de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "529ae160.378f78",\r
+        "id": "37365b38.b727a4",\r
         "type": "save",\r
         "name": "get root uni from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 4288.516357421875,\r
         "y": 5490.135833740234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e3e4b7ad.cfce5",\r
-                "2311d61f.89de52",\r
-                "cab68c6b.abd21"\r
+                "81da98d4.afeb3",\r
+                "3ec2a5e9.1b8c7a",\r
+                "90c2c87a.2ba4f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b4c8a8a.8bc066",\r
+        "id": "1b110349.17b25d",\r
         "type": "comment",\r
         "name": "Update ROOT UNI's bw -- ALREADY DONE",\r
         "info": "",\r
         "comments": "",\r
         "x": 4286.516845703125,\r
         "y": 5442.136077880859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "89e149ab.f2e7c8",\r
+        "id": "feaf6c5c.b919f",\r
         "type": "save",\r
         "name": "update ROOT UNI in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 4903.5166015625,\r
         "y": 5560.136077880859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2311d61f.89de52",\r
+        "id": "3ec2a5e9.1b8c7a",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 4506.007568359375,\r
         "y": 5460.710052490234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "983c2552.f1f49"\r
+                "3e15c1e0.3f5b3e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cab68c6b.abd21",\r
+        "id": "90c2c87a.2ba4f8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 4501.5166015625,\r
         "y": 5505.136016845703,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "62a8aa1.663f1d4"\r
+                "f6e77d5b.d9f6c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "983c2552.f1f49",\r
+        "id": "3e15c1e0.3f5b3e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4668.5791015625,\r
         "y": 5459.995758056641,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "62a8aa1.663f1d4",\r
+        "id": "f6e77d5b.d9f6c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 4669.5166015625,\r
         "y": 5505.136016845703,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d78e13a5.01de9",\r
+        "id": "ac60929d.a61b6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4666.5166015625,\r
         "y": 5555.136077880859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7bde7792.d9b138",\r
-                "89e149ab.f2e7c8"\r
+                "86bfdde2.f9d01",\r
+                "feaf6c5c.b919f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3e4b7ad.cfce5",\r
+        "id": "81da98d4.afeb3",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4497.5166015625,\r
         "y": 5555.136077880859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d78e13a5.01de9"\r
+                "ac60929d.a61b6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7bde7792.d9b138",\r
+        "id": "86bfdde2.f9d01",\r
         "type": "set",\r
         "name": "set new bw",\r
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",\r
         "comments": "",\r
         "x": 4859.517578125,\r
         "y": 5480.136077880859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cf4ce975.93215",\r
+        "id": "ace6c92e.10b74",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 5288.216796875,\r
         "y": 5417.902679443359,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea983e85.321ce",\r
+        "id": "17e137f7.f9138",\r
         "type": "save",\r
         "name": "update ROOT connectivity resource in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 5314,\r
         "y": 5460.102874755859,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5bc4629f.a764e4",\r
+        "id": "c1b9af54.b56a3",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 567.8836059570312,\r
         "y": 5377.285736083984,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "867bdfac.94705"\r
+                "ee95a91b.c63f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36ea940e.f6b704",\r
+        "id": "ab60aff5.ef6de8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 550.883544921875,\r
         "y": 5299.285736083984,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ab9e57cf.8ef448"\r
+                "50a1f630.9e921"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb7859d4.8fd35",\r
+        "id": "e3a00d61.16ee98",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 679.8833923339844,\r
         "y": 4386.285461425781,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "8a11a728.e1b1d8",\r
-                "7438f980.400318",\r
-                "6c2db8ea.27724",\r
-                "a48617f3.9f6e4",\r
-                "5ff63bef.c5afdc",\r
-                "78f62ea.0af84d",\r
-                "d07ac0db.fa9818"\r
+                "31d81fe6.59b2e8",\r
+                "32e6c64e.1f59ea",\r
+                "ec3295c7.2b4e68",\r
+                "28934462.eda2dc",\r
+                "f47b26f.a890d58",\r
+                "787fd0ee.fe0408",\r
+                "e0d5d04e.46068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a11a728.e1b1d8",\r
+        "id": "31d81fe6.59b2e8",\r
         "type": "set",\r
         "name": "set tmp.leafconn.",\r
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",\r
         "comments": "",\r
         "x": 931.5667419433594,\r
         "y": 4364.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8aa064fb.543668",\r
+        "id": "7f4eb95e.24b05",\r
         "type": "comment",\r
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",\r
         "info": "",\r
         "comments": "",\r
         "x": 1033.1338806152344,\r
         "y": 4312.418762207031,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "821af189.946d58",\r
+        "id": "6288e052.96f2",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 1140.9837341308594,\r
         "y": 4393.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7438f980.400318",\r
+        "id": "32e6c64e.1f59ea",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 911.9837341308594,\r
         "y": 4482.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "821af189.946d58",\r
-                "139cfd47.53e94b"\r
+                "6288e052.96f2",\r
+                "fe4b92e6.ffdd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "139cfd47.53e94b",\r
+        "id": "fe4b92e6.ffdd",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "outputs": 1,\r
         "x": 1147.9837341308594,\r
         "y": 4475.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "df64900d.741c98",\r
-                "681e1ffc.26592",\r
-                "ab39d1b3.416b58"\r
+                "a543f0e2.a728d8",\r
+                "2a0dd5d7.a28cf2",\r
+                "7ecf5c91.3a5cec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df64900d.741c98",\r
+        "id": "a543f0e2.a728d8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 1343.4838562011719,\r
         "y": 4427.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6f395e40.dc6b7"\r
+                "ff8dc86e.9ae7d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "681e1ffc.26592",\r
+        "id": "2a0dd5d7.a28cf2",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 1335.4838562011719,\r
         "y": 4482.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b25568a6.369d78"\r
+                "2e71c1c5.bae5ee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f395e40.dc6b7",\r
+        "id": "ff8dc86e.9ae7d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 1487.8661804199219,\r
         "y": 4427.274627685547,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "94a27fe.8c889"\r
+                "ea932b87.e300a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94a27fe.8c889",\r
+        "id": "ea932b87.e300a",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 1671.9837341308594,\r
         "y": 4425.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b448ea96.4c3af8"\r
+                "a57e88f9.3dbb78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b448ea96.4c3af8",\r
+        "id": "a57e88f9.3dbb78",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 1866.9837341308594,\r
         "y": 4425.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "77dc6e4f.3fb428"\r
+                "bc5f5f85.45dd38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab39d1b3.416b58",\r
+        "id": "7ecf5c91.3a5cec",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 1340.4838562011719,\r
         "y": 4539.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "42bc5c1d.fe55cc"\r
+                "555bfa65.d963d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42bc5c1d.fe55cc",\r
+        "id": "555bfa65.d963d4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 1492.4838562011719,\r
         "y": 4540.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b25568a6.369d78",\r
+        "id": "2e71c1c5.bae5ee",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 1503.4838562011719,\r
         "y": 4483.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80f1bf38.0bc68",\r
+        "id": "b2af47a.be99538",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 2248.9837341308594,\r
         "y": 4429.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "cad7009f.f83538",\r
-                "d1a2dd14.715a78",\r
-                "689fc80.c15b238"\r
+                "7d049acd.fef104",\r
+                "735b2479.3a3c34",\r
+                "9afda8fe.94c61"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77dc6e4f.3fb428",\r
+        "id": "bc5f5f85.45dd38",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "outputs": 1,\r
         "x": 2069.9837341308594,\r
         "y": 4429.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "80f1bf38.0bc68"\r
+                "b2af47a.be99538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c2db8ea.27724",\r
+        "id": "ec3295c7.2b4e68",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",\r
         "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",\r
         "outputs": 1,\r
         "x": 1053.4839782714844,\r
         "y": 4587.218566894531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c3b5c5e7.57693",\r
-                "cf1b7699.e71658"\r
+                "d93fc4e8.d2141",\r
+                "e3d87702.3e04a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf1b7699.e71658",\r
+        "id": "e3d87702.3e04a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 1417.9837341308594,\r
         "y": 4635.218566894531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "723bcced.729e54"\r
+                "467380a4.6c5ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3b5c5e7.57693",\r
+        "id": "d93fc4e8.d2141",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 1413.9837341308594,\r
         "y": 4595.218566894531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "408278c5.7e5798"\r
+                "74c8e4d8.aba72c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "408278c5.7e5798",\r
+        "id": "74c8e4d8.aba72c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 1571.9837341308594,\r
         "y": 4595.218566894531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "723bcced.729e54",\r
+        "id": "467380a4.6c5ea",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 1575.4837341308594,\r
         "y": 4635.218566894531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d1a2dd14.715a78",\r
+        "id": "735b2479.3a3c34",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "outputs": 1,\r
         "x": 2454.9837341308594,\r
         "y": 4442.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e07edffa.c89278",\r
-                "8645511b.c4b66",\r
-                "a8a5443b.9b8a2"\r
+                "c4e177eb.43ef28",\r
+                "2d977136.9bd1f6",\r
+                "57e5d5ac.7eac64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cad7009f.f83538",\r
+        "id": "7d049acd.fef104",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
         "x": 2484.9837341308594,\r
         "y": 4390.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e07edffa.c89278",\r
+        "id": "c4e177eb.43ef28",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 2664.9837341308594,\r
         "y": 4433.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "cb5c9c8e.bb8ed8"\r
+                "e1f43f97.38cd18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8645511b.c4b66",\r
+        "id": "2d977136.9bd1f6",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 2656.9837341308594,\r
         "y": 4488.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "29fe474c.df75c8"\r
+                "96a7d4c6.d3f4b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8a5443b.9b8a2",\r
+        "id": "57e5d5ac.7eac64",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 2661.9837341308594,\r
         "y": 4545.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b28b1e53.869fb"\r
+                "c392199a.c19ae8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b28b1e53.869fb",\r
+        "id": "c392199a.c19ae8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 2813.9837341308594,\r
         "y": 4546.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29fe474c.df75c8",\r
+        "id": "96a7d4c6.d3f4b",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 2824.9837341308594,\r
         "y": 4491.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cb5c9c8e.bb8ed8",\r
+        "id": "e1f43f97.38cd18",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 2809.3660583496094,\r
         "y": 4431.274627685547,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a908cc9.5d7f7b"\r
+                "a7aa546c.5009d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a908cc9.5d7f7b",\r
+        "id": "a7aa546c.5009d8",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
         "x": 3023.9837341308594,\r
         "y": 4427.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "689fc80.c15b238",\r
+        "id": "9afda8fe.94c61",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 2404.9837341308594,\r
         "y": 4506.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a48617f3.9f6e4",\r
+        "id": "28934462.eda2dc",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 1082.5667419433594,\r
         "y": 4807.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5ff63bef.c5afdc",\r
+        "id": "f47b26f.a890d58",\r
         "type": "switchNode",\r
         "name": "switch found-root-connectivity",\r
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
         "outputs": 1,\r
         "x": 897.5667419433594,\r
         "y": 4874.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "bcfca35c.21654",\r
-                "62c7d864.119b88"\r
+                "d8af5065.8b84b8",\r
+                "1e55c33.7a66f3d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bcfca35c.21654",\r
+        "id": "d8af5065.8b84b8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 1162.5667419433594,\r
         "y": 4859.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f4258877.5e35f"\r
+                "f3c54a4a.4e3ba8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62c7d864.119b88",\r
+        "id": "1e55c33.7a66f3d",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 1158.5667419433594,\r
         "y": 4907.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "3fb79094.abfaa8"\r
+                "ce49485f.e53e78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4258877.5e35f",\r
+        "id": "f3c54a4a.4e3ba8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "outputs": 1,\r
         "x": 1318.5667419433594,\r
         "y": 4855.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2140ac57.1e83f4"\r
+                "f655fe6a.478a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3fb79094.abfaa8",\r
+        "id": "ce49485f.e53e78",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
         "comments": "",\r
         "x": 1306.5667419433594,\r
         "y": 4902.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8db3fd20.37f318",\r
+        "id": "f3ecfcf6.c34748",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 1587.4664001464844,\r
         "y": 4806.035461425781,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2140ac57.1e83f4",\r
+        "id": "f655fe6a.478a2",\r
         "type": "save",\r
         "name": "update ROOT connectivity resource in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 1613.2496032714844,\r
         "y": 4848.235656738281,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "440b33d.dbb8acc",\r
+        "id": "78dea2d4.65caf4",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 1026.8833923339844,\r
         "y": 4121.602355957031,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ab9e57cf.8ef448",\r
+        "id": "50a1f630.9e921",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 632.8834228515625,\r
         "y": 4126.285491943359,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "440b33d.dbb8acc",\r
-                "eb7859d4.8fd35"\r
+                "78dea2d4.65caf4",\r
+                "e3a00d61.16ee98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "867bdfac.94705",\r
+        "id": "ee95a91b.c63f6",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 716.3333740234375,\r
         "y": 5378.802337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c644609d.44bce",\r
-                "e7413115.aec04",\r
-                "d006cbe4.5a677",\r
-                "c786893c.7012b"\r
+                "a4300755.b44ad8",\r
+                "4319a166.6767b",\r
+                "c1e6d7e.1a91aa8",\r
+                "7dc09fd4.2514c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c644609d.44bce",\r
+        "id": "a4300755.b44ad8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 1077.7166748046875,\r
         "y": 5141.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e7413115.aec04",\r
+        "id": "4319a166.6767b",\r
         "type": "save",\r
         "name": "delete LEAF connectivity resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n",\r
         "outputs": 1,\r
         "x": 988.7166748046875,\r
         "y": 5210.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d006cbe4.5a677",\r
+        "id": "c1e6d7e.1a91aa8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 879.88330078125,\r
         "y": 5445.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "614e61f8.50b5f",\r
-                "96d6a1ec.c795b",\r
-                "90aff610.9959f8"\r
+                "6bef4230.e722e4",\r
+                "41351f51.03e8b",\r
+                "71820932.ce34a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ca77be7.05ec8c",\r
+        "id": "2a329201.baab2e",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "outputs": 1,\r
         "x": 2588.882568359375,\r
         "y": 5370.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a9496568.146b9",\r
-                "c5f96edd.835cb8",\r
-                "e018fe0a.acb8a"\r
+                "65fc47.6ca7abb8",\r
+                "955b1af3.e7d3b8",\r
+                "72151671.442258"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9815115.2c557",\r
+        "id": "daaffadf.b0d788",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 2538.882568359375,\r
         "y": 5434.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d05f3809.7521c8",\r
+        "id": "ae76296d.4aa7d8",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
         "x": 2618.882568359375,\r
         "y": 5318.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a9496568.146b9",\r
+        "id": "65fc47.6ca7abb8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 2906.8826904296875,\r
         "y": 5301.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b7511521.12ea3"\r
+                "6f1e5821.6bfab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5f96edd.835cb8",\r
+        "id": "955b1af3.e7d3b8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 2898.8826904296875,\r
         "y": 5356.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d009936c.baaf78"\r
+                "5731f70c.9d6e58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e018fe0a.acb8a",\r
+        "id": "72151671.442258",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 2903.8826904296875,\r
         "y": 5413.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a8c24324.12cd38"\r
+                "531fbc69.7d6ca4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8c24324.12cd38",\r
+        "id": "531fbc69.7d6ca4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3055.8826904296875,\r
         "y": 5414.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d009936c.baaf78",\r
+        "id": "5731f70c.9d6e58",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3066.8826904296875,\r
         "y": 5359.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b7511521.12ea3",\r
+        "id": "6f1e5821.6bfab8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 3051.2650146484375,\r
         "y": 5299.458038330078,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "87c431c3.fca34"\r
+                "af5a0545.43691"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "87c431c3.fca34",\r
+        "id": "af5a0545.43691",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
         "x": 3265.8826904296875,\r
         "y": 5295.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "614e61f8.50b5f",\r
+        "id": "6bef4230.e722e4",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 1161.88330078125,\r
         "y": 5314.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c0a00c52.f1e878",\r
+        "id": "80b0094c.3afc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 1372.3834228515625,\r
         "y": 5453.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a9f88f76.4444c"\r
+                "8b920100.3048e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62d1e19f.b39a2",\r
+        "id": "fd028bda.dc87c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 1375.3834228515625,\r
         "y": 5341.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "957f349.e76e4c8"\r
+                "b6a8539e.9a283"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9cbc6ac.26846",\r
+        "id": "dfe8b9b5.0780c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 1367.3834228515625,\r
         "y": 5396.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "48a6f350.0417c4"\r
+                "a57ef7af.c3223"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "957f349.e76e4c8",\r
+        "id": "b6a8539e.9a283",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 1509.765625,\r
         "y": 5336.4581298828125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d4741dab.7b5f78"\r
+                "99e24c60.f2ee9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9f88f76.4444c",\r
+        "id": "8b920100.3048e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 1524.3834228515625,\r
         "y": 5454.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "48a6f350.0417c4",\r
+        "id": "a57ef7af.c3223",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 1535.3834228515625,\r
         "y": 5397.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d4741dab.7b5f78",\r
+        "id": "99e24c60.f2ee9",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 1696.8828125,\r
         "y": 5337.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "93c0e1e7.1663a8"\r
+                "b066cef.3d778b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93c0e1e7.1663a8",\r
+        "id": "b066cef.3d778b",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 1924.8828125,\r
         "y": 5330.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "eb0c27f.1616058"\r
+                "bf0363b8.4e697"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96d6a1ec.c795b",\r
+        "id": "41351f51.03e8b",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "outputs": 1,\r
         "x": 1179.88330078125,\r
         "y": 5389.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c0a00c52.f1e878",\r
-                "62d1e19f.b39a2",\r
-                "b9cbc6ac.26846"\r
+                "80b0094c.3afc",\r
+                "fd028bda.dc87c",\r
+                "dfe8b9b5.0780c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb0c27f.1616058",\r
+        "id": "bf0363b8.4e697",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "outputs": 1,\r
         "x": 2130.8828125,\r
         "y": 5327.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "63e7e6f3.2a24f"\r
+                "d631d833.b0d378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63e7e6f3.2a24f",\r
+        "id": "d631d833.b0d378",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 2345.8822021484375,\r
         "y": 5330.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d05f3809.7521c8",\r
-                "7ca77be7.05ec8c",\r
-                "b9815115.2c557"\r
+                "ae76296d.4aa7d8",\r
+                "2a329201.baab2e",\r
+                "daaffadf.b0d788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90aff610.9959f8",\r
+        "id": "71820932.ce34a",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete LEAF ethernet Service without token",\r
         "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",\r
         "outputs": 1,\r
         "x": 1303.6500244140625,\r
         "y": 5539.2022705078125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b38f67ee.531ff",\r
-                "7cc55d59.0067b4"\r
+                "813e179b.713d1",\r
+                "76f746e6.c0f1d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b38f67ee.531ff",\r
+        "id": "813e179b.713d1",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 1650.1500244140625,\r
         "y": 5532.2022705078125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "bec12c24.0b2378"\r
+                "455cd4bd.60fbe4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7cc55d59.0067b4",\r
+        "id": "76f746e6.c0f1d",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 1654.1500244140625,\r
         "y": 5572.2022705078125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9701e6f5.8bd518"\r
+                "627d6bed.c81224"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bec12c24.0b2378",\r
+        "id": "455cd4bd.60fbe4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 1808.1500244140625,\r
         "y": 5532.2022705078125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9701e6f5.8bd518",\r
+        "id": "627d6bed.c81224",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 1811.6500244140625,\r
         "y": 5572.2022705078125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "29311664.f24592"\r
+                "eb743ad2.daea58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c786893c.7012b",\r
+        "id": "7dc09fd4.2514c",\r
         "type": "switchNode",\r
         "name": "switch tmp.MMstillHasUni?",\r
         "xml": "\n<switch test=\"`$tmp.MMstillHasUni`\">\n\n",\r
         "outputs": 1,\r
         "x": 913.183349609375,\r
         "y": 5869.002532958984,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a3861250.d254d8",\r
-                "3c90d5bf.82245a"\r
+                "22d45a38.9f5796",\r
+                "bd1f8261.b1a1b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3861250.d254d8",\r
+        "id": "22d45a38.9f5796",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 1107.183349609375,\r
         "y": 5696.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6ee92ba3.68178c"\r
+                "b4f2b377.ab70a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c90d5bf.82245a",\r
+        "id": "bd1f8261.b1a1b",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 1093.3500366210938,\r
         "y": 6018.602630615234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "31cd7353.b764a4"\r
+                "f125dad1.1ae098"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ee92ba3.68178c",\r
+        "id": "b4f2b377.ab70a8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 1255.35009765625,\r
         "y": 5695.6026611328125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "94f88b26.f34ce",\r
-                "497fa775.3b5f3",\r
-                "e88fc760.9f3988"\r
+                "2ce9ebc5.9980ac",\r
+                "33e7432a.ad365c",\r
+                "1ed03004.8d6e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94f88b26.f34ce",\r
+        "id": "2ce9ebc5.9980ac",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 1677.199951171875,\r
         "y": 5667.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "497fa775.3b5f3",\r
+        "id": "33e7432a.ad365c",\r
         "type": "switchNode",\r
         "name": "switch found-root-connectivity",\r
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
         "outputs": 1,\r
         "x": 1492.199951171875,\r
         "y": 5734.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ef60935.82bca7",\r
-                "9065d9f2.54ee4"\r
+                "e7aa98fb.d5331",\r
+                "d055e12e.7731d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef60935.82bca7",\r
+        "id": "e7aa98fb.d5331",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 1757.199951171875,\r
         "y": 5719.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2819744b.f6ef4c"\r
+                "68adf16f.2488d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9065d9f2.54ee4",\r
+        "id": "d055e12e.7731d8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 1756.199951171875,\r
         "y": 5767.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "8f406878.70a"\r
+                "f1e6e2bf.7ae47"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2819744b.f6ef4c",\r
+        "id": "68adf16f.2488d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "outputs": 1,\r
         "x": 1913.199951171875,\r
         "y": 5715.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "450da1ad.43b1d"\r
+                "b0a90683.d1b168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f406878.70a",\r
+        "id": "f1e6e2bf.7ae47",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
         "comments": "",\r
         "x": 1904.199951171875,\r
         "y": 5762.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "450da1ad.43b1d",\r
+        "id": "b0a90683.d1b168",\r
         "type": "save",\r
         "name": "update ROOT connectivity resource in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 2221.8826904296875,\r
         "y": 5708.9029541015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "af8bca67.a28908",\r
+        "id": "609277ca.345368",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 2196.0994873046875,\r
         "y": 5666.7027587890625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "31cd7353.b764a4",\r
+        "id": "f125dad1.1ae098",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 1230.916748046875,\r
         "y": 6017.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a74b089b.225b08",\r
-                "ce915ff5.c8d31",\r
-                "73f93f1a.1715d8"\r
+                "6a84ca09.c3f86c",\r
+                "32b2c890.ef7958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a74b089b.225b08",\r
+        "id": "6a84ca09.c3f86c",\r
         "type": "for",\r
         "name": "for each relationship of middle-man-conn",\r
         "xml": "<for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 1536.2328491210938,\r
         "y": 5951.1025390625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1bf92ac3.705cd5"\r
+                "f1408389.66d578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1bf92ac3.705cd5",\r
+        "id": "f1408389.66d578",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 1844.566650390625,\r
         "y": 6007.102569580078,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "adff6291.99a8f8"\r
+                "89925b7f.d67008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "adff6291.99a8f8",\r
+        "id": "89925b7f.d67008",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "outputs": 1,\r
         "x": 2024.2332763671875,\r
         "y": 6007.1026611328125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b1717f1d.d23a28"\r
+                "ea5801a3.bdc318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b1717f1d.d23a28",\r
+        "id": "ea5801a3.bdc318",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 2224.233154296875,\r
         "y": 6007.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1b34e983.202196",\r
-                "d97ea61c.b38298",\r
-                "b46e47b0.7a7bf"\r
+                "a1e89c64.ee08",\r
+                "8d6c0f91.a49cb8",\r
+                "4e2495e6.04e044"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b34e983.202196",\r
+        "id": "a1e89c64.ee08",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 2431.23291015625,\r
         "y": 6057.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "10e803bb.23c354"\r
+                "b790569e.977af8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f69a3337.dd69",\r
+        "id": "a110091a.c88bd8",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 2408.466552734375,\r
         "y": 6241.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "8e127971.6de7c",\r
-                "9a64470f.e555c",\r
-                "c5ecce15.749748"\r
+                "2d065eb8.336f2a",\r
+                "87ee966c.316df8",\r
+                "aec85de6.45d0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1bd5cb93.6127c4",\r
+        "id": "4adb06fe.906c3",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "outputs": 1,\r
         "x": 1577.4664916992188,\r
         "y": 6284.30224609375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5280d91a.703f48"\r
+                "275bed8a.2109fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5280d91a.703f48",\r
+        "id": "275bed8a.2109fa",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 1774.4664916992188,\r
         "y": 6298.30224609375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "4a3e493f.526ac",\r
-                "404c9cef.17796c"\r
+                "4f9c6be0.2a3c14",\r
+                "a2e8db17.e0dad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a3e493f.526ac",\r
+        "id": "4f9c6be0.2a3c14",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "outputs": 1,\r
         "x": 1978.466552734375,\r
         "y": 6201.30224609375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e7cf2c0a.f8afd8"\r
+                "e20e285e.547a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7cf2c0a.f8afd8",\r
+        "id": "e20e285e.547a2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 2159.466552734375,\r
         "y": 6217.30224609375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f69a3337.dd69"\r
+                "a110091a.c88bd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "404c9cef.17796c",\r
+        "id": "a2e8db17.e0dad8",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "outputs": 1,\r
         "x": 1988.466552734375,\r
         "y": 6459.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "55211637.c2f7e"\r
+                "f74bc39.65f35c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55211637.c2f7e",\r
+        "id": "f74bc39.65f35c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 2151.466552734375,\r
         "y": 6459.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ad51c793.473678"\r
+                "c00c0bc0.55fe4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad51c793.473678",\r
+        "id": "c00c0bc0.55fe4",\r
         "type": "save",\r
         "name": "delete uni resource in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 2394.466552734375,\r
         "y": 6459.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "76246a63.c65c94",\r
+        "id": "97487c98.0e417",\r
         "type": "save",\r
         "name": "delete connectivity resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",\r
         "outputs": 1,\r
         "x": 1362.466552734375,\r
         "y": 7225.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "10e803bb.23c354",\r
+        "id": "b790569e.977af8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 1403.4664916992188,\r
         "y": 6282.30224609375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1bd5cb93.6127c4",\r
-                "76246a63.c65c94",\r
-                "99412df0.04b4f8"\r
+                "4adb06fe.906c3",\r
+                "97487c98.0e417",\r
+                "d04fa9dd.0ea93"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e127971.6de7c",\r
+        "id": "2d065eb8.336f2a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 2619.466552734375,\r
         "y": 6243.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e6c2ee89.d3aff"\r
+                "b92767c5.7007a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a64470f.e555c",\r
+        "id": "87ee966c.316df8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 2619.95751953125,\r
         "y": 6288.876373291016,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "66f32499.9b808c"\r
+                "39698a7e.793e46"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5ecce15.749748",\r
+        "id": "aec85de6.45d0c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 2617.466552734375,\r
         "y": 6332.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "fc5f97c.17990e8"\r
+                "11419a70.f242ee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b46e47b0.7a7bf",\r
+        "id": "4e2495e6.04e044",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 2455.282958984375,\r
         "y": 5957.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d97ea61c.b38298",\r
+        "id": "8d6c0f91.a49cb8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 2452.7919921875,\r
         "y": 6001.328399658203,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ce915ff5.c8d31",\r
+        "id": "32b2c890.ef7958",\r
         "type": "save",\r
         "name": "delete middle-man-conn resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'>\n",\r
         "outputs": 1,\r
         "x": 1533.4000854492188,\r
         "y": 6012.7021484375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e6c2ee89.d3aff",\r
+        "id": "b92767c5.7007a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 2785.466552734375,\r
         "y": 6233.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "95de1448.b3be38",\r
-                "c13cc07f.32d48",\r
-                "89fea46.2857558",\r
-                "8c5b9c51.4573e8",\r
-                "a58a3e55.44161"\r
+                "8147cbd5.b42498",\r
+                "7f8cdbe.2608ca4",\r
+                "991bc3e4.d8b4a8",\r
+                "b286c779.61d138",\r
+                "b9b93ea.866444"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc5f97c.17990e8",\r
+        "id": "11419a70.f242ee",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 2784.466552734375,\r
         "y": 6331.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "66f32499.9b808c",\r
+        "id": "39698a7e.793e46",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 2782.5289306640625,\r
         "y": 6289.162109375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "95de1448.b3be38",\r
+        "id": "8147cbd5.b42498",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 3007.466552734375,\r
         "y": 5951.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c13cc07f.32d48",\r
+        "id": "7f8cdbe.2608ca4",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "outputs": 1,\r
         "x": 3033.466552734375,\r
         "y": 6068.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2f82e357.0b1ab4",\r
-                "be465fa4.6aba18",\r
-                "877ec4f6.c7b7a"\r
+                "d327bb6b.4f842",\r
+                "fcec59b5.0b9b4",\r
+                "c483fb97.0216f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89fea46.2857558",\r
+        "id": "991bc3e4.d8b4a8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
         "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`\" />",\r
         "outputs": 1,\r
         "x": 3136.466552734375,\r
         "y": 6335.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2931cfbe.d3d97",\r
-                "162b2290.6fc605"\r
+                "de0f39f6.8546f",\r
+                "d42c9248.43e218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c5b9c51.4573e8",\r
+        "id": "b286c779.61d138",\r
         "type": "switchNode",\r
         "name": "switch connectivity has ethernet service",\r
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
         "outputs": 1,\r
         "x": 3074.466552734375,\r
         "y": 6470.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "df16efa0.bafe28",\r
-                "bc60ff9d.7739e8"\r
+                "f81c3e8c.ae8e4",\r
+                "1d01e37a.e82265"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a58a3e55.44161",\r
+        "id": "b9b93ea.866444",\r
         "type": "save",\r
         "name": "delete vpn-binding resource in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 3055.466552734375,\r
         "y": 6586.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2f82e357.0b1ab4",\r
+        "id": "d327bb6b.4f842",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3228.9666748046875,\r
         "y": 6020.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "640fd481.180004"\r
+                "df7e30e7.7c136"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be465fa4.6aba18",\r
+        "id": "fcec59b5.0b9b4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 3220.9666748046875,\r
         "y": 6075.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ecd8a620.92b268"\r
+                "49204a47.5b32c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "640fd481.180004",\r
+        "id": "df7e30e7.7c136",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 3363.348876953125,\r
         "y": 6014.958099365234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d1896cdb.8141"\r
+                "2df8196b.742ffe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "877ec4f6.c7b7a",\r
+        "id": "c483fb97.0216f8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 3225.9666748046875,\r
         "y": 6132.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f05d5e82.949cd"\r
+                "6350206c.c1b658"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f05d5e82.949cd",\r
+        "id": "6350206c.c1b658",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3377.9666748046875,\r
         "y": 6133.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ecd8a620.92b268",\r
+        "id": "49204a47.5b32c4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3388.9666748046875,\r
         "y": 6076.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bc60ff9d.7739e8",\r
+        "id": "1d01e37a.e82265",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 3327.466552734375,\r
         "y": 6448.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7d696f2d.0f345"\r
+                "6635b3c9.2401f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df16efa0.bafe28",\r
+        "id": "f81c3e8c.ae8e4",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "outputs": 1,\r
         "x": 3327.466552734375,\r
         "y": 6504.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d1896cdb.8141",\r
+        "id": "2df8196b.742ffe",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 3550.466064453125,\r
         "y": 6016.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a3649162.b60c9"\r
+                "6df12a4f.4f5be4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3649162.b60c9",\r
+        "id": "6df12a4f.4f5be4",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 3791.466064453125,\r
         "y": 6007.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "fd0af8f3.25299"\r
+                "345bdac9.d7580e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d696f2d.0f345",\r
+        "id": "6635b3c9.2401f4",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete ethernet Service without token",\r
         "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",\r
         "outputs": 1,\r
         "x": 3677.466064453125,\r
         "y": 6438.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "82ac773c.5adbc",\r
-                "f41b429.87576c"\r
+                "62245fed.88f7b8",\r
+                "93d26392.9844b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2931cfbe.d3d97",\r
+        "id": "de0f39f6.8546f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 3443.966064453125,\r
         "y": 6360.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "41ca7b34.32b314"\r
+                "efef7a04.122ab"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "162b2290.6fc605",\r
+        "id": "d42c9248.43e218",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3444.966064453125,\r
         "y": 6305.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6e74c50f.6753f4"\r
+                "5547b05c.5a7128"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41ca7b34.32b314",\r
+        "id": "efef7a04.122ab",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3615.966064453125,\r
         "y": 6358.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e74c50f.6753f4",\r
+        "id": "5547b05c.5a7128",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 3612.466064453125,\r
         "y": 6307.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d394aeb8.1e7718",\r
+        "id": "67e0872f.595688",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4148.4658203125,\r
         "y": 5956.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5381b334.945d34",\r
-                "5cfd9c1e.9cd7fc",\r
-                "293f88.0669c878"\r
+                "5fd99c9d.a6e514",\r
+                "c5566cea.30bd7",\r
+                "ac42532d.c50238"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd0af8f3.25299",\r
+        "id": "345bdac9.d7580e",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "outputs": 1,\r
         "x": 3997.466064453125,\r
         "y": 6004.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d394aeb8.1e7718"\r
+                "67e0872f.595688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82ac773c.5adbc",\r
+        "id": "62245fed.88f7b8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 4009.966064453125,\r
         "y": 6412.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ecb5b8cc.eeda88"\r
+                "5832ca1b.e5ff14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f41b429.87576c",\r
+        "id": "93d26392.9844b",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4013.966064453125,\r
         "y": 6452.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "308650c2.e2482"\r
+                "263d2537.eb493a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "308650c2.e2482",\r
+        "id": "263d2537.eb493a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4201.466064453125,\r
         "y": 6456.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
-            []\r
+            [\r
+                "4ed6624e.3d3df4"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "ecb5b8cc.eeda88",\r
+        "id": "5832ca1b.e5ff14",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4197.966064453125,\r
         "y": 6416.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5cfd9c1e.9cd7fc",\r
+        "id": "c5566cea.30bd7",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "outputs": 1,\r
         "x": 4354.4658203125,\r
         "y": 5969.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c9280772.2e056",\r
-                "da69dce1.3d1cc8",\r
-                "c843a21f.72703"\r
+                "1f8f123b.3b43b6",\r
+                "ad361732.c4c148",\r
+                "b36b591c.d0d57"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5381b334.945d34",\r
+        "id": "5fd99c9d.a6e514",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
         "x": 4384.4658203125,\r
         "y": 5917.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9280772.2e056",\r
+        "id": "1f8f123b.3b43b6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4564.4658203125,\r
         "y": 5960.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1c355cab.e00983"\r
+                "55972070.a10d1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da69dce1.3d1cc8",\r
+        "id": "ad361732.c4c148",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 4556.4658203125,\r
         "y": 6015.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e5e939f4.c8003"\r
+                "b3ebf2d9.9fcd08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c843a21f.72703",\r
+        "id": "b36b591c.d0d57",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 4561.4658203125,\r
         "y": 6072.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "29282b3d.cdea3c"\r
+                "a70cb792.ca4f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "293f88.0669c878",\r
+        "id": "ac42532d.c50238",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4304.4658203125,\r
         "y": 6033.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29282b3d.cdea3c",\r
+        "id": "a70cb792.ca4f6",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4713.4658203125,\r
         "y": 6073.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e5e939f4.c8003",\r
+        "id": "b3ebf2d9.9fcd08",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4724.4658203125,\r
         "y": 6018.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c355cab.e00983",\r
+        "id": "55972070.a10d1",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4708.84814453125,\r
         "y": 5957.9580078125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "31ead1aa.38700e"\r
+                "4ce9545d.714c5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31ead1aa.38700e",\r
+        "id": "4ce9545d.714c5c",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
         "x": 4923.4658203125,\r
         "y": 5954.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6da29c89.3512ec",\r
+        "id": "40aef7f6.0b7228",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 1659.2332763671875,\r
         "y": 6751.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "23a2345e.db2bfc",\r
+        "id": "4576702d.22188",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "outputs": 1,\r
         "x": 1685.2332763671875,\r
         "y": 6868.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "287bda60.70f306",\r
-                "564bb39c.806684",\r
-                "f782c941.aa2bd8"\r
+                "b905b.3d0c77a6",\r
+                "a913e20f.2cee1",\r
+                "5b499033.3c7be8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "287bda60.70f306",\r
+        "id": "b905b.3d0c77a6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 1880.7333984375,\r
         "y": 6820.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5eea5356.2a418c"\r
+                "fda08d88.ca8218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "564bb39c.806684",\r
+        "id": "a913e20f.2cee1",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 1872.7333984375,\r
         "y": 6875.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "918bf051.2e35e8"\r
+                "6f461b70.2ad3ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5eea5356.2a418c",\r
+        "id": "fda08d88.ca8218",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 2015.1156005859375,\r
         "y": 6815.558197021484,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a66aff1d.02ebd"\r
+                "c0fafd9c.883f28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f782c941.aa2bd8",\r
+        "id": "5b499033.3c7be8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 1877.7333984375,\r
         "y": 6932.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ea358a06.2ba7c"\r
+                "23b6f155.461de6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea358a06.2ba7c",\r
+        "id": "23b6f155.461de6",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 2029.7333984375,\r
         "y": 6933.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "918bf051.2e35e8",\r
+        "id": "6f461b70.2ad3ec",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 2040.7333984375,\r
         "y": 6876.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a66aff1d.02ebd",\r
+        "id": "c0fafd9c.883f28",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 2202.2327880859375,\r
         "y": 6816.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "dd540d27.8a572"\r
+                "810f1bc.7b19d68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd540d27.8a572",\r
+        "id": "810f1bc.7b19d68",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 2443.2327880859375,\r
         "y": 6807.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9d1b03ac.68f1d"\r
+                "ad7d1fb5.cc1a18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e61d9898.b700f8",\r
+        "id": "56d2a753.e194",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 2800.2325439453125,\r
         "y": 6756.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1b4a271c.3007c1",\r
-                "a4a420aa.eed92",\r
-                "5a15942c.1c868c"\r
+                "1805810f.473127",\r
+                "c086be3e.9f0a58",\r
+                "b6b8383e.7e7b78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d1b03ac.68f1d",\r
+        "id": "ad7d1fb5.cc1a18",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "outputs": 1,\r
         "x": 2649.2327880859375,\r
         "y": 6804.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e61d9898.b700f8"\r
+                "56d2a753.e194"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a4a420aa.eed92",\r
+        "id": "c086be3e.9f0a58",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "outputs": 1,\r
         "x": 3006.2325439453125,\r
         "y": 6769.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e70e66a4.f92e28",\r
-                "3b5db284.72d976",\r
-                "a90d6b8f.8e3a5"\r
+                "41ba51ef.c8b828",\r
+                "a2407b12.88a828",\r
+                "6a27d837.9d059"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a15942c.1c868c",\r
+        "id": "b6b8383e.7e7b78",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 2956.2325439453125,\r
         "y": 6833.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b4a271c.3007c1",\r
+        "id": "1805810f.473127",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
         "x": 3036.2325439453125,\r
         "y": 6717.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e70e66a4.f92e28",\r
+        "id": "41ba51ef.c8b828",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3216.2325439453125,\r
         "y": 6760.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2205be3e.8c882a"\r
+                "67360da7.aafffc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b5db284.72d976",\r
+        "id": "a2407b12.88a828",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 3208.2325439453125,\r
         "y": 6815.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d93cd156.9d02f8"\r
+                "aba785db.cff2e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a90d6b8f.8e3a5",\r
+        "id": "6a27d837.9d059",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 3213.2325439453125,\r
         "y": 6872.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b772a1ff.e97338"\r
+                "2e83f42c.ac084c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b772a1ff.e97338",\r
+        "id": "2e83f42c.ac084c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3365.2325439453125,\r
         "y": 6873.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d93cd156.9d02f8",\r
+        "id": "aba785db.cff2e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 3376.2325439453125,\r
         "y": 6818.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2205be3e.8c882a",\r
+        "id": "67360da7.aafffc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 3360.6148681640625,\r
         "y": 6758.55810546875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9b8cbfdb.496af"\r
+                "5bfcca0.e84cb38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9b8cbfdb.496af",\r
+        "id": "5bfcca0.e84cb38",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
         "x": 3575.2325439453125,\r
         "y": 6754.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "99412df0.04b4f8",\r
+        "id": "d04fa9dd.0ea93",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 1451.2332763671875,\r
         "y": 6879.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6da29c89.3512ec",\r
-                "23a2345e.db2bfc",\r
-                "4ea496a3.5a8a68"\r
+                "40aef7f6.0b7228",\r
+                "4576702d.22188",\r
+                "1c9c9766.902671"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ea496a3.5a8a68",\r
+        "id": "1c9c9766.902671",\r
         "type": "switchNode",\r
         "name": "switch connectivity has ethernet service",\r
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
         "outputs": 1,\r
         "x": 1733.433349609375,\r
         "y": 7021.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "fd259c6c.134fa8",\r
-                "9bf814bd.aca8b8"\r
+                "14008b93.c61004",\r
+                "9e2bb4b2.c6532"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9bf814bd.aca8b8",\r
+        "id": "9e2bb4b2.c6532",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 1986.433349609375,\r
         "y": 6999.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "10bd46c.7fcbe39"\r
+                "4241c741.35655"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd259c6c.134fa8",\r
+        "id": "14008b93.c61004",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "outputs": 1,\r
         "x": 1986.433349609375,\r
         "y": 7055.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "10bd46c.7fcbe39",\r
+        "id": "4241c741.35655",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete ethernet Service without token",\r
         "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",\r
         "outputs": 1,\r
         "x": 2336.432861328125,\r
         "y": 6989.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "cc57d141.f3e88",\r
-                "6b29798.5078f08"\r
+                "ea96feaf.f1788",\r
+                "4822a513.5b5dec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc57d141.f3e88",\r
+        "id": "ea96feaf.f1788",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 2668.932861328125,\r
         "y": 6963.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e4bf775a.d74c18"\r
+                "99064a7c.800f78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b29798.5078f08",\r
+        "id": "4822a513.5b5dec",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 2672.932861328125,\r
         "y": 7003.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9dbbe180.4c39c"\r
+                "75af94b2.bd71a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9dbbe180.4c39c",\r
+        "id": "75af94b2.bd71a4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 2860.432861328125,\r
         "y": 7007.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
-            []\r
+            [\r
+                "383276dd.aedfd2"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "e4bf775a.d74c18",\r
+        "id": "99064a7c.800f78",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 2856.932861328125,\r
         "y": 6967.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "78f62ea.0af84d",\r
+        "id": "787fd0ee.fe0408",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete Underlay OTN tunnel from the LEAF ethernet Service",\r
         "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",\r
         "outputs": 1,\r
         "x": 1089.25,\r
         "y": 4706.6856689453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "51c55595.1dd8cc",\r
-                "c498093d.59e4c8"\r
+                "9f0cae6f.29b72",\r
+                "ae365d21.2b4fd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51c55595.1dd8cc",\r
+        "id": "9f0cae6f.29b72",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 1517.749755859375,\r
         "y": 4694.6856689453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "bc110a38.b317b"\r
+                "b4e1628f.b3806"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c498093d.59e4c8",\r
+        "id": "ae365d21.2b4fd8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 1521.749755859375,\r
         "y": 4734.6856689453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5805f739.dc8f9"\r
+                "f7f8736e.92596"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc110a38.b317b",\r
+        "id": "b4e1628f.b3806",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 1675.749755859375,\r
         "y": 4694.6856689453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5805f739.dc8f9",\r
+        "id": "f7f8736e.92596",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 1679.249755859375,\r
         "y": 4734.6856689453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6f96293b.020fc",\r
+        "id": "e95ba342.193f38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "outputs": 1,\r
         "x": 5113,\r
         "y": 5027.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "aad45f58.fbf018",\r
-                "2530767d.abaa5a",\r
-                "b9bc9e8d.66a4b8"\r
+                "6274dc16.d97334",\r
+                "78a742b8.f3e49c",\r
+                "a7f7a97f.231788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9bc9e8d.66a4b8",\r
+        "id": "a7f7a97f.231788",\r
         "type": "set",\r
         "name": "set vpnNameToSearch",\r
         "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",\r
         "comments": "",\r
         "x": 5340,\r
         "y": 4972.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aad45f58.fbf018",\r
+        "id": "6274dc16.d97334",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 5494,\r
         "y": 5024.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2530767d.abaa5a",\r
+        "id": "78a742b8.f3e49c",\r
         "type": "switchNode",\r
         "name": "switch $foundVpnName",\r
         "xml": "<switch test=\"`$foundVpnName`\">\n\n",\r
         "outputs": 1,\r
         "x": 5339,\r
         "y": 5079.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5fd0edea.97a1fc"\r
+                "198065a6.b0f88a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5fd0edea.97a1fc",\r
+        "id": "198065a6.b0f88a",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 5518,\r
         "y": 5078.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "48fa24ff.a12f6c"\r
+                "9b07993f.50303"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79dba259.2612cc",\r
+        "id": "da74bb6.e442948",\r
         "type": "set",\r
         "name": "unset secondary related variables",\r
         "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",\r
         "comments": "",\r
         "x": 3380.249969482422,\r
         "y": 433.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "11c024cf.1cb7db",\r
+        "id": "feffc86e.486bc",\r
         "type": "set",\r
         "name": "set network-route-three",\r
         "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",\r
         "comments": "",\r
         "x": 3344.249969482422,\r
         "y": 683.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8bfce836.dcd148",\r
+        "id": "12bfceb8.d75889",\r
         "type": "switchNode",\r
         "name": "switch secondary empty?",\r
         "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",\r
         "outputs": 1,\r
         "x": 3347.666473388672,\r
         "y": 725.5357360839844,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2011ad7a.50e2d2",\r
-                "3e343af8.ce24be"\r
+                "692e1a2b.3a9c5c",\r
+                "b2412330.9864f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2011ad7a.50e2d2",\r
+        "id": "692e1a2b.3a9c5c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 3586.6663513183594,\r
         "y": 561.5357666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1f12a88c.b01c37"\r
+                "cf959ce5.f99248"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e343af8.ce24be",\r
+        "id": "b2412330.9864f8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 3595.6663513183594,\r
         "y": 608.5357666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d6d1ae0e.a40e7"\r
+                "5a3f29c4.e69d68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6d1ae0e.a40e7",\r
+        "id": "5a3f29c4.e69d68",\r
         "type": "set",\r
         "name": "set hasSecondary true",\r
         "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",\r
         "comments": "",\r
         "x": 3809.6663513183594,\r
         "y": 602.5357666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1f12a88c.b01c37",\r
+        "id": "cf959ce5.f99248",\r
         "type": "set",\r
         "name": "set hasSecondary false",\r
         "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",\r
         "comments": "",\r
         "x": 3813.6663513183594,\r
         "y": 558.5357666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "41d8ce05.5caae",\r
+        "id": "50bdde17.ca9b2",\r
         "type": "outcome",\r
         "name": "SECONDARY-ROOT",\r
         "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
         "outputs": 1,\r
         "x": 4175.700408935547,\r
         "y": 511.9857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "57b53193.85d2e8"\r
+                "eb2d50e2.230b88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57b53193.85d2e8",\r
+        "id": "eb2d50e2.230b88",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4349.700408935547,\r
         "y": 506.9857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2292f0ec.6f9e9",\r
-                "f8b394d0.6213f"\r
+                "7743c0e4.ff58d",\r
+                "fbbd6ec6.676af8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2292f0ec.6f9e9",\r
+        "id": "7743c0e4.ff58d",\r
         "type": "set",\r
         "name": "set network-route-SECONDARY-ROOT",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4593.700653076172,\r
         "y": 498.9857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f8b394d0.6213f",\r
+        "id": "fbbd6ec6.676af8",\r
         "type": "set",\r
         "name": "set network-route-C",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4539.700653076172,\r
         "y": 538.9857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4bc67983.47c6f",\r
+        "id": "f2575655.f8e378",\r
         "type": "outcome",\r
         "name": "SECONDARY-ROOT",\r
         "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
         "outputs": 1,\r
         "x": 4144.700408935547,\r
         "y": 741.3857421875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ca96ae7a.f7e118"\r
+                "9c041385.58f0a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca96ae7a.f7e118",\r
+        "id": "9c041385.58f0a8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4302.700164794922,\r
         "y": 784.3855590820312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "bdef3637.91db48",\r
-                "b84fc7dd.a088f8"\r
+                "d46c9c27.1618a",\r
+                "fae38fd4.0207e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bdef3637.91db48",\r
+        "id": "d46c9c27.1618a",\r
         "type": "set",\r
         "name": "set network-route-SECONDARY-ROOT",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4524.700164794922,\r
         "y": 770.3856811523438,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b84fc7dd.a088f8",\r
+        "id": "fae38fd4.0207e8",\r
         "type": "set",\r
         "name": "set network-route-C",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4470.700164794922,\r
         "y": 810.3856811523438,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ec6aad53.7d628",\r
+        "id": "3b541994.2db38e",\r
         "type": "save",\r
         "name": "get network-route-three from aai",\r
         "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\">",\r
         "outputs": 1,\r
         "x": 3356.133270263672,\r
         "y": 977.6190185546875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "60b6baf9.326c5c",\r
-                "fffcc6ce.01cc38",\r
-                "232b371a.13f76"\r
+                "a7d11d5e.62ca",\r
+                "b2aac144.2741f8",\r
+                "fb257074.006628"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60b6baf9.326c5c",\r
+        "id": "a7d11d5e.62ca",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 3596.133270263672,\r
         "y": 960.6190185546875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fffcc6ce.01cc38",\r
+        "id": "b2aac144.2741f8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 3591.642333984375,\r
         "y": 1003.0450744628906,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "232b371a.13f76",\r
+        "id": "fb257074.006628",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3595.642303466797,\r
         "y": 1051.0450439453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b996a975.9f4ee8"\r
+                "9e133df7.481"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b996a975.9f4ee8",\r
+        "id": "9e133df7.481",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 3751.133270263672,\r
         "y": 1020.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2df3eeae.ae260a"\r
+                "5d283673.03481"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2df3eeae.ae260a",\r
+        "id": "5d283673.03481",\r
         "type": "switchNode",\r
         "name": "switch nr type",\r
         "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",\r
         "outputs": 1,\r
         "x": 3873.133270263672,\r
         "y": 967.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "30af5545.05a802",\r
-                "294528ca.16e348",\r
-                "fdf4c0e0.5eff08"\r
+                "bd8b3788.0306c8",\r
+                "a98e1a14.629d2",\r
+                "64a49d41.8a256c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30af5545.05a802",\r
+        "id": "bd8b3788.0306c8",\r
         "type": "outcome",\r
         "name": "ROOT",\r
         "xml": "<outcome value='ROOT'>\n",\r
         "outputs": 1,\r
         "x": 4109.133270263672,\r
         "y": 817.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "58899b33.3d8864"\r
+                "a81c580d.51216"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "294528ca.16e348",\r
+        "id": "a98e1a14.629d2",\r
         "type": "outcome",\r
         "name": "LEAF",\r
         "xml": "<outcome value='LEAF'>\n",\r
         "outputs": 1,\r
         "x": 4105.133270263672,\r
         "y": 873.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2016713.cf9120e"\r
+                "589a315.c47ec5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58899b33.3d8864",\r
+        "id": "a81c580d.51216",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4235.133270263672,\r
         "y": 825.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "23e1076f.823948",\r
-                "e01e107b.4a322"\r
+                "22e46140.c55d46",\r
+                "52abbdbb.d37324"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2016713.cf9120e",\r
+        "id": "589a315.c47ec5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4238.133270263672,\r
         "y": 878.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "42b53bab.59e5ec",\r
-                "9f9141a1.5b5a98"\r
+                "cf0c55ac.b4f5",\r
+                "5defc5f6.f6a484"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fdf4c0e0.5eff08",\r
+        "id": "64a49d41.8a256c",\r
         "type": "outcome",\r
         "name": "SECONDARY-ROOT",\r
         "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
         "outputs": 1,\r
         "x": 4098.133270263672,\r
         "y": 951.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7151cb9d.fcc3b4"\r
+                "e6763c4c.a7231"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7151cb9d.fcc3b4",\r
+        "id": "e6763c4c.a7231",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4254.133270263672,\r
         "y": 972.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "16090c67.366d8c",\r
-                "877ec323.7c8b08"\r
+                "1756c413.4839cc",\r
+                "782ca4c6.82ca7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23e1076f.823948",\r
+        "id": "22e46140.c55d46",\r
         "type": "set",\r
         "name": "set network-route-ROOT",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4482.133270263672,\r
         "y": 855.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e01e107b.4a322",\r
+        "id": "52abbdbb.d37324",\r
         "type": "set",\r
         "name": "set network-route-B",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4474.133270263672,\r
         "y": 897.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "42b53bab.59e5ec",\r
+        "id": "cf0c55ac.b4f5",\r
         "type": "set",\r
         "name": "set network-route-LEAF",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4475.133270263672,\r
         "y": 949.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9f9141a1.5b5a98",\r
+        "id": "5defc5f6.f6a484",\r
         "type": "set",\r
         "name": "set network-route-A",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4462.133270263672,\r
         "y": 989.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "877ec323.7c8b08",\r
+        "id": "782ca4c6.82ca7c",\r
         "type": "set",\r
         "name": "set network-route-C",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4436.133270263672,\r
         "y": 1083.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "16090c67.366d8c",\r
+        "id": "1756c413.4839cc",\r
         "type": "set",\r
         "name": "set network-route-SECONDARY-ROOT",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4498.133270263672,\r
         "y": 1039.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a307068.85126",\r
+        "id": "484721d3.79272",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 3700.13330078125,\r
         "y": 2223.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5e91bdef.ec251c",\r
-                "edfa6b23.11ec28"\r
+                "b5f1ffe9.23b0f8",\r
+                "1ac2c659.fd2752"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "268e9ec4.4facea",\r
+        "id": "3809e292.fa07fe",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3527.466796875,\r
         "y": 2224.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2a307068.85126"\r
+                "484721d3.79272"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15820d3a.1e0693",\r
+        "id": "9915b355.be7de",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 3536.957763671875,\r
         "y": 2266.8598022460938,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5a5c2368.a7e5dc",\r
+        "id": "a933d5e7.aab9f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 3525.466796875,\r
         "y": 2313.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5e91bdef.ec251c",\r
+        "id": "b5f1ffe9.23b0f8",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "outputs": 1,\r
         "x": 3990.466796875,\r
         "y": 2239.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "fab0baab.63daf",\r
-                "4fbe9a1d.f89b1c"\r
+                "5643d89b.9da4c",\r
+                "ff517248.3a648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4fbe9a1d.f89b1c",\r
+        "id": "ff517248.3a648",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4213.466796875,\r
         "y": 2194.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e7a6f67c.223ba8"\r
+                "55ae5854.3eda38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fab0baab.63daf",\r
+        "id": "5643d89b.9da4c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 4215.466796875,\r
         "y": 2258.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e4fc9765.fde21"\r
+                "b94af8ff.6b0728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad2e0fde.b44de8",\r
+        "id": "729e2fc5.81fb",\r
         "type": "save",\r
         "name": "get p-interface-dst from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 3321.466796875,\r
         "y": 2245.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "268e9ec4.4facea",\r
-                "15820d3a.1e0693",\r
-                "5a5c2368.a7e5dc"\r
+                "3809e292.fa07fe",\r
+                "9915b355.be7de",\r
+                "a933d5e7.aab9f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8876fe3a.88e278",\r
+        "id": "c78860d4.be69b",\r
         "type": "comment",\r
         "name": "Question?",\r
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
         "comments": "",\r
         "x": 3260.466796875,\r
         "y": 2203.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c02bc34.16c814",\r
+        "id": "b3267f6f.ff1998",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "outputs": 1,\r
         "x": 3341.466796875,\r
         "y": 2093.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "85d9fc70.3a0b8",\r
-                "63a7add0.8255ec"\r
+                "95bacf59.0ff4f",\r
+                "1f5368f.a927697"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63a7add0.8255ec",\r
+        "id": "1f5368f.a927697",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 3564.466796875,\r
         "y": 2079.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "39d5594f.5d224e"\r
+                "d9fb5654.5b333"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85d9fc70.3a0b8",\r
+        "id": "95bacf59.0ff4f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 3566.466796875,\r
         "y": 2112.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "39d5594f.5d224e",\r
+        "id": "d9fb5654.5b333",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 3712.466796875,\r
         "y": 2072.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "cf9e5f0.1f2092",\r
-                "6b6736af.eb70a"\r
+                "5dfbdc91.e62934",\r
+                "c6faa1d4.308aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf9e5f0.1f2092",\r
+        "id": "5dfbdc91.e62934",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 3904.4666748046875,\r
         "y": 2009.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "edfa6b23.11ec28",\r
+        "id": "1ac2c659.fd2752",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 3971.466796875,\r
         "y": 2370.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c80278c9.710488"\r
+                "65bc2e8.d7ad75"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c80278c9.710488",\r
+        "id": "65bc2e8.d7ad75",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 4177.466796875,\r
         "y": 2370.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7e2cf131.a58a08"\r
+                "1afa33da.5ab90c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b6736af.eb70a",\r
+        "id": "c6faa1d4.308aa",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "outputs": 1,\r
         "x": 3926.4666748046875,\r
         "y": 2077.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9d1ec1c.6f0f9c",\r
-                "f4e7e55c.530698",\r
-                "d7c76719.0fc4b"\r
+                "5532b203.91ac2c",\r
+                "8b9d700b.47a8d",\r
+                "394e6c3a.4b06ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d1ec1c.6f0f9c",\r
+        "id": "5532b203.91ac2c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4121.966796875,\r
         "y": 2029.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "13bd6284.e3089d"\r
+                "6665fa87.172574"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4e7e55c.530698",\r
+        "id": "8b9d700b.47a8d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 4113.966796875,\r
         "y": 2084.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "56e4b2a7.59d05c"\r
+                "de859847.0ba4f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d7c76719.0fc4b",\r
+        "id": "394e6c3a.4b06ac",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 4118.966796875,\r
         "y": 2141.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "67615599.b73f0c"\r
+                "bb9f9dd0.735df"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67615599.b73f0c",\r
+        "id": "bb9f9dd0.735df",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4270.966796875,\r
         "y": 2142.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "13bd6284.e3089d",\r
+        "id": "6665fa87.172574",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4266.34912109375,\r
         "y": 2026.9414367675781,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "3bd0a776.cdf68"\r
+                "5de1cc8d.104a64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d87e7a94.9bda08",\r
+        "id": "62f42d2.2eff654",\r
         "type": "set",\r
         "name": "set SECONDARY-ROOT stuff",\r
         "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",\r
         "comments": "",\r
         "x": 3322.13330078125,\r
         "y": 2338.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3b2ac73.1b40638",\r
+        "id": "657d67ff.88d37",\r
         "type": "comment",\r
         "name": "NOT NEEDED ANYMORE?",\r
         "info": "",\r
         "comments": "",\r
         "x": 4001.133270263672,\r
         "y": 2314.285614013672,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e4fc9765.fde21",\r
+        "id": "b94af8ff.6b0728",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 4374.466796875,\r
         "y": 2277.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e7a6f67c.223ba8",\r
+        "id": "55ae5854.3eda38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4378.466796875,\r
         "y": 2191.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ab9c8c2d.c18e8",\r
-                "2a323f5f.e64b7"\r
+                "98470c66.40aa6",\r
+                "d46d48e0.99162"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e2cf131.a58a08",\r
+        "id": "1afa33da.5ab90c",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "outputs": 1,\r
         "x": 4394.75244140625,\r
         "y": 2369.1075439453125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "cefe725b.0f41e8"\r
+                "ab3c9c27.f71ab"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56e4b2a7.59d05c",\r
+        "id": "de859847.0ba4f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4281.966796875,\r
         "y": 2087.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ab9c8c2d.c18e8",\r
+        "id": "98470c66.40aa6",\r
         "type": "set",\r
         "name": "set ltpId",\r
         "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",\r
         "comments": "",\r
         "x": 4548.466796875,\r
         "y": 2152.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a323f5f.e64b7",\r
+        "id": "d46d48e0.99162",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",\r
         "comments": "",\r
         "x": 4549.466796875,\r
         "y": 2257.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "89cd5649.143b88",\r
+        "id": "e385276.9cfc7d8",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "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",\r
         "comments": "",\r
         "x": 4544.466796875,\r
         "y": 2206.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cefe725b.0f41e8",\r
+        "id": "ab3c9c27.f71ab",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4601.583984375,\r
         "y": 2358.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a03cf587.06cef8",\r
-                "a11cf500.909288",\r
-                "7b4cfab6.8e3e3c"\r
+                "55038a5c.3543e4",\r
+                "ba6f27b7.23068",\r
+                "b4e2b396.74f668"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a03cf587.06cef8",\r
+        "id": "55038a5c.3543e4",\r
         "type": "set",\r
         "name": "set destination ttp-id",\r
         "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",\r
         "comments": "",\r
         "x": 4816.583984375,\r
         "y": 2320.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a11cf500.909288",\r
+        "id": "ba6f27b7.23068",\r
         "type": "get-resource",\r
         "name": "get-resource src TTP",\r
         "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",\r
         "outputs": 1,\r
         "x": 4813.583984375,\r
         "y": 2359.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "1d4bbcf2.4e364b"\r
+                "1dac26ff.18cf11"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b4cfab6.8e3e3c",\r
+        "id": "b4e2b396.74f668",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4769.083984375,\r
         "y": 2401.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5a11b9ac.0be8e",\r
+        "id": "1ebc335e.7ecae5",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "outputs": 1,\r
         "x": 4850.466796875,\r
         "y": 2111.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9451ac43.685578"\r
+                "fdce260a.3abd28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3bd0a776.cdf68",\r
+        "id": "5de1cc8d.104a64",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",\r
         "outputs": 1,\r
         "x": 4450.4666748046875,\r
         "y": 2041.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "baa608db.a0fe08"\r
+                "ed710853.f63fd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "baa608db.a0fe08",\r
+        "id": "ed710853.f63fd",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "outputs": 1,\r
         "x": 4647.466796875,\r
         "y": 2107.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5a11b9ac.0be8e",\r
-                "41776d15.aa3ae4"\r
+                "1ebc335e.7ecae5",\r
+                "55d60384.c1aed4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41776d15.aa3ae4",\r
+        "id": "55d60384.c1aed4",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "outputs": 1,\r
         "x": 4852.466796875,\r
         "y": 2184.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e63bdf76.82117"\r
+                "dc3c174a.64011"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d4bbcf2.4e364b",\r
+        "id": "1dac26ff.18cf11",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4994.083984375,\r
         "y": 2358.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "65012ff0.bac99"\r
+                "84d63541.1d27b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "65012ff0.bac99",\r
+        "id": "84d63541.1d27b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5152.083984375,\r
         "y": 2358.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "8f16bdf7.24b18"\r
+                "e5032679.d8329"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f16bdf7.24b18",\r
+        "id": "e5032679.d8329",\r
         "type": "set",\r
         "name": "set destination tunnel tp ip",\r
         "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
         "x": 5359.083984375,\r
         "y": 2358.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9451ac43.685578",\r
+        "id": "fdce260a.3abd28",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5027.466796875,\r
         "y": 2103.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "801b98ce.90edc",\r
-                "5fb93bf0.4b325c"\r
+                "5e499a66.459cd4",\r
+                "dca5a8c2.a2e2d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5fb93bf0.4b325c",\r
+        "id": "dca5a8c2.a2e2d",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "outputs": 1,\r
         "x": 5235.466796875,\r
         "y": 2110.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "44bfb2a0.4cab3c",\r
-                "f1164e18.e0f19",\r
-                "7ca3e4f2.88fb4c"\r
+                "5837fed4.78811",\r
+                "3b1607b7.8add2",\r
+                "d23ccac.f36ffb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e63bdf76.82117",\r
+        "id": "dc3c174a.64011",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 5029.466796875,\r
         "y": 2176.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "de27c7f7.c9276"\r
+                "a2aaab02.f42f78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "801b98ce.90edc",\r
+        "id": "5e499a66.459cd4",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainC id",\r
         "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",\r
         "comments": "",\r
         "x": 5265.466796875,\r
         "y": 2058.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "de27c7f7.c9276",\r
+        "id": "a2aaab02.f42f78",\r
         "type": "set",\r
         "name": "set domainC ethernet layer network-id",\r
         "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",\r
         "comments": "",\r
         "x": 5264.466796875,\r
         "y": 2300.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "44bfb2a0.4cab3c",\r
+        "id": "5837fed4.78811",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 5445.466796875,\r
         "y": 2101.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "e82fded9.073898"\r
+                "82649274.8d841"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1164e18.e0f19",\r
+        "id": "3b1607b7.8add2",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 5437.466796875,\r
         "y": 2156.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "85250ba4.806898"\r
+                "b977b3e4.7f0818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ca3e4f2.88fb4c",\r
+        "id": "d23ccac.f36ffb8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "outputs": 1,\r
         "x": 5442.466796875,\r
         "y": 2213.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7d5613c0.f5f4cc"\r
+                "cc6cd97.f9dc7a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d5613c0.f5f4cc",\r
+        "id": "cc6cd97.f9dc7a8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 5594.466796875,\r
         "y": 2214.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "85250ba4.806898",\r
+        "id": "b977b3e4.7f0818",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 5605.466796875,\r
         "y": 2159.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e82fded9.073898",\r
+        "id": "82649274.8d841",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 5589.84912109375,\r
         "y": 2098.9415588378906,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "7c8249af.5ed848"\r
+                "d86ccfd2.8a362"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c8249af.5ed848",\r
+        "id": "d86ccfd2.8a362",\r
         "type": "set",\r
         "name": "set controller domainC data",\r
         "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",\r
         "comments": "",\r
         "x": 5804.466796875,\r
         "y": 2095.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1e88543b.84a814",\r
+        "id": "70f331ff.6983c8",\r
         "type": "switchNode",\r
         "name": "switch $hasSecondary",\r
         "xml": "<switch test='`$hasSecondary`'>\n",\r
         "outputs": 1,\r
         "x": 3836.13330078125,\r
         "y": 2707.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "4bbf44dd.c34104"\r
+                "b09a105f.8c6438"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4bbf44dd.c34104",\r
+        "id": "b09a105f.8c6438",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 4027.13330078125,\r
         "y": 2711.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ca18cabf.134c3"\r
+                "3fb841a7.fe1d76"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca18cabf.134c3",\r
+        "id": "3fb841a7.fe1d76",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4154.13330078125,\r
         "y": 2710.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "ef98dd66.570548"\r
+                "5fa41047.5ae908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef98dd66.570548",\r
+        "id": "5fa41047.5ae908",\r
         "type": "save",\r
         "name": "get secondary root uni from aai",\r
         "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",\r
         "outputs": 1,\r
         "x": 4380.467041015625,\r
         "y": 2703.619384765625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c3cc04e3.9995e8",\r
-                "96ef8840.c20b2",\r
-                "50ef7648.d143f"\r
+                "494cb062.3b09d",\r
+                "8f274cf6.78b4a",\r
+                "75ad380b.fe1e68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3cc04e3.9995e8",\r
+        "id": "494cb062.3b09d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "outputs": 1,\r
         "x": 4747.466796875,\r
         "y": 2597.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "625acc3d.d4dd04"\r
+                "e1748800.9b50a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96ef8840.c20b2",\r
+        "id": "8f274cf6.78b4a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "outputs": 1,\r
         "x": 4742.975830078125,\r
         "y": 2642.0452270507812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b87c29ed.e7a1d8"\r
+                "94646798.3ff8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50ef7648.d143f",\r
+        "id": "75ad380b.fe1e68",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "outputs": 1,\r
         "x": 4738.975830078125,\r
         "y": 2692.0452880859375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2796810b.682956"\r
+                "b33dba75.a7d33"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96d93656.6958b8",\r
+        "id": "5fbe7a1c.d00084",\r
         "type": "save",\r
         "name": "update SECONDARY-ROOT UNI in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 5186.976318359375,\r
         "y": 2687.04541015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "625acc3d.d4dd04",\r
+        "id": "e1748800.9b50a8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
         "x": 4910.038330078125,\r
         "y": 2596.9049682617188,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b87c29ed.e7a1d8",\r
+        "id": "94646798.3ff8c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 4910.975830078125,\r
         "y": 2642.0452270507812,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2796810b.682956",\r
+        "id": "b33dba75.a7d33",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "outputs": 1,\r
         "x": 4907.975830078125,\r
         "y": 2692.0452880859375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "5a769bdf.551e9c",\r
-                "96d93656.6958b8"\r
+                "d2b432cc.1ba93",\r
+                "5fbe7a1c.d00084"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a769bdf.551e9c",\r
+        "id": "d2b432cc.1ba93",\r
         "type": "set",\r
         "name": "set new bw",\r
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source - $bwToBeDecreased`' />\n",\r
         "comments": "",\r
         "x": 5089.9765625,\r
         "y": 2634.0452880859375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b7814ecb.1580d",\r
+        "id": "c59416d6.8ba4c8",\r
         "type": "switchNode",\r
         "name": "switch tmp.mmUNI-id-long != SECONDARY-ROOT UNI",\r
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.SECONDARY-ROOT.uni-p-interface-long`\">\n\n",\r
         "outputs": 1,\r
         "x": 4624.467041015625,\r
         "y": 3547.6190185546875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "cf2467a.3e0e698"\r
+                "5928f063.6a717"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf2467a.3e0e698",\r
+        "id": "5928f063.6a717",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 4914.467041015625,\r
         "y": 3549.6190185546875,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "774ecc4a.3ad124"\r
+                "3416f94d.d55766"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc616200.2baf58",\r
+        "id": "dc36b830.307698",\r
         "type": "switchNode",\r
         "name": "switch $hasSecondary",\r
         "xml": "<switch test='`$hasSecondary`'>\n",\r
         "outputs": 1,\r
         "x": 4277,\r
         "y": 5777.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b0c64a0a.29dee8"\r
+                "124e668b.8a0c71"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0c64a0a.29dee8",\r
+        "id": "124e668b.8a0c71",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 4468,\r
         "y": 5781.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b39a4675.08bbf"\r
+                "3f950141.3b094e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b39a4675.08bbf",\r
+        "id": "3f950141.3b094e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 4595,\r
         "y": 5780.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6b59d25.075b22c"\r
+                "6756d23f.fb95d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b59d25.075b22c",\r
+        "id": "6756d23f.fb95d4",\r
         "type": "switchNode",\r
         "name": "switch 2-ROOTS in same domain?",\r
         "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",\r
         "outputs": 1,\r
         "x": 4820.3330078125,\r
         "y": 5782.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "84c8a22.08a86e",\r
-                "8ae9054d.68fd08"\r
+                "c6ced4f8.328df",\r
+                "bfbd9ba5.66b2f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84c8a22.08a86e",\r
+        "id": "c6ced4f8.328df",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 5030.3330078125,\r
         "y": 5759.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "93a0772f.9be09"\r
+                "7a2bf212.dfea8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ae9054d.68fd08",\r
+        "id": "bfbd9ba5.66b2f8",\r
         "type": "outcomeTrue",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 5035.3330078125,\r
         "y": 5808.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "2db83bd3.7a132c"\r
+                "cebc5e3b.0e3a98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93a0772f.9be09",\r
+        "id": "7a2bf212.dfea8c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 5156.3330078125,\r
         "y": 5759.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2db83bd3.7a132c",\r
+        "id": "cebc5e3b.0e3a98",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 5153.3330078125,\r
         "y": 5815.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "81928378.5f469",\r
-                "9b2406e3.5e7a08"\r
+                "65ef26ee.10a09",\r
+                "893a526e.ec5e18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81928378.5f469",\r
+        "id": "65ef26ee.10a09",\r
         "type": "save",\r
         "name": "update SECONDARY-ROOT connectivity resource in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 5467.3330078125,\r
         "y": 5874.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6888e6dc.67e04",\r
+        "id": "7678c022.e9095",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 5399.550048828125,\r
         "y": 5826.4190673828125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b2406e3.5e7a08",\r
+        "id": "893a526e.ec5e18",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 5598,\r
         "y": 5784.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d07ac0db.fa9818",\r
+        "id": "e0d5d04e.46068",\r
         "type": "switchNode",\r
         "name": "switch $hasSecondary",\r
         "xml": "<switch test='`$hasSecondary`'>\n",\r
         "outputs": 1,\r
         "x": 868,\r
         "y": 4974.6187744140625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a4f6e106.afc2d"\r
+                "a56cc6d9.68657"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a4f6e106.afc2d",\r
+        "id": "a56cc6d9.68657",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 1059,\r
         "y": 4978.6187744140625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "617b198c.79c0a"\r
+                "e90b308b.e1e54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "617b198c.79c0a",\r
+        "id": "e90b308b.e1e54",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 1186,\r
         "y": 4977.6187744140625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "f89a9d64.adeb98"\r
+                "a8eda34d.bea12"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f89a9d64.adeb98",\r
+        "id": "a8eda34d.bea12",\r
         "type": "switchNode",\r
         "name": "switch 2-ROOTS in same domain?",\r
         "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",\r
         "outputs": 1,\r
         "x": 1411.3330078125,\r
         "y": 4979.6187744140625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "6035813d.1e7338",\r
-                "b4705906.43572"\r
+                "8a22e9e3.103c4",\r
+                "489f9bfc.0598fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6035813d.1e7338",\r
+        "id": "8a22e9e3.103c4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 1621.3330078125,\r
         "y": 4956.6187744140625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "b1155932.92831"\r
+                "d0fe931e.edcfb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4705906.43572",\r
+        "id": "489f9bfc.0598fc",\r
         "type": "outcomeTrue",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 1626.3330078125,\r
         "y": 5005.6187744140625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "62407b64.a07c9c"\r
+                "8c7de2ba.22e088"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b1155932.92831",\r
+        "id": "d0fe931e.edcfb",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 1747.3330078125,\r
         "y": 4956.6187744140625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "62407b64.a07c9c",\r
+        "id": "8c7de2ba.22e088",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 1744.3330078125,\r
         "y": 5012.6187744140625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d0271ecc.53e168",\r
-                "83be22a.f7cdb6"\r
+                "65c8b788.d0e558",\r
+                "4c911e6c.738418"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83be22a.f7cdb6",\r
+        "id": "4c911e6c.738418",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 2189,\r
         "y": 4981.6187744140625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d29b17e9.2cbf8",\r
+        "id": "dd48d8e6.216f08",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 1990.550048828125,\r
         "y": 5023.4185791015625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d0271ecc.53e168",\r
+        "id": "65c8b788.d0e558",\r
         "type": "save",\r
         "name": "update SECONDARY-ROOT connectivity resource in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 2058.3330078125,\r
         "y": 5071.6187744140625,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e88fc760.9f3988",\r
+        "id": "1ed03004.8d6e4",\r
         "type": "switchNode",\r
         "name": "switch $hasSecondary",\r
         "xml": "<switch test='`$hasSecondary`'>\n",\r
         "outputs": 1,\r
         "x": 1470.3333740234375,\r
         "y": 5815.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "c0695dac.6b173"\r
+                "fb5466ce.3f1ab"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c0695dac.6b173",\r
+        "id": "fb5466ce.3f1ab",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 1661.3333740234375,\r
         "y": 5819.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "a704fbb5.caa0b"\r
+                "dfa5085f.0e0158"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a704fbb5.caa0b",\r
+        "id": "dfa5085f.0e0158",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 1788.3333740234375,\r
         "y": 5818.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "bc272657.983128"\r
+                "7e51bd6c.d2742c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc272657.983128",\r
+        "id": "7e51bd6c.d2742c",\r
         "type": "switchNode",\r
         "name": "switch 2-ROOTS in same domain?",\r
         "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",\r
         "outputs": 1,\r
         "x": 2013.6663818359375,\r
         "y": 5820.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "31bdfa25.d18a2e",\r
-                "c242900c.77afd8"\r
+                "6b07f1cb.4afc3",\r
+                "110d7be3.9bb1f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31bdfa25.d18a2e",\r
+        "id": "6b07f1cb.4afc3",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "outputs": 1,\r
         "x": 2223.6663818359375,\r
         "y": 5797.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "9d78f5ef.5cf228"\r
+                "8b99f6ab.569ed"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c242900c.77afd8",\r
+        "id": "110d7be3.9bb1f4",\r
         "type": "outcomeTrue",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "outputs": 1,\r
         "x": 2228.6663818359375,\r
         "y": 5846.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d542d85e.71ea7"\r
+                "675a78e3.b9924"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d78f5ef.5cf228",\r
+        "id": "8b99f6ab.569ed",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 2349.6663818359375,\r
         "y": 5797.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d542d85e.71ea7",\r
+        "id": "675a78e3.b9924",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "outputs": 1,\r
         "x": 2346.6663818359375,\r
         "y": 5853.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             [\r
-                "d23f59ed.73bc4",\r
-                "2e5ee108.277b9e"\r
+                "4f39f0f0.b363c8",\r
+                "87158cb0.5a00c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e5ee108.277b9e",\r
+        "id": "87158cb0.5a00c8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
         "outputs": 1,\r
         "x": 2791.3333740234375,\r
         "y": 5822.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "868b21d1.a7652",\r
+        "id": "b15d8a43.4b5da8",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 2592.8834228515625,\r
         "y": 5864.4190673828125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d23f59ed.73bc4",\r
+        "id": "4f39f0f0.b363c8",\r
         "type": "save",\r
         "name": "update SECONDARY-ROOT connectivity resource in AAI",\r
         "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",\r
         "outputs": 1,\r
         "x": 2660.6663818359375,\r
         "y": 5912.6192626953125,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "73f93f1a.1715d8",\r
+        "id": "bc0be831.bf6158",\r
         "type": "execute",\r
         "name": "execute Terminate SSE Connection",\r
         "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",\r
         "outputs": 1,\r
         "x": 1520.7666625976562,\r
         "y": 6121,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5f7e37aa.0d2258",\r
+        "id": "75a2fd5c.c75aac",\r
         "type": "set",\r
         "name": "set parameters",\r
         "xml": "<set>\n<parameter name='subscriptionId' value='`$rcvd-bandwidth-value`' />\n",\r
         "comments": "",\r
         "x": 1452.800048828125,\r
         "y": 6062.39990234375,\r
-        "z": "1806503a.76a7a",\r
+        "z": "df66c4ba.dc49d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29311664.f24592",\r
+        "id": "b1b75307.3fe99",\r
         "type": "execute",\r
         "name": "execute Terminate SSE Connection",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2069.433349609375,\r
-        "y": 5569.2333984375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2081.433349609375,\r
+        "y": 5541.2333984375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "eb743ad2.daea58",\r
+        "type": "execute",\r
+        "name": "execute delete service-pm",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $tmp.the-connectivity.etht-svc-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"delete\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"responsePrefix\" value=\"ethdelete-result\"/>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2045.333251953125,\r
+        "y": 5586.33349609375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4ed6624e.3d3df4",\r
+        "type": "execute",\r
+        "name": "execute delete service-pm",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"delete\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"responsePrefix\" value=\"ethdelete-result\"/>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4443.6669921875,\r
+        "y": 6460.33349609375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "383276dd.aedfd2",\r
+        "type": "execute",\r
+        "name": "execute delete service-pm",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"delete\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"responsePrefix\" value=\"ethdelete-result\"/>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3103.666748046875,\r
+        "y": 7008.33349609375,\r
+        "z": "df66c4ba.dc49d",\r
         "wires": [\r
             []\r
         ]\r