Support for 1+1 protection path for a cloud leased-line (CLL) service.
[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 50f87f4..2a4ee23 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "4eba0592.d8f9ec",\r
+        "id": "a85fdd45.18532",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
         "x": 171.88333129882812,\r
-        "y": 174,\r
-        "z": "d1eceead.adafe",\r
+        "y": 177,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2ad94242.d34e8e"\r
+                "2eaf78b5.ba0318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ad94242.d34e8e",\r
+        "id": "2eaf78b5.ba0318",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
         "x": 456.1690216064453,\r
-        "y": 235.23810863494873,\r
-        "z": "d1eceead.adafe",\r
+        "y": 238.23810863494873,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "86bffa6e.8633f8"\r
+                "28e9741c.d81dfc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86bffa6e.8633f8",\r
+        "id": "28e9741c.d81dfc",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 462.3119354248047,\r
-        "y": 320.0000305175781,\r
-        "z": "d1eceead.adafe",\r
+        "y": 323.0000305175781,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "47cd43dd.6a0c84"\r
+                "df14e360.a098e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47cd43dd.6a0c84",\r
+        "id": "df14e360.a098e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 811.8833312988281,\r
-        "y": 379,\r
-        "z": "d1eceead.adafe",\r
+        "y": 382,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "17095ff1.ceb8e",\r
-                "f2cac95d.2dd4f",\r
-                "41a5db6f.16b124"\r
+                "e87fcff0.55123",\r
+                "b8bbed17.73d098",\r
+                "ed2f6b65.8be208"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17095ff1.ceb8e",\r
+        "id": "e87fcff0.55123",\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": 649.9302978515625,\r
-        "z": "d1eceead.adafe",\r
+        "y": 652.9302978515625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2cac95d.2dd4f",\r
+        "id": "b8bbed17.73d098",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1134.6452941894531,\r
-        "y": 352.33331298828125,\r
-        "z": "d1eceead.adafe",\r
+        "y": 355.33331298828125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d39ef031.51bcf8",\r
-                "d0a14c94.f617f8",\r
-                "66ff38b5.215e28"\r
+                "c5539326.dc2ce",\r
+                "9370873a.5ec85",\r
+                "3f911b4d.a21904"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d39ef031.51bcf8",\r
+        "id": "c5539326.dc2ce",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1359.6452941894531,\r
-        "y": 210.33331298828125,\r
-        "z": "d1eceead.adafe",\r
+        "y": 213.33331298828125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6bec9327.9503c4"\r
+                "a5dbcf8a.fe1748"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0a14c94.f617f8",\r
+        "id": "9370873a.5ec85",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1355.1362609863281,\r
-        "y": 279.9073486328125,\r
-        "z": "d1eceead.adafe",\r
+        "y": 282.9073486328125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "73227915.55ca3"\r
+                "49f0af9f.5fedb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66ff38b5.215e28",\r
+        "id": "3f911b4d.a21904",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1343.6452941894531,\r
-        "y": 326.33331298828125,\r
-        "z": "d1eceead.adafe",\r
+        "y": 329.33331298828125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5c121a7a.2c527c"\r
+                "61830ec6.dfc06"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dcc088f.fb3b378",\r
+        "id": "f78d475.109eab8",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
         "x": 1113.6452941894531,\r
-        "y": 240.33331298828125,\r
-        "z": "d1eceead.adafe",\r
+        "y": 243.33331298828125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "41a5db6f.16b124",\r
+        "id": "ed2f6b65.8be208",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1101.6452941894531,\r
-        "y": 292.33331298828125,\r
-        "z": "d1eceead.adafe",\r
+        "y": 295.33331298828125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6bec9327.9503c4",\r
+        "id": "a5dbcf8a.fe1748",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1599.8833312988281,\r
-        "y": 207,\r
-        "z": "d1eceead.adafe",\r
+        "y": 210,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "52c7d728.b872f8",\r
-                "31624b25.4a6dec"\r
+                "b303ce6.b126d3",\r
+                "55aeefb2.59b1e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73227915.55ca3",\r
+        "id": "49f0af9f.5fedb8",\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": 282.8597717285156,\r
-        "z": "d1eceead.adafe",\r
+        "y": 285.8597717285156,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5c121a7a.2c527c",\r
+        "id": "61830ec6.dfc06",\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": 327,\r
-        "z": "d1eceead.adafe",\r
+        "y": 330,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "52c7d728.b872f8",\r
+        "id": "b303ce6.b126d3",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1804.8833312988281,\r
-        "y": 244,\r
-        "z": "d1eceead.adafe",\r
+        "y": 247,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b08352cf.6ac34"\r
+                "f1542288.012e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31624b25.4a6dec",\r
+        "id": "55aeefb2.59b1e8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1814.8833312988281,\r
-        "y": 171,\r
-        "z": "d1eceead.adafe",\r
+        "y": 174,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b08352cf.6ac34",\r
+        "id": "f1542288.012e3",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1797.8833312988281,\r
-        "y": 319,\r
-        "z": "d1eceead.adafe",\r
+        "y": 322,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "bdd428b9.6fddd",\r
-                "8710bcb7.6e657",\r
-                "6f728611.a8a3e",\r
-                "6d42412e.61e8d",\r
-                "e22daf3c.82e7c8"\r
+                "abe13a08.545e98",\r
+                "7178c36c.cf3274",\r
+                "ac38a7a3.b352e8",\r
+                "d727f01e.ad9c98",\r
+                "8cb68ccc.e851f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50e447ae.0fde38",\r
+        "id": "66649512.c7d5bc",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2283.883331298828,\r
-        "y": 370,\r
-        "z": "d1eceead.adafe",\r
+        "y": 373,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "27d61e5e.f12fe2",\r
-                "2c908c8d.59c394",\r
-                "32fadd2c.e0a1c2"\r
+                "b9d85c6f.27205",\r
+                "376ece8a.ca776a",\r
+                "b6dfab0d.b44bd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27d61e5e.f12fe2",\r
+        "id": "b9d85c6f.27205",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2499.883331298828,\r
-        "y": 437,\r
-        "z": "d1eceead.adafe",\r
+        "y": 440,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4e35bc34.a92d94"\r
+                "c1b489c1.9564e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c908c8d.59c394",\r
+        "id": "376ece8a.ca776a",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2500.374298095703,\r
-        "y": 336.573974609375,\r
-        "z": "d1eceead.adafe",\r
+        "y": 339.573974609375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6fdcac69.b07bec"\r
+                "742662fc.5de6dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32fadd2c.e0a1c2",\r
+        "id": "b6dfab0d.b44bd8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2495.883331298828,\r
-        "y": 386,\r
-        "z": "d1eceead.adafe",\r
+        "y": 389,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "71176ed6.70694"\r
+                "b4af8420.603268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bdd428b9.6fddd",\r
+        "id": "abe13a08.545e98",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2000.8833312988281,\r
-        "y": 351,\r
-        "z": "d1eceead.adafe",\r
+        "y": 354,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "7043f926.26b93",\r
-                "50e447ae.0fde38",\r
-                "8af2638e.140428",\r
-                "b2d6bb83.745318"\r
+                "7d659bd1.1ff4ec",\r
+                "66649512.c7d5bc",\r
+                "cfd6a168.75b7d8",\r
+                "fe93cfa.921edb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7043f926.26b93",\r
+        "id": "7d659bd1.1ff4ec",\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": 289,\r
-        "z": "d1eceead.adafe",\r
+        "y": 292,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6d42412e.61e8d",\r
+        "id": "d727f01e.ad9c98",\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": 301,\r
-        "z": "d1eceead.adafe",\r
+        "y": 304,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8710bcb7.6e657",\r
+        "id": "7178c36c.cf3274",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2017.8833312988281,\r
-        "y": 160,\r
-        "z": "d1eceead.adafe",\r
+        "y": 163,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6f728611.a8a3e",\r
+        "id": "ac38a7a3.b352e8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2029.8833312988281,\r
-        "y": 201,\r
-        "z": "d1eceead.adafe",\r
+        "y": 204,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8a5a98d5.6ebb1",\r
+        "id": "eed8a5a0.afccb8",\r
         "type": "comment",\r
         "name": "The following two nodes are for PCE",\r
         "info": "",\r
         "comments": "",\r
         "x": 2054.883331298828,\r
-        "y": 113,\r
-        "z": "d1eceead.adafe",\r
+        "y": 116,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2303563c.e9131a",\r
+        "id": "141349a5.fce93e",\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": 247,\r
-        "z": "d1eceead.adafe",\r
+        "y": 250,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6fdcac69.b07bec",\r
+        "id": "742662fc.5de6dc",\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": 339,\r
-        "z": "d1eceead.adafe",\r
+        "y": 342,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "71176ed6.70694",\r
+        "id": "b4af8420.603268",\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": 388.1402587890625,\r
-        "z": "d1eceead.adafe",\r
+        "y": 391.1402587890625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4e35bc34.a92d94",\r
+        "id": "c1b489c1.9564e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2680.820831298828,\r
-        "y": 439.1402587890625,\r
-        "z": "d1eceead.adafe",\r
+        "y": 442.1402587890625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6a0085f3.85f3dc"\r
+                "fcfb8da2.5eaaf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a0085f3.85f3dc",\r
+        "id": "fcfb8da2.5eaaf8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2973.820831298828,\r
-        "y": 386.1402587890625,\r
-        "z": "d1eceead.adafe",\r
+        "y": 389.1402587890625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "47170bd3.47cd24",\r
-                "41231d4a.3c5914",\r
-                "413cb45a.a52f94"\r
+                "c3da29e4.d4aec",\r
+                "5d798b7c.bb38bc",\r
+                "f79e6540.82af6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41231d4a.3c5914",\r
+        "id": "5d798b7c.bb38bc",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3247.311798095703,\r
-        "y": 278.7142333984375,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3277.311767578125,\r
+        "y": 45.7142333984375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "ddcd6972.1cc26"\r
+                "90e8e37d.ca8e98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ddcd6972.1cc26",\r
+        "id": "90e8e37d.ca8e98",\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": 3424.883331298828,\r
-        "y": 279,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3454.88330078125,\r
+        "y": 46,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "413cb45a.a52f94",\r
+        "id": "f79e6540.82af6",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3242.820831298828,\r
-        "y": 328.1402587890625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3272.82080078125,\r
+        "y": 95.1402587890625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "29789682.9a5ca2"\r
+                "9bf9393a.ada1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29789682.9a5ca2",\r
+        "id": "9bf9393a.ada1c",\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": 3424.820831298828,\r
-        "y": 328.1402587890625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3454.82080078125,\r
+        "y": 95.1402587890625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47170bd3.47cd24",\r
+        "id": "c3da29e4.d4aec",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3246.820831298828,\r
-        "y": 379.1402587890625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3276.82080078125,\r
+        "y": 146.1402587890625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5d602163.27f0b"\r
+                "614d711.ad6151"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d602163.27f0b",\r
+        "id": "614d711.ad6151",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3426.820831298828,\r
-        "y": 379.1402587890625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3456.82080078125,\r
+        "y": 146.1402587890625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "dd9e7161.bb7c"\r
+                "6f9dfac6.7f7acc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd9e7161.bb7c",\r
+        "id": "6f9dfac6.7f7acc",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2992.883331298828,\r
-        "y": 514,\r
-        "z": "d1eceead.adafe",\r
+        "y": 517,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e567be5f.46cf",\r
-                "117d3c85.14baf3"\r
+                "cc5d43a6.52dac",\r
+                "df06d31e.f926b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "117d3c85.14baf3",\r
+        "id": "df06d31e.f926b8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3302.883331298828,\r
-        "y": 521,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3332.88330078125,\r
+        "y": 288,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e567be5f.46cf",\r
+        "id": "cc5d43a6.52dac",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3301.883331298828,\r
-        "y": 575,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3331.88330078125,\r
+        "y": 342,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "1aa53c9a.ee4c73"\r
+                "9005c08e.45bff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16e58d5c.45543b",\r
+        "id": "7cc4c3ab.96110c",\r
         "type": "outcome",\r
         "name": "network-policy",\r
         "xml": "<outcome value='network-policy'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4046.883331298828,\r
-        "y": 529,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4076.88330078125,\r
+        "y": 296,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e0a75ebb.a4e0a"\r
+                "e1ccec43.b4b718"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0a75ebb.a4e0a",\r
+        "id": "e1ccec43.b4b718",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4223.883209228516,\r
-        "y": 521.9998779296875,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4253.8831787109375,\r
+        "y": 288.9998779296875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "64783b1d.9ea984",\r
-                "aa6dd372.e093d"\r
+                "6a0eff2d.7a17d8",\r
+                "c12539fb.18b098"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1aa53c9a.ee4c73",\r
+        "id": "9005c08e.45bff",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3465.883331298828,\r
-        "y": 501,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3495.88330078125,\r
+        "y": 268,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "9d9386aa.4ba0f",\r
-                "a5c7d0d0.70a6f8"\r
+                "c7cdd797.5d9c98",\r
+                "a2ea3a5e.b8028"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d9386aa.4ba0f",\r
+        "id": "c7cdd797.5d9c98",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3746.883331298828,\r
-        "y": 457,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3776.88330078125,\r
+        "y": 224,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "ac9ffe20.350ab8"\r
+                "fdc5f0cb.fc2a38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac9ffe20.350ab8",\r
+        "id": "fdc5f0cb.fc2a38",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4008.883331298828,\r
-        "y": 457,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4038.88330078125,\r
+        "y": 224,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "16e58d5c.45543b"\r
+                "7cc4c3ab.96110c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64783b1d.9ea984",\r
+        "id": "6a0eff2d.7a17d8",\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": 4466.883209228516,\r
-        "y": 478.9998779296875,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4496.8831787109375,\r
+        "y": 245.9998779296875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aa6dd372.e093d",\r
+        "id": "c12539fb.18b098",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4455.883209228516,\r
-        "y": 533.9998779296875,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4485.8831787109375,\r
+        "y": 300.9998779296875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a2aec981.c05928",\r
-                "c6a2ea9c.683df",\r
-                "b8928013.256998"\r
+                "53e90890.b88808",\r
+                "99815c1a.2d5d9",\r
+                "ef9ec486.51c458"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8928013.256998",\r
+        "id": "ef9ec486.51c458",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4708.883331298828,\r
-        "y": 420,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4738.88330078125,\r
+        "y": 187,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "83be4f6.3f006b"\r
+                "928a2f6e.9dcef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83be4f6.3f006b",\r
+        "id": "928a2f6e.9dcef",\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": 4857.454864501953,\r
-        "y": 420.2857666015625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4887.454833984375,\r
+        "y": 187.2857666015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "586d6db7.c2d804",\r
+        "id": "5f26f831.604e6",\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": 4856.392364501953,\r
-        "y": 464.426025390625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4886.392333984375,\r
+        "y": 231.426025390625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c6a2ea9c.683df",\r
+        "id": "99815c1a.2d5d9",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4697.392364501953,\r
-        "y": 464.426025390625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4727.392333984375,\r
+        "y": 231.426025390625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "586d6db7.c2d804"\r
+                "5f26f831.604e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2aec981.c05928",\r
+        "id": "53e90890.b88808",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4704.392364501953,\r
-        "y": 543.426025390625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4734.392333984375,\r
+        "y": 310.426025390625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4d4b39ee.fece78"\r
+                "c7f5e24b.264e08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d4b39ee.fece78",\r
+        "id": "c7f5e24b.264e08",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4843.392364501953,\r
-        "y": 543.426025390625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4873.392333984375,\r
+        "y": 310.426025390625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "68714312.362fe4",\r
-                "860808d4.582b4"\r
+                "bd533599.870598",\r
+                "5b846fca.358228"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68714312.362fe4",\r
+        "id": "bd533599.870598",\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": 5048.883331298828,\r
-        "y": 541,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5078.88330078125,\r
+        "y": 308,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "860808d4.582b4",\r
+        "id": "5b846fca.358228",\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": 5047.883331298828,\r
-        "y": 587,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5077.88330078125,\r
+        "y": 354,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a5c7d0d0.70a6f8",\r
+        "id": "a2ea3a5e.b8028",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3563.883331298828,\r
-        "y": 573,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3593.88330078125,\r
+        "y": 340,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "91204981.e8b1c8"\r
+                "25258bcb.d218b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91204981.e8b1c8",\r
+        "id": "25258bcb.d218b4",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3843.883331298828,\r
-        "y": 573,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3873.88330078125,\r
+        "y": 340,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "815c7496.5664a8"\r
+                "f26cca47.0cf8c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "815c7496.5664a8",\r
+        "id": "f26cca47.0cf8c8",\r
         "type": "outcome",\r
         "name": "logical-link",\r
         "xml": "<outcome value='logical-link'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2256.8834533691406,\r
-        "y": 826.0001220703125,\r
-        "z": "d1eceead.adafe",\r
+        "y": 829.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2e1a5e6a.390622"\r
+                "d5f97832.254d88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e1a5e6a.390622",\r
+        "id": "d5f97832.254d88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2433.883331298828,\r
-        "y": 819,\r
-        "z": "d1eceead.adafe",\r
+        "y": 822,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "fda12a63.354948",\r
-                "9acb494f.3c831"\r
+                "ae5af3.3e9a4d1",\r
+                "12544593.6754f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fda12a63.354948",\r
+        "id": "ae5af3.3e9a4d1",\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": 776,\r
-        "z": "d1eceead.adafe",\r
+        "y": 779,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9acb494f.3c831",\r
+        "id": "12544593.6754f2",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2665.883331298828,\r
-        "y": 831,\r
-        "z": "d1eceead.adafe",\r
+        "y": 834,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2cf3e7af.84ed7",\r
-                "7720ff91.14ecb8",\r
-                "6208751c.cb4214"\r
+                "79a8fecf.d1f59",\r
+                "b24729e3.47e65",\r
+                "4a9529bf.26c65"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cf3e7af.84ed7",\r
+        "id": "79a8fecf.d1f59",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2957.374298095703,\r
-        "y": 809.573974609375,\r
-        "z": "d1eceead.adafe",\r
+        "y": 812.573974609375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "644aada5.da5074"\r
+                "d25941f1.946b68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7720ff91.14ecb8",\r
+        "id": "b24729e3.47e65",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2945.883331298828,\r
-        "y": 854,\r
-        "z": "d1eceead.adafe",\r
+        "y": 857,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b4b18b88.8b8778"\r
+                "11547725.a203f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "644aada5.da5074",\r
+        "id": "d25941f1.946b68",\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": 809.8597412109375,\r
-        "z": "d1eceead.adafe",\r
+        "y": 812.8597412109375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b4b18b88.8b8778",\r
+        "id": "11547725.a203f9",\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": 854,\r
-        "z": "d1eceead.adafe",\r
+        "y": 857,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6208751c.cb4214",\r
+        "id": "4a9529bf.26c65",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2952.883331298828,\r
-        "y": 933,\r
-        "z": "d1eceead.adafe",\r
+        "y": 936,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f4a1f138.8436a"\r
+                "a4fd9348.176d48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4a1f138.8436a",\r
+        "id": "a4fd9348.176d48",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3091.883331298828,\r
-        "y": 933,\r
-        "z": "d1eceead.adafe",\r
-        "wires": [\r
-            [\r
-                "64b776d1.df13b8",\r
-                "cf58d1a3.b75bc8",\r
-                "a4d7ff96.ceb5f8",\r
-                "4f57fa4.5908a84",\r
-                "93281de6.9193c8",\r
-                "279a0c66.95b87c",\r
-                "2fd6be0.ec30642",\r
-                "3458f9fd.a9fdce",\r
-                "b114579a.337d4",\r
-                "83634982.62f32",\r
-                "a78c5989.f5207",\r
-                "dc895d5a.f09ef",\r
-                "8c6f82a5.234d18",\r
-                "a984d0c7.8574d",\r
-                "49347bae.3e2974"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "fe79d8e9.168438",\r
+        "y": 936,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "6c4953ff.9536c4",\r
+                "757555b7.a275b4",\r
+                "da8313.90b574f",\r
+                "a53e9db6.011d6",\r
+                "2b20579c.df8a7",\r
+                "1abe7496.3f7c9b",\r
+                "652968a1.d93e88",\r
+                "f369a6e9.5de548",\r
+                "fc221d76.582c9",\r
+                "5fd92a3e.ed6fec",\r
+                "4a864e6a.471e",\r
+                "e264db5d.2744d",\r
+                "afaae138.bb9798",\r
+                "121ba89c.f4d387",\r
+                "e7a924f9.c6032",\r
+                "e3b4a4d3.b60598",\r
+                "22dcd918.a9e88e",\r
+                "1743864d.d3d2f2",\r
+                "898efbe9.b7aab8",\r
+                "3ddfa25a.4bc3f6",\r
+                "f7bdbced.e4e6e",\r
+                "b2f7d29a.c36bc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3c4bd54a.0e1cfa",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3405.883331298828,\r
-        "y": 739,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3435.883270263672,\r
+        "y": 410,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "64b776d1.df13b8",\r
+        "id": "6c4953ff.9536c4",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3386.883331298828,\r
-        "y": 789,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3416.883270263672,\r
+        "y": 510,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dc895d5a.f09ef",\r
+        "id": "e264db5d.2744d",\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": 3343.883331298828,\r
-        "y": 834,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3370.883270263672,\r
+        "y": 561,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cf58d1a3.b75bc8",\r
+        "id": "757555b7.a275b4",\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": 3318.883331298828,\r
-        "y": 897,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3344.883270263672,\r
+        "y": 610,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a4d7ff96.ceb5f8",\r
+        "id": "da8313.90b574f",\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": 3319.883331298828,\r
-        "y": 952,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3343.883270263672,\r
+        "y": 659,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4f57fa4.5908a84",\r
+        "id": "a53e9db6.011d6",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3335.883331298828,\r
-        "y": 1000,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3352.883270263672,\r
+        "y": 797,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "722a434e.2a3adc",\r
-                "e8fe3cd4.c3586",\r
-                "fdbfe007.1ea3b"\r
+                "cca9aa9c.5b4b58",\r
+                "6d66b175.a27548",\r
+                "6cf4995a.fab31"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93281de6.9193c8",\r
+        "id": "2b20579c.df8a7",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3324.883331298828,\r
-        "y": 1086.9998779296875,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3345.883270263672,\r
+        "y": 857.9998779296875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b372ac3d.0a4b1",\r
-                "d24aa16b.e47da",\r
-                "419032bc.a4963c"\r
+                "a115586d.1910d8",\r
+                "61de0330.a424c4",\r
+                "89e5a0b3.03b87"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "722a434e.2a3adc",\r
+        "id": "cca9aa9c.5b4b58",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3536.883331298828,\r
-        "y": 884,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3601.883026123047,\r
+        "y": 692,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "aae0d761.ec3158"\r
+                "294610ae.745698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8fe3cd4.c3586",\r
+        "id": "6d66b175.a27548",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3532.392364501953,\r
-        "y": 933.426025390625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3595.392059326172,\r
+        "y": 733.426025390625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "af62b91c.6bf638"\r
+                "61b00039.d9b688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fdbfe007.1ea3b",\r
+        "id": "6cf4995a.fab31",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3536.392364501953,\r
-        "y": 986.426025390625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3590.392059326172,\r
+        "y": 783.426025390625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "72360610.10f7e"\r
+                "1fe35696.f7e9f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aae0d761.ec3158",\r
+        "id": "294610ae.745698",\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": 3685.454864501953,\r
-        "y": 883.2857666015625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3750.454559326172,\r
+        "y": 691.2857666015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af62b91c.6bf638",\r
+        "id": "61b00039.d9b688",\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": 3675.392364501953,\r
-        "y": 933.426025390625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3740.392059326172,\r
+        "y": 741.426025390625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b372ac3d.0a4b1",\r
+        "id": "a115586d.1910d8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3547.883331298828,\r
-        "y": 1056.9998779296875,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3566.883270263672,\r
+        "y": 843.9998779296875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "3bdfccb0.f2d08c"\r
+                "807fba07.07f6d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d24aa16b.e47da",\r
+        "id": "61de0330.a424c4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3543.392364501953,\r
-        "y": 1106.4259033203125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3562.392303466797,\r
+        "y": 893.4259033203125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "57f2def1.81f4e"\r
+                "9f751353.b361d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "419032bc.a4963c",\r
+        "id": "89e5a0b3.03b87",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3544.392364501953,\r
-        "y": 1159.4259033203125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3563.392303466797,\r
+        "y": 946.4259033203125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "91fe26d2.5b80d"\r
+                "17e5ea49.0fe58e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3bdfccb0.f2d08c",\r
+        "id": "807fba07.07f6d",\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": 3696.454864501953,\r
-        "y": 1056.28564453125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3719.4546508789062,\r
+        "y": 849.28564453125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "57f2def1.81f4e",\r
+        "id": "9f751353.b361d",\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": 3686.392364501953,\r
-        "y": 1106.4259033203125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3705.392303466797,\r
+        "y": 893.4259033203125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "72360610.10f7e",\r
+        "id": "1fe35696.f7e9f9",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3697.883331298828,\r
-        "y": 986,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3762.883026123047,\r
+        "y": 794,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "21ff581a.7d3f68"\r
+                "6a90f954.4bce88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91fe26d2.5b80d",\r
+        "id": "17e5ea49.0fe58e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3697.883331298828,\r
-        "y": 1158.9998779296875,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3716.883270263672,\r
+        "y": 945.9998779296875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f4949055.0aa838"\r
+                "f51128b5.0b454"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21ff581a.7d3f68",\r
+        "id": "6a90f954.4bce88",\r
         "type": "switchNode",\r
         "name": "switch nr type",\r
         "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3869.883331298828,\r
-        "y": 986,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3923.883270263672,\r
+        "y": 681,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d771576e.5459b",\r
-                "743ce77.86c2e98"\r
+                "d28de3c8.def278",\r
+                "32596d77.fd201a",\r
+                "c2039341.ed7fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4949055.0aa838",\r
+        "id": "f51128b5.0b454",\r
         "type": "switchNode",\r
         "name": "switch nr type",\r
         "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3870.883331298828,\r
-        "y": 1159,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3915.883270263672,\r
+        "y": 866,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "854204ac.64311",\r
-                "5401ccd6.c2c2e4"\r
+                "6179a2a6.c7a764",\r
+                "6a08da95.c46784",\r
+                "49cd1e6.2c21e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d771576e.5459b",\r
+        "id": "d28de3c8.def278",\r
         "type": "outcome",\r
         "name": "ROOT",\r
         "xml": "<outcome value='ROOT'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4045.883331298828,\r
-        "y": 965,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4147.883758544922,\r
+        "y": 384.99993896484375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2e04d27d.5faff6"\r
+                "af392071.289a38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "743ce77.86c2e98",\r
+        "id": "32596d77.fd201a",\r
         "type": "outcome",\r
         "name": "LEAF",\r
         "xml": "<outcome value='LEAF'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4047.883331298828,\r
-        "y": 1019,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4149.883758544922,\r
+        "y": 438.99993896484375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "12c64a9b.27d615"\r
+                "7fbb2a1.f3ae954"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "854204ac.64311",\r
+        "id": "6179a2a6.c7a764",\r
         "type": "outcome",\r
         "name": "ROOT",\r
         "xml": "<outcome value='ROOT'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4046.883331298828,\r
-        "y": 1129,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4113.883758544922,\r
+        "y": 645,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a8347389.2ab3b"\r
+                "92f10d9d.0be95"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5401ccd6.c2c2e4",\r
+        "id": "6a08da95.c46784",\r
         "type": "outcome",\r
         "name": "LEAF",\r
         "xml": "<outcome value='LEAF'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4048.883331298828,\r
-        "y": 1183,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4115.883758544922,\r
+        "y": 699,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "49b6f3ad.a55ac4"\r
+                "bbb0db7f.fd9908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20ddeea0.a0e9ea",\r
+        "id": "892e5669.1ea2b",\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": 4355.883331298828,\r
-        "y": 917,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4457.883758544922,\r
+        "y": 336.99993896484375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a4916484.b95cf",\r
+        "id": "6a564e86.c1193",\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": 4348.883331298828,\r
-        "y": 1015,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4450.883758544922,\r
+        "y": 434.99993896484375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2f347429.e690cc",\r
+        "id": "a3abd24c.7a5ec",\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": 4348.883331298828,\r
-        "y": 1102,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4429.883758544922,\r
+        "y": 618,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cad2e783.60fc68",\r
+        "id": "dc9fae61.a17b2",\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": 4352.883331298828,\r
-        "y": 1195,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4433.883758544922,\r
+        "y": 711,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b1d86e33.3aa378",\r
+        "id": "50eeb433.a27fd4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3579.883331298828,\r
-        "y": 1604,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3609.88330078125,\r
+        "y": 1371,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a5f9a85c.99ac48"\r
+                "c94a30c2.a398b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a4982a5c.ee1f08",\r
+        "id": "a408ed17.7674d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3589.374298095703,\r
-        "y": 1646.5740356445312,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3619.374267578125,\r
+        "y": 1413.5740356445312,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "bbb83480.f4afb8"\r
+                "82ef970c.862378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9afba595.5831a",\r
+        "id": "3bc8671c.26c7e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3577.883331298828,\r
-        "y": 1693,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3607.88330078125,\r
+        "y": 1460,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "eeac5d42.037ff"\r
+                "5a6a5226.7899ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9f44662.0eb94",\r
+        "id": "246e8fda.9e3d88",\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": 3279.883331298828,\r
-        "y": 1566,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3309.88330078125,\r
+        "y": 1333,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2fd6be0.ec30642",\r
+        "id": "652968a1.d93e88",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3322.883331298828,\r
-        "y": 1631,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3352.88330078125,\r
+        "y": 1398,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b1d86e33.3aa378",\r
-                "a4982a5c.ee1f08",\r
-                "9afba595.5831a"\r
+                "50eeb433.a27fd4",\r
+                "a408ed17.7674d",\r
+                "3bc8671c.26c7e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "279a0c66.95b87c",\r
+        "id": "1abe7496.3f7c9b",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3323.883331298828,\r
-        "y": 1301,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3353.883270263672,\r
+        "y": 1150,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "ab7f6387.a06298",\r
-                "178d0fab.57c17"\r
+                "56f8321f.20ee54",\r
+                "27baf83a.a648a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "178d0fab.57c17",\r
+        "id": "27baf83a.a648a",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3546.883331298828,\r
-        "y": 1287,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3576.883270263672,\r
+        "y": 1136,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "174b650f.6f4cdb"\r
+                "89fdb9b4.3821e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab7f6387.a06298",\r
+        "id": "56f8321f.20ee54",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3548.883331298828,\r
-        "y": 1320,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3578.883270263672,\r
+        "y": 1169,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "109222da.cab295"\r
+                "bd796d50.897138"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5f9a85c.99ac48",\r
+        "id": "c94a30c2.a398b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3752.549835205078,\r
-        "y": 1603,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3782.5498046875,\r
+        "y": 1370,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f0dfffc5.29d178",\r
-                "acd2704e.4ae308"\r
+                "5b1520ee.c993d8",\r
+                "92906f1e.302de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bbb83480.f4afb8",\r
+        "id": "82ef970c.862378",\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": 3742.9457092285156,\r
-        "y": 1649.8597717285156,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3772.9456787109375,\r
+        "y": 1416.8597717285156,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eeac5d42.037ff",\r
+        "id": "5a6a5226.7899ec",\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": 3746.883331298828,\r
-        "y": 1694,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3776.88330078125,\r
+        "y": 1461,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f0dfffc5.29d178",\r
+        "id": "5b1520ee.c993d8",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4016.883331298828,\r
-        "y": 1587,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4046.88330078125,\r
+        "y": 1354,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "11bdf0f4.508487",\r
-                "23d1e1ad.23f75e"\r
+                "40f95927.3e48a8",\r
+                "155b2019.4d901"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23d1e1ad.23f75e",\r
+        "id": "155b2019.4d901",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4239.883331298828,\r
-        "y": 1542,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4269.88330078125,\r
+        "y": 1309,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "3fc7a366.f1683c"\r
+                "8cff212e.fd093"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11bdf0f4.508487",\r
+        "id": "40f95927.3e48a8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4241.883331298828,\r
-        "y": 1606,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4271.88330078125,\r
+        "y": 1373,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d6cac3a3.d1f4"\r
+                "9ea2b228.156828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6cac3a3.d1f4",\r
+        "id": "9ea2b228.156828",\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": 4403.883331298828,\r
-        "y": 1602,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4433.88330078125,\r
+        "y": 1369,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3fc7a366.f1683c",\r
+        "id": "8cff212e.fd093",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4404.883331298828,\r
-        "y": 1539,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4434.88330078125,\r
+        "y": 1306,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d54289dc.18d288",\r
-                "cc99bc89.a9c058"\r
+                "ea39175a.08155",\r
+                "81bb5906.bb1848"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17e0fd07.b5de8b",\r
-        "type": "save",\r
-        "name": "save connectivity resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 4018.883331298828,\r
-        "y": 1746,\r
-        "z": "d1eceead.adafe",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "f1afd056.64d73",\r
-        "type": "execute",\r
-        "name": "execute UUID generator for connectivity domainA",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 4063.883331298828,\r
-        "y": 1656,\r
-        "z": "d1eceead.adafe",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "50d51c8c.dc95ac",\r
-        "type": "save",\r
-        "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 4146.883331298828,\r
-        "y": 1794,\r
-        "z": "d1eceead.adafe",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "109222da.cab295",\r
+        "id": "bd796d50.897138",\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": 3691.883331298828,\r
-        "y": 1317,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3721.883270263672,\r
+        "y": 1166,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "174b650f.6f4cdb",\r
+        "id": "89fdb9b4.3821e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3694.883331298828,\r
-        "y": 1280,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3724.883270263672,\r
+        "y": 1129,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6b9c6245.ea050c",\r
-                "ab33cb14.ff6cc8"\r
+                "242e596.6a45da6",\r
+                "c522f465.9b1b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b9c6245.ea050c",\r
+        "id": "242e596.6a45da6",\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": 3868.883331298828,\r
-        "y": 1236,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3916.883270263672,\r
+        "y": 1131,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "acd2704e.4ae308",\r
+        "id": "92906f1e.302de8",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3970.883331298828,\r
-        "y": 1871,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4006.88330078125,\r
+        "y": 1486,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "73a0105b.ac0e58"\r
+                "9d7e97d1.f3da4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73a0105b.ac0e58",\r
+        "id": "9d7e97d1.f3da4",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4176.883331298828,\r
-        "y": 1871,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4212.88330078125,\r
+        "y": 1486,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6dbfb157.d8359"\r
+                "39469ddd.cce81a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6dbfb157.d8359",\r
+        "id": "39469ddd.cce81a",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4392.168975830078,\r
-        "y": 1870.82177734375,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4428.1689453125,\r
+        "y": 1485.82177734375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "616def67.e5a25"\r
+                "286435fd.520a92"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab33cb14.ff6cc8",\r
+        "id": "c522f465.9b1b48",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3883.883331298828,\r
-        "y": 1347,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3913.883270263672,\r
+        "y": 1196,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e7bde0a4.3a223",\r
-                "856b3a3e.33dd18",\r
-                "ec1837c2.7e65e8"\r
+                "9a817681.2b7108",\r
+                "845c0857.7834f8",\r
+                "aae3c73d.eac74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7bde0a4.3a223",\r
+        "id": "9a817681.2b7108",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4079.3834533691406,\r
-        "y": 1299,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4109.383392333984,\r
+        "y": 1148,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a049038b.508d4"\r
+                "d82b3eae.4c278"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "856b3a3e.33dd18",\r
+        "id": "845c0857.7834f8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4071.3834533691406,\r
-        "y": 1354,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4101.383392333984,\r
+        "y": 1203,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f843f7f2.8c64b8"\r
+                "c5b5dd85.a284c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec1837c2.7e65e8",\r
+        "id": "aae3c73d.eac74",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4076.3834533691406,\r
-        "y": 1411,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4106.383392333984,\r
+        "y": 1260,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "47e459e1.2a9ce"\r
+                "535d5ed7.3fd4e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47e459e1.2a9ce",\r
+        "id": "535d5ed7.3fd4e",\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": 4228.383453369141,\r
-        "y": 1412,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4258.383392333984,\r
+        "y": 1261,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f843f7f2.8c64b8",\r
+        "id": "c5b5dd85.a284c8",\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": 4239.383453369141,\r
-        "y": 1357,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4269.383392333984,\r
+        "y": 1206,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a049038b.508d4",\r
+        "id": "d82b3eae.4c278",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4223.765777587891,\r
-        "y": 1296.6556701660156,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4253.765716552734,\r
+        "y": 1145.6556701660156,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b2d1999f.753708"\r
+                "5176f492.5f7e8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b2d1999f.753708",\r
+        "id": "5176f492.5f7e8c",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4407.883331298828,\r
-        "y": 1311,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4447.883270263672,\r
+        "y": 1189.9999389648438,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "9b22416d.9cdac8"\r
+                "1d42fe6d.851b3a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc99bc89.a9c058",\r
+        "id": "81bb5906.bb1848",\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": 4574.883331298828,\r
-        "y": 1497,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4604.88330078125,\r
+        "y": 1264,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d54289dc.18d288",\r
+        "id": "ea39175a.08155",\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": 4575.883331298828,\r
-        "y": 1605,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4605.88330078125,\r
+        "y": 1372,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46e18359.07aad4",\r
+        "id": "ea0872ed.58cfa",\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": 4576.883331298828,\r
-        "y": 1554,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4606.88330078125,\r
+        "y": 1321,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "616def67.e5a25",\r
+        "id": "286435fd.520a92",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4599.000518798828,\r
-        "y": 1871.34033203125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4635.00048828125,\r
+        "y": 1486.34033203125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6d0c5fcb.438328",\r
-                "40a1c35d.17991c",\r
-                "6c800e67.6aa9c8"\r
+                "b0e3cfe1.6d40f",\r
+                "7126b880.f67e48",\r
+                "ad3a7086.abf6b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d0c5fcb.438328",\r
+        "id": "b0e3cfe1.6d40f",\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": 4814.000518798828,\r
-        "y": 1833.34033203125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4850.00048828125,\r
+        "y": 1448.34033203125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40a1c35d.17991c",\r
+        "id": "7126b880.f67e48",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4811.000518798828,\r
-        "y": 1872.34033203125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4847.00048828125,\r
+        "y": 1487.34033203125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "9de28790.cf8c7"\r
+                "7a65c420.1080dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c800e67.6aa9c8",\r
+        "id": "ad3a7086.abf6b",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4766.500518798828,\r
-        "y": 1914.34033203125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4802.50048828125,\r
+        "y": 1529.34033203125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9de28790.cf8c7",\r
+        "id": "7a65c420.1080dc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4991.500518798828,\r
-        "y": 1871.34033203125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5027.50048828125,\r
+        "y": 1486.34033203125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e5173d49.fc3368"\r
+                "96c8a7ed.e41958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "376d58a4.adb2a",\r
+        "id": "90470a6f.8ef5f8",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4805.883331298828,\r
-        "y": 1315,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4835.88330078125,\r
+        "y": 1082,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "60247fbe.4b6c2"\r
+                "e5efb625.18037"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60247fbe.4b6c2",\r
+        "id": "e5efb625.18037",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4982.883331298828,\r
-        "y": 1307,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5012.88330078125,\r
+        "y": 1074,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4270b940.4f6ac",\r
-                "65b48891.d54c3"\r
+                "732587d3.ab7a9",\r
+                "4baffabc.103f3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9b22416d.9cdac8",\r
+        "id": "1d42fe6d.851b3a",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4602.883331298828,\r
-        "y": 1311,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4638.883270263672,\r
+        "y": 1179.9999389648438,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "376d58a4.adb2a",\r
-                "59d37917.573538"\r
+                "90470a6f.8ef5f8",\r
+                "6cae07e7.8ff81"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59d37917.573538",\r
+        "id": "6cae07e7.8ff81",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4808.883331298828,\r
-        "y": 1389,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4838.88330078125,\r
+        "y": 1156,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b8751b8b.fb4f58"\r
+                "8681155.73991e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8751b8b.fb4f58",\r
+        "id": "8681155.73991e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4985.883331298828,\r
-        "y": 1381,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5015.88330078125,\r
+        "y": 1148,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "673e159e.9038cc"\r
+                "c2e2c331.f24d7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5173d49.fc3368",\r
+        "id": "96c8a7ed.e41958",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5149.500518798828,\r
-        "y": 1871.34033203125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5185.50048828125,\r
+        "y": 1486.34033203125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e816a090.0c423"\r
+                "d73ce805.51d21"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e816a090.0c423",\r
+        "id": "d73ce805.51d21",\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": 5356.500518798828,\r
-        "y": 1871.34033203125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5392.50048828125,\r
+        "y": 1486.34033203125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "65b48891.d54c3",\r
+        "id": "4baffabc.103f3c",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5190.883331298828,\r
-        "y": 1314,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5220.88330078125,\r
+        "y": 1081,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "12ca2f18.a3fcb1",\r
-                "2eff6a6f.1256be",\r
-                "ae932fb7.b2f368"\r
+                "276c589.f8898a8",\r
+                "b6b78749.64c52",\r
+                "710e31ca.f7c328"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4270b940.4f6ac",\r
+        "id": "732587d3.ab7a9",\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": 5220.883331298828,\r
-        "y": 1262,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5250.88330078125,\r
+        "y": 1029,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "12ca2f18.a3fcb1",\r
+        "id": "276c589.f8898a8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5400.883331298828,\r
-        "y": 1305,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5430.88330078125,\r
+        "y": 1072,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "19df6125.66c90f"\r
+                "6595904d.14fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2eff6a6f.1256be",\r
+        "id": "b6b78749.64c52",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5392.883331298828,\r
-        "y": 1360,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5422.88330078125,\r
+        "y": 1127,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5900b30a.9db0cc"\r
+                "870ff6d4.3b5618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae932fb7.b2f368",\r
+        "id": "710e31ca.f7c328",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5397.883331298828,\r
-        "y": 1417,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5427.88330078125,\r
+        "y": 1184,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "abcfe080.ae7e7"\r
+                "14dafdf8.cfb5c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abcfe080.ae7e7",\r
+        "id": "14dafdf8.cfb5c2",\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": 5549.883331298828,\r
-        "y": 1418,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5579.88330078125,\r
+        "y": 1185,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5900b30a.9db0cc",\r
+        "id": "870ff6d4.3b5618",\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": 5560.883331298828,\r
-        "y": 1363,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5590.88330078125,\r
+        "y": 1130,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "19df6125.66c90f",\r
+        "id": "6595904d.14fc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5545.265655517578,\r
-        "y": 1302.6556701660156,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5575.265625,\r
+        "y": 1069.6556701660156,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "db94bf6b.c81da8"\r
+                "4578d3b4.cc9aac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "673e159e.9038cc",\r
+        "id": "c2e2c331.f24d7",\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": 5220.883331298828,\r
-        "y": 1505,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5250.88330078125,\r
+        "y": 1272,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "db94bf6b.c81da8",\r
+        "id": "4578d3b4.cc9aac",\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": 5759.883331298828,\r
-        "y": 1299,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5789.88330078125,\r
+        "y": 1066,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "653ea460.331594",\r
+        "id": "d9f780b3.339398",\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": 4343.883331298828,\r
-        "y": 953,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4445.883758544922,\r
+        "y": 372.99993896484375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3ff377ce.541508",\r
+        "id": "eeaf4d12.9621",\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": 4334.883331298828,\r
-        "y": 1051,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4446.883728027344,\r
+        "y": 476.99993896484375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2e04d27d.5faff6",\r
+        "id": "af392071.289a38",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4168.883331298828,\r
-        "y": 959,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4270.883758544922,\r
+        "y": 378.99993896484375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "20ddeea0.a0e9ea",\r
-                "653ea460.331594"\r
+                "892e5669.1ea2b",\r
+                "d9f780b3.339398"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12c64a9b.27d615",\r
+        "id": "7fbb2a1.f3ae954",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4174.883331298828,\r
-        "y": 1023,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4276.883758544922,\r
+        "y": 442.99993896484375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a4916484.b95cf",\r
-                "3ff377ce.541508"\r
+                "6a564e86.c1193",\r
+                "eeaf4d12.9621"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8347389.2ab3b",\r
+        "id": "92f10d9d.0be95",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4174.883331298828,\r
-        "y": 1129,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4241.883758544922,\r
+        "y": 645,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2f347429.e690cc",\r
-                "64f47a9a.5541ec"\r
+                "a3abd24c.7a5ec",\r
+                "d4111de3.168d5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49b6f3ad.a55ac4",\r
+        "id": "bbb0db7f.fd9908",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4177.883331298828,\r
-        "y": 1182,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4244.883758544922,\r
+        "y": 698,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "cad2e783.60fc68",\r
-                "93b1477b.b7ce28"\r
+                "dc9fae61.a17b2",\r
+                "daba5f73.79ab3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64f47a9a.5541ec",\r
+        "id": "d4111de3.168d5",\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": 4334.883331298828,\r
-        "y": 1142,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4415.883758544922,\r
+        "y": 658,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "93b1477b.b7ce28",\r
+        "id": "daba5f73.79ab3",\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": 4337.883331298828,\r
-        "y": 1233,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4418.883758544922,\r
+        "y": 749,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bcceae66.215ea8",\r
+        "id": "f11652ec.f5ecc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3709.883331298828,\r
-        "y": 2443,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3741.88330078125,\r
+        "y": 1828.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "fa55cad.2f0ddb8",\r
-                "341eac77.d5f56c"\r
+                "2518ba78.6d21ae",\r
+                "ca887fb4.4fa748"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6e2e92d.d49f8",\r
+        "id": "5d22eff5.ad4738",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3537.216827392578,\r
-        "y": 2444,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3569.216796875,\r
+        "y": 1829.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "bcceae66.215ea8"\r
+                "f11652ec.f5ecc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15d49e8e.f5c6d1",\r
+        "id": "f62aa8b7.81c7a8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3546.707794189453,\r
-        "y": 2486.5740356445312,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3578.707763671875,\r
+        "y": 1871.5741577148438,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b6575c89.a4dbd8"\r
+                "3ccb36a1.cd58ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "456db0bd.6c4e5",\r
+        "id": "949b65da.c62778",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3535.216827392578,\r
-        "y": 2533,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3567.216796875,\r
+        "y": 1918.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f1a4c78.c749938"\r
+                "b3008d52.d5dec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6575c89.a4dbd8",\r
+        "id": "3ccb36a1.cd58ba",\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": 3700.2792053222656,\r
-        "y": 2489.8597717285156,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3732.2791748046875,\r
+        "y": 1874.8598937988281,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1a4c78.c749938",\r
+        "id": "b3008d52.d5dec",\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": 3704.216827392578,\r
-        "y": 2534,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3736.216796875,\r
+        "y": 1919.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa55cad.2f0ddb8",\r
+        "id": "2518ba78.6d21ae",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3996.216827392578,\r
-        "y": 2447.0001220703125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4028.216796875,\r
+        "y": 1832.000244140625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2a55ff3d.a63f58",\r
-                "a4fedadd.ffdcf"\r
+                "2fdbf5bd.c09292",\r
+                "9a5de981.0de7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a4fedadd.ffdcf",\r
+        "id": "9a5de981.0de7c",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4219.216827392578,\r
-        "y": 2402.0001220703125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4251.216796875,\r
+        "y": 1787.000244140625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2cf5b91c.330536"\r
+                "82242071.f4a9f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a55ff3d.a63f58",\r
+        "id": "2fdbf5bd.c09292",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4221.216827392578,\r
-        "y": 2466.0001220703125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4253.216796875,\r
+        "y": 1851.000244140625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f4cfd006.4df4a"\r
+                "56361c44.c984a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4cfd006.4df4a",\r
+        "id": "56361c44.c984a4",\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": 4380.216827392578,\r
-        "y": 2485.0001220703125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4412.216796875,\r
+        "y": 1870.000244140625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2cf5b91c.330536",\r
+        "id": "82242071.f4a9f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4384.216827392578,\r
-        "y": 2399.0001220703125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4416.216796875,\r
+        "y": 1784.000244140625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "60521985.bf9fa8",\r
-                "1b11d7f2.c04e4"\r
+                "10610dd4.f6c112",\r
+                "ddf5e2c4.67d9f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e3a2fcb.29b168",\r
-        "type": "save",\r
-        "name": "save connectivity resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 3998.216827392578,\r
-        "y": 2606.0001220703125,\r
-        "z": "d1eceead.adafe",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "a24d2064.f8a7c",\r
-        "type": "execute",\r
-        "name": "execute UUID generator for connectivity domainB",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 4043.216827392578,\r
-        "y": 2516.0001220703125,\r
-        "z": "d1eceead.adafe",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "7f1c08c8.8cc28",\r
-        "type": "save",\r
-        "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 4125.216827392578,\r
-        "y": 2671.0001220703125,\r
-        "z": "d1eceead.adafe",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "b114579a.337d4",\r
+        "id": "fc221d76.582c9",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3309.216827392578,\r
-        "y": 2479,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3341.216796875,\r
+        "y": 1864.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e6e2e92d.d49f8",\r
-                "15d49e8e.f5c6d1",\r
-                "456db0bd.6c4e5"\r
+                "5d22eff5.ad4738",\r
+                "f62aa8b7.81c7a8",\r
+                "949b65da.c62778"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e0a6f3b.01feb",\r
+        "id": "322a186d.549ed",\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": 3270.216827392578,\r
-        "y": 2423,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3302.216796875,\r
+        "y": 1808.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3458f9fd.a9fdce",\r
+        "id": "f369a6e9.5de548",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3327.216827392578,\r
-        "y": 2141.9998779296875,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3353.216796875,\r
+        "y": 1603,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c48f1e5.b50d76",\r
-                "40db2833.3d6058"\r
+                "cb8e448.206bab8",\r
+                "778779f6.be6098"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40db2833.3d6058",\r
+        "id": "778779f6.be6098",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3550.216827392578,\r
-        "y": 2127.9998779296875,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3576.216796875,\r
+        "y": 1589,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "57ecc3e9.705994"\r
+                "4c771f34.9e70b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c48f1e5.b50d76",\r
+        "id": "cb8e448.206bab8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3552.216827392578,\r
-        "y": 2160.9998779296875,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3578.216796875,\r
+        "y": 1622,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6a189760.03fff"\r
+                "7c64438a.ff9f5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a189760.03fff",\r
+        "id": "7c64438a.ff9f5c",\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": 3695.216827392578,\r
-        "y": 2157.9998779296875,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3721.216796875,\r
+        "y": 1619,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "57ecc3e9.705994",\r
+        "id": "4c771f34.9e70b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3698.216827392578,\r
-        "y": 2120.9998779296875,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3724.216796875,\r
+        "y": 1582,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "7ef10f50.4a98b",\r
-                "d3e48892.7c0638"\r
+                "8b5ae92b.18937",\r
+                "acd78677.da7398"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ef10f50.4a98b",\r
+        "id": "8b5ae92b.18937",\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": 3892.216827392578,\r
-        "y": 2124,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3918.216796875,\r
+        "y": 1585.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "341eac77.d5f56c",\r
+        "id": "ca887fb4.4fa748",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3955.216827392578,\r
-        "y": 2756,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3969.216766357422,\r
+        "y": 1965,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "1d1b2999.e8eaf6"\r
+                "d3ca912e.f0454"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d1b2999.e8eaf6",\r
+        "id": "d3ca912e.f0454",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4161.216827392578,\r
-        "y": 2756,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4175.216766357422,\r
+        "y": 1965,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2587a419.edf304"\r
+                "e775983e.c87c6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2587a419.edf304",\r
+        "id": "e775983e.c87c6",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4378.502471923828,\r
-        "y": 2754.82177734375,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4392.502410888672,\r
+        "y": 1963.82177734375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "596e064d.3e4868"\r
+                "8510e412.3775c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d3e48892.7c0638",\r
+        "id": "acd78677.da7398",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3914.216827392578,\r
-        "y": 2192,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3940.216796875,\r
+        "y": 1653.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5d04022c.52094c",\r
-                "4363a204.88356c",\r
-                "d1632f49.e8bfd8"\r
+                "e413099e.5580f8",\r
+                "73fbbbe6.41f3fc",\r
+                "be84a2f7.e2d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d04022c.52094c",\r
+        "id": "e413099e.5580f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4109.716949462891,\r
-        "y": 2144,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4135.7169189453125,\r
+        "y": 1605.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "16d6f161.b988af"\r
+                "6607b5e0.cc2a14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4363a204.88356c",\r
+        "id": "73fbbbe6.41f3fc",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4101.716949462891,\r
-        "y": 2199,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4127.7169189453125,\r
+        "y": 1660.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5ac71d3b.31ff94"\r
+                "c946d76.aa97f28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1632f49.e8bfd8",\r
+        "id": "be84a2f7.e2d8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4106.716949462891,\r
-        "y": 2256,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4132.7169189453125,\r
+        "y": 1717.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "8e2e62d9.6dcb8"\r
+                "55c1c0e2.5aae38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e2e62d9.6dcb8",\r
+        "id": "55c1c0e2.5aae38",\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.716949462891,\r
-        "y": 2257,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4284.7169189453125,\r
+        "y": 1718.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5ac71d3b.31ff94",\r
+        "id": "c946d76.aa97f28",\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.716949462891,\r
-        "y": 2202,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4295.7169189453125,\r
+        "y": 1663.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "16d6f161.b988af",\r
+        "id": "6607b5e0.cc2a14",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4254.099273681641,\r
-        "y": 2141.6556701660156,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4280.0992431640625,\r
+        "y": 1602.6557922363281,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "7d886bfd.e9ca4c"\r
+                "eb6f70d5.e0fd88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60521985.bf9fa8",\r
+        "id": "10610dd4.f6c112",\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": 4554.216827392578,\r
-        "y": 2360.0001220703125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4586.216796875,\r
+        "y": 1745.000244140625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b11d7f2.c04e4",\r
+        "id": "ddf5e2c4.67d9f8",\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": 4555.216827392578,\r
-        "y": 2465.0001220703125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4587.216796875,\r
+        "y": 1850.000244140625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5d8e7ee.5dd5b8",\r
+        "id": "f866aa99.a64d6",\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": 4550.216827392578,\r
-        "y": 2414.0001220703125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4582.216796875,\r
+        "y": 1799.000244140625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "596e064d.3e4868",\r
+        "id": "8510e412.3775c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4585.334014892578,\r
-        "y": 2744.3404541015625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4599.333953857422,\r
+        "y": 1953.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "1d1ef4b9.b52cc3",\r
-                "aa09325d.47c72",\r
-                "f212860e.85526"\r
+                "3eb610b6.e19958",\r
+                "2b4d2f26.4fc18",\r
+                "56b44513.ed17bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d1ef4b9.b52cc3",\r
+        "id": "3eb610b6.e19958",\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": 4800.334014892578,\r
-        "y": 2706.3404541015625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4814.333953857422,\r
+        "y": 1915.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aa09325d.47c72",\r
+        "id": "2b4d2f26.4fc18",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4797.334014892578,\r
-        "y": 2745.3404541015625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4811.333953857422,\r
+        "y": 1954.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "391393be.95d72c"\r
+                "b7623c50.89af3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f212860e.85526",\r
+        "id": "56b44513.ed17bc",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4752.834014892578,\r
-        "y": 2787.3404541015625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4766.833953857422,\r
+        "y": 1996.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "391393be.95d72c",\r
+        "id": "b7623c50.89af3",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4977.834014892578,\r
-        "y": 2744.3404541015625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4991.833953857422,\r
+        "y": 1953.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "520819a9.ab1618"\r
+                "e2420b84.cbf938"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "520819a9.ab1618",\r
+        "id": "e2420b84.cbf938",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5135.834014892578,\r
-        "y": 2744.3404541015625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5149.833953857422,\r
+        "y": 1953.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "3a6f0d92.f64ee2"\r
+                "d3754257.cdbb9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a6f0d92.f64ee2",\r
+        "id": "d3754257.cdbb9",\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": 5342.834014892578,\r
-        "y": 2744.3404541015625,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5356.833953857422,\r
+        "y": 1953.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "35d3101c.ddb4c",\r
+        "id": "303b1a28.56bd56",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4836.216827392578,\r
-        "y": 2160,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4862.216796875,\r
+        "y": 1621.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "461a66b2.13a6c8"\r
+                "8f6cdb8f.90967"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "461a66b2.13a6c8",\r
+        "id": "8f6cdb8f.90967",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5013.216827392578,\r
-        "y": 2152,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5039.216796875,\r
+        "y": 1613.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6cbb0705.4a3c5",\r
-                "670f0182.9fd968"\r
+                "5fcf484f.8e6e78",\r
+                "f4e9d00a.c60c9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d886bfd.e9ca4c",\r
+        "id": "eb6f70d5.e0fd88",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4438.216827392578,\r
-        "y": 2156,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4464.216796875,\r
+        "y": 1617.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e2222250.60ef7"\r
+                "93bac5db.c9063"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e2222250.60ef7",\r
+        "id": "93bac5db.c9063",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4633.216827392578,\r
-        "y": 2156,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4659.216796875,\r
+        "y": 1617.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "35d3101c.ddb4c",\r
-                "768c39b6.117ae"\r
+                "303b1a28.56bd56",\r
+                "6dd697d7.ade42"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "670f0182.9fd968",\r
+        "id": "f4e9d00a.c60c9",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5221.216827392578,\r
-        "y": 2159,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5247.216796875,\r
+        "y": 1620.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4e714dda.e8064c",\r
-                "6d43e638.f020f8",\r
-                "33cdbe70.d704f2"\r
+                "af18531c.f561e8",\r
+                "6d4f9387.cdc244",\r
+                "7f999aa.ecc8a64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9bab22e5.a35978",\r
+        "id": "6e464f44.674b68",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5015.216827392578,\r
-        "y": 2225,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5041.216796875,\r
+        "y": 1686.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "3c5a22cd.c5b5a6"\r
+                "c6202cfd.8bcb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "768c39b6.117ae",\r
+        "id": "6dd697d7.ade42",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4838.216827392578,\r
-        "y": 2233,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4864.216796875,\r
+        "y": 1694.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "9bab22e5.a35978"\r
+                "6e464f44.674b68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cbb0705.4a3c5",\r
+        "id": "5fcf484f.8e6e78",\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": 5251.216827392578,\r
-        "y": 2107,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5277.216796875,\r
+        "y": 1568.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3c5a22cd.c5b5a6",\r
+        "id": "c6202cfd.8bcb4",\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": 5250.216827392578,\r
-        "y": 2349,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5254.216796875,\r
+        "y": 1752.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4e714dda.e8064c",\r
+        "id": "af18531c.f561e8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5431.216827392578,\r
-        "y": 2150,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5457.216796875,\r
+        "y": 1611.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c3b341d5.27524"\r
+                "5e16aade.ea368c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d43e638.f020f8",\r
+        "id": "6d4f9387.cdc244",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5423.216827392578,\r
-        "y": 2205,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5449.216796875,\r
+        "y": 1666.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5319e635.03496"\r
+                "77d34b30.5fb23c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "33cdbe70.d704f2",\r
+        "id": "7f999aa.ecc8a64",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5428.216827392578,\r
-        "y": 2262,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5454.216796875,\r
+        "y": 1723.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "bf85165f.b30b4"\r
+                "674c6f5c.5f0f88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf85165f.b30b4",\r
+        "id": "674c6f5c.5f0f88",\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": 5580.216827392578,\r
-        "y": 2263,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5606.216796875,\r
+        "y": 1724.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5319e635.03496",\r
+        "id": "77d34b30.5fb23c",\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": 5591.216827392578,\r
-        "y": 2208,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5617.216796875,\r
+        "y": 1669.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c3b341d5.27524",\r
+        "id": "5e16aade.ea368c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5575.599151611328,\r
-        "y": 2147.6556701660156,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5601.59912109375,\r
+        "y": 1608.6557922363281,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5a4d43b1.7dbc0c"\r
+                "4cb5ebab.b25f64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a4d43b1.7dbc0c",\r
+        "id": "4cb5ebab.b25f64",\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": 5790.216827392578,\r
-        "y": 2144,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5816.216796875,\r
+        "y": 1605.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "83634982.62f32",\r
+        "id": "5fd92a3e.ed6fec",\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": 3288.883331298828,\r
-        "y": 1754,\r
-        "z": "d1eceead.adafe",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "51304efd.d01998",\r
-        "type": "comment",\r
-        "name": "This is it (should be)",\r
-        "info": "",\r
-        "comments": "",\r
-        "x": 4510.883331298828,\r
-        "y": 1037,\r
-        "z": "d1eceead.adafe",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "8cad1e9f.c00c5",\r
-        "type": "comment",\r
-        "name": "This is it (should be)",\r
-        "info": "",\r
-        "comments": "",\r
-        "x": 4502.883331298828,\r
-        "y": 1127,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3314.88330078125,\r
+        "y": 1475,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a78c5989.f5207",\r
+        "id": "4a864e6a.471e",\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": 3269.883331298828,\r
-        "y": 2610,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3301.88330078125,\r
+        "y": 1995.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f144ff2.8e6388",\r
-        "type": "save",\r
-        "name": "save connectivityA relationship to UNI-LEAF, in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 3401.883331298828,\r
-        "y": 1860,\r
-        "z": "d1eceead.adafe",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "f39161b8.c95518",\r
-        "type": "save",\r
-        "name": "save LEAF UNI in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-p-interface-short`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 3308.883331298828,\r
-        "y": 1807,\r
-        "z": "d1eceead.adafe",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "8af2638e.140428",\r
+        "id": "cfd6a168.75b7d8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2426.883331298828,\r
-        "y": 185,\r
-        "z": "d1eceead.adafe",\r
+        "y": 188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b2d6bb83.745318",\r
+        "id": "fe93cfa.921edb",\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": 221,\r
-        "z": "d1eceead.adafe",\r
+        "y": 224,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "efb9627d.c73688",\r
+        "id": "85869c3a.24ed3",\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": 148,\r
-        "z": "d1eceead.adafe",\r
+        "y": 151,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7954d1dd.93732",\r
+        "id": "f5ea8856.4eb3f",\r
         "type": "comment",\r
         "name": "NOT NEEDED ANYMORE?",\r
         "info": "",\r
         "comments": "",\r
-        "x": 4036.883331298828,\r
-        "y": 1838,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4072.88330078125,\r
+        "y": 1453,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "48007645.c6e248",\r
+        "id": "8e941b0d.26d14",\r
         "type": "comment",\r
         "name": "NOT NEEDED ANYMORE?",\r
         "info": "",\r
         "comments": "",\r
-        "x": 4014.883331298828,\r
-        "y": 2708,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4028.883270263672,\r
+        "y": 1917,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e22daf3c.82e7c8",\r
+        "id": "8cb68ccc.e851f8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 3441.8837890625,\r
-        "y": 7480.999969482422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 7483.999969482422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ba2fa114.256608",\r
+        "id": "80d49243.ddf01",\r
         "type": "comment",\r
         "name": "START OF DELETE OPERATION",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3288.88330078125,\r
-        "y": 2939.999969482422,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3296.88330078125,\r
+        "y": 2476.999969482422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cea904e8.518f5",\r
+        "id": "8f2ca941.64e03",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3874.566650390625,\r
-        "y": 3129.400115966797,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3880.566650390625,\r
+        "y": 2578.4000854492188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8c6f82a5.234d18",\r
+        "id": "afaae138.bb9798",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3245.566650390625,\r
-        "y": 3059.400115966797,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3251.566650390625,\r
+        "y": 2558.4000854492188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "980e282b.21ebf",\r
-                "62337ab9.8b1c5c",\r
-                "ac27f627.a68b4"\r
+                "661c06cc.3908b",\r
+                "1ca1166.e689c6a",\r
+                "b5955cba.954b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62337ab9.8b1c5c",\r
+        "id": "1ca1166.e689c6a",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3473.0576171875,\r
-        "y": 3031.974090576172,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3479.0576171875,\r
+        "y": 2530.9740600585938,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a4aab25a.3920c"\r
+                "e6c36b4a.f9b0a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac27f627.a68b4",\r
+        "id": "b5955cba.954b1",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3468.566650390625,\r
-        "y": 3076.4000549316406,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3474.566650390625,\r
+        "y": 2575.4000244140625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "98b8996.e5a3fe8"\r
+                "9464bc90.391b5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a4aab25a.3920c",\r
+        "id": "e6c36b4a.f9b0a8",\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": 3635.629150390625,\r
-        "y": 3031.259796142578,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3641.629150390625,\r
+        "y": 2530.259765625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98b8996.e5a3fe8",\r
+        "id": "9464bc90.391b5",\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": 3636.566650390625,\r
-        "y": 3076.4000549316406,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3642.566650390625,\r
+        "y": 2575.4000244140625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "980e282b.21ebf",\r
+        "id": "661c06cc.3908b",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3480.566650390625,\r
-        "y": 3126.400115966797,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3486.566650390625,\r
+        "y": 2625.4000854492188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "50a09dc8.f07414"\r
+                "8055efb.5ed0c9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50a09dc8.f07414",\r
+        "id": "8055efb.5ed0c9",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3632.88330078125,\r
-        "y": 3129.999969482422,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3638.88330078125,\r
+        "y": 2628.9999389648438,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "839bae2a.5eaff8",\r
-                "cea904e8.518f5",\r
-                "8b478b6f.069ff8"\r
+                "2d855333.ba947c",\r
+                "8f2ca941.64e03",\r
+                "7724024e.bb32ec",\r
+                "b98aea07.4499"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "839bae2a.5eaff8",\r
+        "id": "2d855333.ba947c",\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": 3877.566650390625,\r
-        "y": 3072.400115966797,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3883.566650390625,\r
+        "y": 2521.4000854492188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5a01c9ff.aa79b8",\r
+        "id": "a9e99fa6.0d7b7",\r
         "type": "comment",\r
         "name": "Update ROOT UNI's bw",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3833.566650390625,\r
-        "y": 3235.199920654297,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3845.566650390625,\r
+        "y": 2632.199951171875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e327e4d5.a4e2b",\r
+        "id": "d2355b29.347a7",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4435.566650390625,\r
-        "y": 3340.199920654297,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4523.566650390625,\r
+        "y": 2675.199951171875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8b478b6f.069ff8",\r
+        "id": "7724024e.bb32ec",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3825.56640625,\r
-        "y": 3281.199920654297,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3837.56640625,\r
+        "y": 2678.199951171875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b9a017aa.207728",\r
-                "1cc16855.ddb44",\r
-                "cca9f79e.b7e85"\r
+                "7f7b7065.dfb0f",\r
+                "18f5411.3947abf",\r
+                "5fedf83d.ca31e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cc16855.ddb44",\r
+        "id": "18f5411.3947abf",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4053.057373046875,\r
-        "y": 3253.773895263672,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4141.057373046875,\r
+        "y": 2588.77392578125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "dd7a8720.93a36"\r
+                "58e0cfbb.eeb22"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cca9f79e.b7e85",\r
+        "id": "5fedf83d.ca31e8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4048.56640625,\r
-        "y": 3298.1998596191406,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4136.56640625,\r
+        "y": 2633.1998901367188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "bfa4184f.a70f18"\r
+                "9a2aec0d.d77f58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd7a8720.93a36",\r
+        "id": "58e0cfbb.eeb22",\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": 4215.62890625,\r
-        "y": 3253.059600830078,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4303.62890625,\r
+        "y": 2588.0596313476562,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bfa4184f.a70f18",\r
+        "id": "9a2aec0d.d77f58",\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": 4216.56640625,\r
-        "y": 3298.1998596191406,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4304.56640625,\r
+        "y": 2633.1998901367188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "51dfcdd2.a7dd1c",\r
+        "id": "2175339a.46dd54",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4213.56640625,\r
-        "y": 3348.199920654297,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4301.56640625,\r
+        "y": 2683.199951171875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f4f7b843.eb2a48",\r
-                "e327e4d5.a4e2b"\r
+                "9319905e.cf01b",\r
+                "d2355b29.347a7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9a017aa.207728",\r
+        "id": "7f7b7065.dfb0f",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4044.56640625,\r
-        "y": 3348.199920654297,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4132.56640625,\r
+        "y": 2683.199951171875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "51dfcdd2.a7dd1c"\r
+                "2175339a.46dd54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4f7b843.eb2a48",\r
+        "id": "9319905e.cf01b",\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": 4395.567138671875,\r
-        "y": 3290.199920654297,\r
-        "z": "d1eceead.adafe",\r
+        "x": 4483.567138671875,\r
+        "y": 2625.199951171875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7302cb88.8e6284",\r
+        "id": "c9164c42.75d5f8",\r
         "type": "comment",\r
         "name": "Delete LEAF UNI",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3825.88330078125,\r
-        "y": 3013.999969482422,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3831.88330078125,\r
+        "y": 2462.9999389648438,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5b4e5a5d.18c714",\r
+        "id": "82a9b10f.cbf938",\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": 3792.6000366210938,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3795.6000366210938,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a7a1bb48.b43ec8",\r
+        "id": "9a0ba695.c13258",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 3444.749969482422,\r
-        "y": 3840.6000366210938,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3843.6000366210938,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7b0989f8.4cdbd",\r
+        "id": "a14834df.662a8",\r
         "type": "switchNode",\r
         "name": "switch found-connectivity?",\r
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3266.749969482422,\r
-        "y": 3892.4000854492188,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3895.4000854492188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "723122ee.60b394",\r
-                "1f79397f.9ef707"\r
+                "b9a4b0ad.78d9e8",\r
+                "49168449.b48e54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "723122ee.60b394",\r
+        "id": "b9a4b0ad.78d9e8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3459.749969482422,\r
-        "y": 3893.4000854492188,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3896.4000854492188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "fc2d1c85.b4eee"\r
+                "c7d731c2.8648d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc2d1c85.b4eee",\r
+        "id": "c7d731c2.8648d8",\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": 3889.6000366210938,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3892.6000366210938,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1f79397f.9ef707",\r
+        "id": "49168449.b48e54",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3463.749969482422,\r
-        "y": 3937.4000854492188,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3940.4000854492188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6275f59c.0890b4"\r
+                "2b5fde97.f226ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6275f59c.0890b4",\r
+        "id": "2b5fde97.f226ea",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3602.749969482422,\r
-        "y": 3932.4000854492188,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3935.4000854492188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "810f11d9.c59a7",\r
-                "852c933b.a9e98",\r
-                "dd94c766.3611e8"\r
+                "6c8d251.aa4085c",\r
+                "1d93d9c1.b4dc36",\r
+                "2f3e9082.a03f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "810f11d9.c59a7",\r
+        "id": "6c8d251.aa4085c",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 3853.149627685547,\r
-        "y": 3940.9166870117188,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3943.9166870117188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4f7025f7.9e0214"\r
+                "8f03c967.45f27"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f7025f7.9e0214",\r
+        "id": "8f03c967.45f27",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4075.149627685547,\r
-        "y": 3918.9166870117188,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3921.9166870117188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c1dfdbf7.de4f68"\r
+                "3959f0cf.96f36"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1dfdbf7.de4f68",\r
+        "id": "3959f0cf.96f36",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4235.149139404297,\r
-        "y": 3898.9166870117188,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3901.9166870117188,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "811e3163.5710b"\r
+                "1414f243.3459be"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7642582a.7718e8",\r
+        "id": "80ad8584.1bf2c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4388.149658203125,\r
-        "y": 3879.916717529297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3882.916717529297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b019880c.9753e",\r
-                "f61cef0c.bbc238"\r
+                "dbcbba23.eadbb",\r
+                "2ba6b637.902e82"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b019880c.9753e",\r
+        "id": "dbcbba23.eadbb",\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": 3847.9999389648438,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3850.9999389648438,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "852c933b.a9e98",\r
+        "id": "1d93d9c1.b4dc36",\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": 3859.999969482422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3862.999969482422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dd94c766.3611e8",\r
+        "id": "2f3e9082.a03f",\r
         "type": "switchNode",\r
         "name": "switch tmp.keepVPNBs?",\r
         "xml": "\n<switch test=\"`$tmp.keepVPNBs`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3767.64990234375,\r
-        "y": 4281.000213623047,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4284.000213623047,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "73d16500.5c0ae4",\r
-                "d3a70ceb.c50b78"\r
+                "f5f9b41d.cada7",\r
+                "3f4fef24.6df1a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f61cef0c.bbc238",\r
+        "id": "2ba6b637.902e82",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4552.88330078125,\r
-        "y": 3915.999969482422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3918.999969482422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d3a70ceb.c50b78",\r
+        "id": "3f4fef24.6df1a",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 154.65066528320312,\r
-        "y": 5345.000457763672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5348.000457763672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4a51985e.972e68"\r
+                "16d898b2.82d4af"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73d16500.5c0ae4",\r
+        "id": "f5f9b41d.cada7",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3988.650634765625,\r
-        "y": 4383.000213623047,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4386.000213623047,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "25f72ad2.47990e"\r
+                "26c73a8d.4562be"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25f72ad2.47990e",\r
+        "id": "26c73a8d.4562be",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4131.650634765625,\r
-        "y": 4379.000213623047,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4382.000213623047,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6e8bafff.64fc88",\r
-                "dcf23a76.fb4f5",\r
-                "f889b68d.197d9",\r
-                "69806916.62139",\r
-                "32064458.33cdf4",\r
-                "9c7a66fb.560d48",\r
-                "2b19eccb.73cf0c",\r
-                "987f769f.1ba7f8"\r
+                "e9909468.33151",\r
+                "efe71d55.9caa78",\r
+                "21b48e5f.bc8462",\r
+                "55b631d2.803a38",\r
+                "a2022ff9.9bc538",\r
+                "702c8bba.ca32ac",\r
+                "e084df79.80ceb8",\r
+                "624968c9.f15538",\r
+                "abf74f44.8bd74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "316316fc.4e3ac2",\r
+        "id": "4355739e.98f0ec",\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": 5301.000457763672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5304.000457763672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "32c3f6b1.304972",\r
+        "id": "4da2ca0c.4a8b84",\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": 4346.000213623047,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4349.000213623047,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7adbe8ea.ad8838",\r
+        "id": "9b3df18d.6f724",\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": 4536.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4539.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee3b3067.d425a8",\r
+        "id": "84df48a4.4e5358",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5165.667724609375,\r
-        "y": 4398.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4401.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "76f6067d.796678"\r
+                "cfc0c818.79fe68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc93f53c.f481d",\r
+        "id": "10190e03.34bba2",\r
         "type": "for",\r
         "name": "for netwidx..allNetworksList_length",\r
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4872.667724609375,\r
-        "y": 4392.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4395.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "ee3b3067.d425a8"\r
+                "84df48a4.4e5358"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f4440b0.d66f8",\r
+        "id": "1796601b.dbfbf",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5127.667724609375,\r
-        "y": 4349.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4352.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "27f65669.8e0af2",\r
+        "id": "4871207.ade70e",\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": 4444.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4447.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "410c70eb.214758",\r
+        "id": "fe8bfdbc.e310b8",\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": 4489.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4492.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e258b42d.2c46d8",\r
+        "id": "ed94bc94.c3085",\r
         "type": "set",\r
         "name": "unset otnTopoIdSrc",\r
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
         "comments": "",\r
         "x": 4821.667724609375,\r
-        "y": 4342.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4345.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "76f6067d.796678",\r
+        "id": "cfc0c818.79fe68",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5074.667724609375,\r
-        "y": 4466.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4469.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "acca9da1.cc4618"\r
+                "3784b6ea.dad97a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "acca9da1.cc4618",\r
+        "id": "3784b6ea.dad97a",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5259.667724609375,\r
-        "y": 4465.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4468.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f448b4f8.c120e"\r
+                "6ba573fe.abd33c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f448b4f8.c120e",\r
+        "id": "6ba573fe.abd33c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5451.667724609375,\r
-        "y": 4468.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4471.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "19985725.a5eca1"\r
+                "a8101530.41669"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19985725.a5eca1",\r
+        "id": "a8101530.41669",\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": 4464.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4467.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ab4edace.9f77f",\r
+        "id": "3a63decd.7b4cb2",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 4999.667724609375,\r
-        "y": 4579.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4582.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6e8bafff.64fc88",\r
+        "id": "e9909468.33151",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4516.667724609375,\r
-        "y": 4364.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4367.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "30c992c8.4db58e",\r
-                "c2728b20.458338",\r
-                "27f65669.8e0af2",\r
-                "410c70eb.214758",\r
-                "7adbe8ea.ad8838",\r
-                "fc93f53c.f481d",\r
-                "ab4edace.9f77f"\r
+                "9c834ddf.7b5a8",\r
+                "1b5b7b9f.240eac",\r
+                "4871207.ade70e",\r
+                "fe8bfdbc.e310b8",\r
+                "9b3df18d.6f724",\r
+                "10190e03.34bba2",\r
+                "3a63decd.7b4cb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e6e6c8a.c892fc",\r
+        "id": "5418760e.ea421",\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": 4298.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4301.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c2728b20.458338",\r
+        "id": "1b5b7b9f.240eac",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 4880.667724609375,\r
-        "y": 4285.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4288.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "cd41e347.c8a4d",\r
-                "5bcb3237.45bf24",\r
-                "3f4440b0.d66f8"\r
+                "cdc8c3cd.7743d8",\r
+                "829501cc.19a87",\r
+                "1796601b.dbfbf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd41e347.c8a4d",\r
+        "id": "cdc8c3cd.7743d8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5116.667724609375,\r
-        "y": 4268.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4271.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5bcb3237.45bf24",\r
+        "id": "829501cc.19a87",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5113.667724609375,\r
-        "y": 4309.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4312.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "30c992c8.4db58e",\r
+        "id": "9c834ddf.7b5a8",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
         "comments": "",\r
         "x": 4829.667724609375,\r
-        "y": 4242.783660888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4245.783660888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dcf23a76.fb4f5",\r
+        "id": "efe71d55.9caa78",\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": 4697.183563232422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4700.183563232422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f549a24.b4e97e",\r
+        "id": "429a4c62.ec5bdc",\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": 4736.183563232422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4739.183563232422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f889b68d.197d9",\r
+        "id": "21b48e5f.bc8462",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 4357.968017578125,\r
-        "y": 4771.183563232422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4774.183563232422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f7fe6bc0.f9d1a8",\r
-                "b939c13a.bd148",\r
-                "63930841.13965"\r
+                "a823d247.f64a98",\r
+                "36823aa3.4d18a6",\r
+                "eb8482c0.2d4878"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7fe6bc0.f9d1a8",\r
+        "id": "a823d247.f64a98",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4562.968017578125,\r
-        "y": 4768.183563232422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4771.183563232422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "85787fa.a0f0d8"\r
+                "8498bebb.23bf48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b939c13a.bd148",\r
+        "id": "36823aa3.4d18a6",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4546.458984375,\r
-        "y": 4829.757598876953,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4832.757598876953,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c496c4d4.109c78"\r
+                "386b7921.748fb6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63930841.13965",\r
+        "id": "eb8482c0.2d4878",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4543.968017578125,\r
-        "y": 4873.183563232422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4876.183563232422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "bb1ebaa9.c2fac"\r
+                "134c42f5.f94555"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85787fa.a0f0d8",\r
+        "id": "8498bebb.23bf48",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4730.96826171875,\r
-        "y": 4763.183563232422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4766.183563232422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6a7a29b4.6659c"\r
+                "6b12d916.16568"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c496c4d4.109c78",\r
+        "id": "386b7921.748fb6",\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": 4830.0433349609375,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4833.0433349609375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb1ebaa9.c2fac",\r
+        "id": "134c42f5.f94555",\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": 4872.183563232422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4875.183563232422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a7a29b4.6659c",\r
+        "id": "6b12d916.16568",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 4968.96826171875,\r
-        "y": 4768.183563232422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4771.183563232422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2e12f618.b174b2"\r
+                "cfa150d4.94ff28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e12f618.b174b2",\r
+        "id": "cfa150d4.94ff28",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5202.968017578125,\r
-        "y": 4775.183563232422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4778.183563232422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "1b37b556.addac3"\r
+                "e4eccca9.9724c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3df57bb4.1a97cc",\r
+        "id": "dd4e0e04.50655",\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": 4846.349884033203,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4849.349884033203,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b37b556.addac3",\r
+        "id": "e4eccca9.9724c8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5063.783935546875,\r
-        "y": 4895.349884033203,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4898.349884033203,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c62dd674.fd73f",\r
-                "37627bf2.c03934"\r
+                "7056a1ab.16f5c8",\r
+                "9ff2677.5b72918"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37627bf2.c03934",\r
+        "id": "9ff2677.5b72918",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5306.784423828125,\r
-        "y": 4936.349395751953,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4939.349395751953,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c62dd674.fd73f",\r
+        "id": "7056a1ab.16f5c8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5317.7841796875,\r
-        "y": 4893.349609375,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4896.349609375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b2c9765c.25999"\r
+                "2f2661a7.5dc1e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5ecb13c.9c7548",\r
+        "id": "a26e073.3ca98f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5544.767578125,\r
-        "y": 4900.76611328125,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4903.76611328125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "78a5ede3.09cc54",\r
-                "aecf8872.1d5c4",\r
-                "657d43b1.13c254"\r
+                "ff1ba77c.30ef7",\r
+                "6cee0088.2f0908",\r
+                "acf1096d.49e23"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d348107.818aa",\r
+        "id": "6e1088cb.02b348",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5709.8173828125,\r
-        "y": 4785.766571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4788.766571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "99f28c5d.95abe8"\r
+                "28fa48d0.c1f11"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99f28c5d.95abe8",\r
+        "id": "28fa48d0.c1f11",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5901.8173828125,\r
-        "y": 4774.766815185547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4777.766815185547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "9a75bdf9.10641"\r
+                "794e0693.bafff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78a5ede3.09cc54",\r
+        "id": "ff1ba77c.30ef7",\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": 4675.983612060547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4678.983612060547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aecf8872.1d5c4",\r
+        "id": "6cee0088.2f0908",\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": 4724.983612060547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4727.983612060547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "657d43b1.13c254",\r
+        "id": "acf1096d.49e23",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5881.751220703125,\r
-        "y": 4906.149627685547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4909.149627685547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f1c96228.a5339",\r
+        "id": "7591a9e8.920d7",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5833.401123046875,\r
-        "y": 4953.466522216797,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4956.466522216797,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "75d6304c.089cd8",\r
+        "id": "20c2cafd.4f2b6e",\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": 4867.149627685547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4870.149627685547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9a75bdf9.10641",\r
+        "id": "794e0693.bafff",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6083.8173828125,\r
-        "y": 4753.766815185547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4756.766815185547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b5ad886.81af5f8"\r
+                "cb67e673.c3b218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5ad886.81af5f8",\r
+        "id": "cb67e673.c3b218",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 6245.8173828125,\r
-        "y": 4742.766815185547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4745.766815185547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6f94f7eb.f4d818",\r
-                "269fac18.2bb21c"\r
+                "28efce3c.031a02",\r
+                "a7f7a502.452a7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f94f7eb.f4d818",\r
+        "id": "28efce3c.031a02",\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": 4671.766815185547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4674.766815185547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "269fac18.2bb21c",\r
+        "id": "a7f7a502.452a7",\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": 4770.983612060547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4773.983612060547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a984d0c7.8574d",\r
+        "id": "121ba89c.f4d387",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 3097.800048828125,\r
-        "y": 3229.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3232.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "49347bae.3e2974",\r
+        "id": "e7a924f9.c6032",\r
         "type": "switchNode",\r
         "name": "switch found-middle-man?",\r
         "xml": "<switch test='`$found-middle-man`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2974.800048828125,\r
-        "y": 3339.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3342.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "7b835f88.3b076",\r
-                "7490c0ec.4dda5"\r
+                "a8ce787f.7ca8b8",\r
+                "dab4cfcf.e3306"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b835f88.3b076",\r
+        "id": "a8ce787f.7ca8b8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3158.800048828125,\r
-        "y": 3318.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3321.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5b141b7a.8f28f4"\r
+                "3ed4168e.db435a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5b141b7a.8f28f4",\r
+        "id": "3ed4168e.db435a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3301.800048828125,\r
-        "y": 3318.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3321.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "94596646.a7e4f"\r
+                "d46982de.a36698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94596646.a7e4f",\r
+        "id": "d46982de.a36698",\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": 3316.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3319.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7490c0ec.4dda5",\r
+        "id": "dab4cfcf.e3306",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3156.800048828125,\r
-        "y": 3373.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3376.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a3855d70.dbb87"\r
+                "55aae2f8.8a15b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3855d70.dbb87",\r
+        "id": "55aae2f8.8a15b4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3003.800048828125,\r
-        "y": 3506.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3509.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5b4e5a5d.18c714",\r
-                "a7a1bb48.b43ec8",\r
-                "7b0989f8.4cdbd",\r
-                "b98b1ba5.429c1",\r
-                "37657916.72f08e",\r
-                "cc0c619e.32de58"\r
+                "82a9b10f.cbf938",\r
+                "9a0ba695.c13258",\r
+                "a14834df.662a8",\r
+                "87bd7501.49bf18",\r
+                "4331a4c2.0089dc",\r
+                "b9e9be73.6c3be"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5a62e88.7d802",\r
+        "id": "6411a3c0.06e7c4",\r
         "type": "comment",\r
         "name": "Find LEAF connectivity",\r
         "info": "",\r
         "comments": "",\r
         "x": 3225.88330078125,\r
-        "y": 3746.999969482422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3749.999969482422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b98b1ba5.429c1",\r
+        "id": "87bd7501.49bf18",\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": 3519.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3522.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "37657916.72f08e",\r
+        "id": "4331a4c2.0089dc",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 3306.8330078125,\r
-        "y": 3565.716766357422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3568.716766357422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "1a4c3937.32a93f"\r
+                "3cfcd803.984ff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a4c3937.32a93f",\r
+        "id": "3cfcd803.984ff",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3569.8330078125,\r
-        "y": 3560.716766357422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3563.716766357422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "95d80a37.7eef5"\r
+                "19e3fea0.d430a9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "95d80a37.7eef5",\r
+        "id": "19e3fea0.d430a9",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3729.83251953125,\r
-        "y": 3540.716766357422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3543.716766357422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "9608373.19689c8"\r
+                "cc595a48.1912e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d9ea756c.06e5e",\r
+        "id": "db4c40a7.875698",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4498.833740234375,\r
-        "y": 3575.716766357422,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5066.834228515625,\r
+        "y": 3574.716796875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "29278691.db117a",\r
-                "29bad35d.650d14",\r
-                "a6af6c62.1a6b5"\r
+                "7118b227.f4c97c",\r
+                "642017c6.da5f18",\r
+                "d7647a1a.599238"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29278691.db117a",\r
+        "id": "7118b227.f4c97c",\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": 4738.334228515625,\r
-        "y": 3524.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5306.334716796875,\r
+        "y": 3523.800048828125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29bad35d.650d14",\r
+        "id": "642017c6.da5f18",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4671.567657470703,\r
-        "y": 3597.800048828125,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5239.568145751953,\r
+        "y": 3596.800079345703,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4465f9ec.e3dbb",\r
+        "id": "d96806ce.d6ba3",\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": 5128.000213623047,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5131.000213623047,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "69806916.62139",\r
+        "id": "55b631d2.803a38",\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": 5179.916717529297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5182.916717529297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b19eccb.73cf0c",\r
+        "id": "e084df79.80ceb8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 4482.317138671875,\r
-        "y": 5622.916717529297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5625.916717529297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "987f769f.1ba7f8",\r
+        "id": "624968c9.f15538",\r
         "type": "switchNode",\r
         "name": "switch found-root-connectivity",\r
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4297.317138671875,\r
-        "y": 5689.916717529297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5692.916717529297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c7979e94.4deb18",\r
-                "5e8c956f.69a854"\r
+                "3ebbf801.286498",\r
+                "76ebd92f.1642a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7979e94.4deb18",\r
+        "id": "3ebbf801.286498",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4562.317138671875,\r
-        "y": 5674.916717529297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5677.916717529297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4a28d2a5.936924"\r
+                "37d1d73c.eecfd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e8c956f.69a854",\r
+        "id": "76ebd92f.1642a",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4558.317138671875,\r
-        "y": 5722.916717529297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5725.916717529297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "213fbf95.d03c8"\r
+                "199fe1ad.b53f66"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a28d2a5.936924",\r
+        "id": "37d1d73c.eecfd",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4718.317138671875,\r
-        "y": 5670.916717529297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5673.916717529297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a96c5a1a.d66bf"\r
+                "31a9971.ad96268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "213fbf95.d03c8",\r
+        "id": "199fe1ad.b53f66",\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": 5717.916717529297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5720.916717529297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4e8315f.b9446ec",\r
+        "id": "802c1097.dcd94",\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": 5612.916717529297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5615.916717529297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aa7d5d8.eb8bca",\r
+        "id": "8e64de53.2c9fe8",\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": 5209.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5212.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "32064458.33cdf4",\r
+        "id": "a2022ff9.9bc538",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4311.734130859375,\r
-        "y": 5298.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5301.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "aa7d5d8.eb8bca",\r
-                "3165c974.539e06"\r
+                "8e64de53.2c9fe8",\r
+                "2a874f25.a11e68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3165c974.539e06",\r
+        "id": "2a874f25.a11e68",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 4547.734130859375,\r
-        "y": 5291.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5294.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4cddcbba.102194",\r
-                "d5cd17da.64e6a",\r
-                "9d33157c.077f3"\r
+                "42e4546b.7efc04",\r
+                "8902c91a.a1454",\r
+                "2a8da0f.130cae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4cddcbba.102194",\r
+        "id": "42e4546b.7efc04",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4743.2342529296875,\r
-        "y": 5243.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5246.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "658952ec.d50f2c"\r
+                "374d8.3341eb28c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5cd17da.64e6a",\r
+        "id": "8902c91a.a1454",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4735.2342529296875,\r
-        "y": 5298.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5301.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f87d3f72.db25b"\r
+                "1ff3bcec.a42b9b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "658952ec.d50f2c",\r
+        "id": "374d8.3341eb28c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4887.6165771484375,\r
-        "y": 5242.8560791015625,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5245.8560791015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5e03d50d.e31174"\r
+                "ec0686db.c1a878"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e03d50d.e31174",\r
+        "id": "ec0686db.c1a878",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5071.734130859375,\r
-        "y": 5241.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5244.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "81fcac6e.c2cbb"\r
+                "d4462e32.3100d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81fcac6e.c2cbb",\r
+        "id": "d4462e32.3100d8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5266.734130859375,\r
-        "y": 5241.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5244.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "23740bd0.c54174"\r
+                "3a9e0096.e3a448"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d33157c.077f3",\r
+        "id": "2a8da0f.130cae",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4740.2342529296875,\r
-        "y": 5355.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5358.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d477847d.474a8"\r
+                "17a678b2.952aef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d477847d.474a8",\r
+        "id": "17a678b2.952aef",\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": 5356.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5359.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f87d3f72.db25b",\r
+        "id": "1ff3bcec.a42b9b",\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": 5299.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5302.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e3023af7.680d7",\r
+        "id": "318d00c4.ca52c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5648.734130859375,\r
-        "y": 5245.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5248.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "31c1897e.fbb116",\r
-                "b906e4f7.66368",\r
-                "ac0e0ca2.883cb"\r
+                "46db4a25.4363a4",\r
+                "34953acc.5d5dc6",\r
+                "9de681b9.d85948"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23740bd0.c54174",\r
+        "id": "3a9e0096.e3a448",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5469.734130859375,\r
-        "y": 5245.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5248.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e3023af7.680d7"\r
+                "318d00c4.ca52c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b906e4f7.66368",\r
+        "id": "34953acc.5d5dc6",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5854.734130859375,\r
-        "y": 5258.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5261.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "df7977a7.075b8",\r
-                "f17bde95.882498",\r
-                "61e2d23e.358d1c"\r
+                "a1306b3e.752188",\r
+                "af1e227.d98756",\r
+                "c7dc9a0c.c1a12"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31c1897e.fbb116",\r
+        "id": "46db4a25.4363a4",\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": 5206.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5209.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df7977a7.075b8",\r
+        "id": "a1306b3e.752188",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6064.734130859375,\r
-        "y": 5249.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5252.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "7ac6fe75.62b4e"\r
+                "c17f0a30.28a8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f17bde95.882498",\r
+        "id": "af1e227.d98756",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6056.734130859375,\r
-        "y": 5304.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5307.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "671c9934.2cd48"\r
+                "f59cff5b.1a7268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61e2d23e.358d1c",\r
+        "id": "c7dc9a0c.c1a12",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6061.734130859375,\r
-        "y": 5361.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5364.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a6615570.50c968"\r
+                "18fa3a10.34d806"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6615570.50c968",\r
+        "id": "18fa3a10.34d806",\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": 5362.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5365.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "671c9934.2cd48",\r
+        "id": "f59cff5b.1a7268",\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": 5307.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5310.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7ac6fe75.62b4e",\r
+        "id": "c17f0a30.28a8c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6209.116455078125,\r
-        "y": 5246.8560791015625,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5249.8560791015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6989c737.25d068"\r
+                "7a04be69.78c07"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6989c737.25d068",\r
+        "id": "7a04be69.78c07",\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": 5243.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5246.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ac0e0ca2.883cb",\r
+        "id": "9de681b9.d85948",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 5804.734130859375,\r
-        "y": 5322.200408935547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5325.200408935547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9c7a66fb.560d48",\r
+        "id": "702c8bba.ca32ac",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 4453.234375,\r
-        "y": 5402.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5405.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "1e28e096.7499f7",\r
-                "cc9e5694.f9d17"\r
+                "b53a2357.cb19f",\r
+                "1f266f6e.997129"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e28e096.7499f7",\r
+        "id": "b53a2357.cb19f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4813.734130859375,\r
-        "y": 5410.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5413.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "906e379.3b93848"\r
+                "1f814603.8b079a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "906e379.3b93848",\r
+        "id": "1f814603.8b079a",\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": 5410.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5413.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "90be5ca9.028288",\r
+        "id": "3ef4bb2e.ea4704",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4975.234130859375,\r
-        "y": 5450.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5453.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cc9e5694.f9d17",\r
+        "id": "1f266f6e.997129",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4817.734130859375,\r
-        "y": 5450.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5453.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "90be5ca9.028288"\r
+                "3ef4bb2e.ea4704"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "921095c8.3bc23",\r
+        "id": "4cb994af.f28aac",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5126.451171875,\r
-        "y": 5664.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5667.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "fb4f4697.4dc5f",\r
-                "7ea31674.99e1d8"\r
+                "37db8c04.dcc65c",\r
+                "e00788f7.d2c01"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ea31674.99e1d8",\r
+        "id": "e00788f7.d2c01",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5368.450927734375,\r
-        "y": 5614.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5617.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "10743e5b.0b6182",\r
-                "5598183a.212ab",\r
-                "9c9074e9.bbaff8"\r
+                "bd67e663.b6cc68",\r
+                "6a96c9e9.f60f08",\r
+                "24f63010.71743"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10743e5b.0b6182",\r
+        "id": "bd67e663.b6cc68",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5563.951171875,\r
-        "y": 5548.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5551.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "767943d2.64a144"\r
+                "9c952b2f.2e4c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5598183a.212ab",\r
+        "id": "6a96c9e9.f60f08",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5559.951171875,\r
-        "y": 5604.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5607.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "74a77564.40268c"\r
+                "72760d9d.ebda64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "767943d2.64a144",\r
+        "id": "9c952b2f.2e4c48",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5708.3333740234375,\r
-        "y": 5566.4556884765625,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5569.4556884765625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "10049f5.85364e1"\r
+                "27765347.4a6a3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10049f5.85364e1",\r
+        "id": "27765347.4a6a3c",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5892.450927734375,\r
-        "y": 5564.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5567.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "72e5612b.857e68"\r
+                "cd6a7530.d2bb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c9074e9.bbaff8",\r
+        "id": "24f63010.71743",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5569.951171875,\r
-        "y": 5649.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5652.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "952a99b1.f3f0e"\r
+                "a1473e64.1f4fc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "952a99b1.f3f0e",\r
+        "id": "a1473e64.1f4fc8",\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": 5665.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5668.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "74a77564.40268c",\r
+        "id": "72760d9d.ebda64",\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": 5617.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5620.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f64c3a10.6bbc38",\r
+        "id": "b65e14dd.2b2b98",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5279.951171875,\r
-        "y": 5720.399627685547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5723.399627685547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "cd722628.03685",\r
-                "76458c1b.1a62ac"\r
+                "f4d26e19.4a33a",\r
+                "2b318383.32132c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd722628.03685",\r
+        "id": "f4d26e19.4a33a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5628.451171875,\r
-        "y": 5702.399627685547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5705.399627685547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d04dd9dc.2f2dc8"\r
+                "cc266f68.3170a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d04dd9dc.2f2dc8",\r
+        "id": "cc266f68.3170a8",\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": 5705.399627685547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5708.399627685547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1006a530.30b813",\r
+        "id": "e9302632.da2fb8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5836.951171875,\r
-        "y": 5746.399627685547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5749.399627685547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "76458c1b.1a62ac",\r
+        "id": "2b318383.32132c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5638.451171875,\r
-        "y": 5751.399627685547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5754.399627685547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "1006a530.30b813"\r
+                "e9302632.da2fb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fb4f4697.4dc5f",\r
+        "id": "37db8c04.dcc65c",\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": 5532.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5535.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "72e5612b.857e68",\r
+        "id": "cd6a7530.d2bb8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6087.450927734375,\r
-        "y": 5564.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5567.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "3625dda5.38707a"\r
+                "40d39185.b5e49"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "402ab8f9.3aa18",\r
+        "id": "96e4f3b6.f5cd5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 6469.450927734375,\r
-        "y": 5568.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5571.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4697e13e.13b02",\r
-                "6c3ba6ac.e7c21",\r
-                "34e0c57a.0e712a"\r
+                "4ecdd233.2c761c",\r
+                "4b4d74a7.6aa104",\r
+                "563a66cd.e07e68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3625dda5.38707a",\r
+        "id": "40d39185.b5e49",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6290.450927734375,\r
-        "y": 5568.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5571.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "402ab8f9.3aa18"\r
+                "96e4f3b6.f5cd5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c3ba6ac.e7c21",\r
+        "id": "4b4d74a7.6aa104",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 6675.450927734375,\r
-        "y": 5581.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5584.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2e31a205.2611fe",\r
-                "c9f11bf6.38bb98",\r
-                "99cec3e1.6d2f68"\r
+                "5212e394.a625ac",\r
+                "8a0a8abd.557d58",\r
+                "fe612827.fce1d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4697e13e.13b02",\r
+        "id": "4ecdd233.2c761c",\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": 5529.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5532.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2e31a205.2611fe",\r
+        "id": "5212e394.a625ac",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6885.450927734375,\r
-        "y": 5572.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5575.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2ba283a1.e08d44"\r
+                "22d6ab8e.b3d594"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9f11bf6.38bb98",\r
+        "id": "8a0a8abd.557d58",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6877.450927734375,\r
-        "y": 5627.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5630.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "3af9cd94.f12ff2"\r
+                "d2e549e.aa0e038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99cec3e1.6d2f68",\r
+        "id": "fe612827.fce1d",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6882.450927734375,\r
-        "y": 5684.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5687.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c501098b.50507"\r
+                "18a7205c.94ea5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c501098b.50507",\r
+        "id": "18a7205c.94ea5",\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": 5685.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5688.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3af9cd94.f12ff2",\r
+        "id": "d2e549e.aa0e038",\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": 5630.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5633.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2ba283a1.e08d44",\r
+        "id": "22d6ab8e.b3d594",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 7029.833251953125,\r
-        "y": 5570.4556884765625,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5573.4556884765625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "bca9e0da.72619"\r
+                "c312e16c.c44d58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bca9e0da.72619",\r
+        "id": "c312e16c.c44d58",\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": 5566.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5569.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "34e0c57a.0e712a",\r
+        "id": "563a66cd.e07e68",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 6625.450927734375,\r
-        "y": 5645.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5648.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9608373.19689c8",\r
+        "id": "cc595a48.1912e8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3854.88330078125,\r
-        "y": 3534.999969482422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3537.999969482422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6e45c64.2629238",\r
-                "354c7fc8.6d8de"\r
+                "eec6a040.1af03",\r
+                "d560f701.2c7f08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e45c64.2629238",\r
+        "id": "eec6a040.1af03",\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": 3477.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3480.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "354c7fc8.6d8de",\r
+        "id": "d560f701.2c7f08",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 4092.466552734375,\r
-        "y": 3548.800018310547,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3551.800018310547,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6bdb2c16.23fc7c",\r
-                "5820e4e6.95b47c"\r
+                "70d2875.2f53ff8",\r
+                "b1bb56dc.337f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6bdb2c16.23fc7c",\r
+        "id": "70d2875.2f53ff8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4330.884033203125,\r
-        "y": 3507.999969482422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3510.999969482422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d4fcba65.f8c8f"\r
+                "f216f825.2991a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5820e4e6.95b47c",\r
+        "id": "b1bb56dc.337f2",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4337.884246826172,\r
-        "y": 3564.9999389648438,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3567.9999389648438,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d9ea756c.06e5e"\r
+                "28b93260.26eace"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4fcba65.f8c8f",\r
+        "id": "f216f825.2991a8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4458.884521484375,\r
-        "y": 3503.999969482422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3506.999969482422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cc0c619e.32de58",\r
+        "id": "b9e9be73.6c3be",\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": 3462.400115966797,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3465.400115966797,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a6af6c62.1a6b5",\r
+        "id": "d7647a1a.599238",\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": 4727.9169921875,\r
-        "y": 3468.400115966797,\r
-        "z": "d1eceead.adafe",\r
+        "x": 5295.91748046875,\r
+        "y": 3467.400146484375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "811e3163.5710b",\r
+        "id": "1414f243.3459be",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4407.6669921875,\r
-        "y": 3984.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3987.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "aa9298d8.acde8",\r
-                "a5e5763f.58bb2"\r
+                "45f92202.e9d224",\r
+                "9274acbb.bb64f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa9298d8.acde8",\r
+        "id": "45f92202.e9d224",\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": 3980.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3983.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a5e5763f.58bb2",\r
+        "id": "9274acbb.bb64f",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 4583.5498046875,\r
-        "y": 4027.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4030.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4df6bcf4.a4f44c",\r
-                "89771ed8.977b78",\r
-                "d1de1d5b.be978"\r
+                "4b44a73a.87e16",\r
+                "13d9fc09.409024",\r
+                "52115c05.c8dcf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4df6bcf4.a4f44c",\r
+        "id": "4b44a73a.87e16",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4755.5498046875,\r
-        "y": 4011.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4014.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f65d0563.51b9e"\r
+                "40f66b99.edebbc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89771ed8.977b78",\r
+        "id": "13d9fc09.409024",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4756.040771484375,\r
-        "y": 4056.850372314453,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4059.850372314453,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d1de1d5b.be978",\r
+        "id": "52115c05.c8dcf4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4756.5498046875,\r
-        "y": 4097.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4100.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f65d0563.51b9e",\r
+        "id": "40f66b99.edebbc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4916.5498046875,\r
-        "y": 4007.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4010.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "41e51ce8.c7bbd4",\r
-                "9fcba756.d0c298",\r
-                "99817ef0.1be558"\r
+                "de7bc652.3681b8",\r
+                "eebe95d8.077038",\r
+                "efb01679.580728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d2f62a11.bbccd",\r
+        "id": "f38b6801.52bee8",\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": 3938.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3941.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9fcba756.d0c298",\r
+        "id": "eebe95d8.077038",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5184.5498046875,\r
-        "y": 3995.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3998.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "ad91a307.53dc18",\r
-                "66b6c9a.ce41eb8"\r
+                "20f99809.a45e68",\r
+                "f98fd083.5f84c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66b6c9a.ce41eb8",\r
+        "id": "f98fd083.5f84c",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5407.5498046875,\r
-        "y": 3981.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3984.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f5696a58.3dcae"\r
+                "e9001fe4.5ec9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad91a307.53dc18",\r
+        "id": "20f99809.a45e68",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5409.5498046875,\r
-        "y": 4014.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4017.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "cd5f81cd.b325a8"\r
+                "c4ea9853.8f7b9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5696a58.3dcae",\r
+        "id": "e9001fe4.5ec9",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5555.5498046875,\r
-        "y": 3974.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3977.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "520c18e.4c672e8"\r
+                "efdb6ef0.5c83c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd5f81cd.b325a8",\r
+        "id": "c4ea9853.8f7b9",\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": 4011.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4014.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "520c18e.4c672e8",\r
+        "id": "efdb6ef0.5c83c",\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": 3974.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 3977.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "41e51ce8.c7bbd4",\r
+        "id": "de7bc652.3681b8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5228.5498046875,\r
-        "y": 4129.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4132.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f5a5405e.ab64e8",\r
-                "39efe4c8.977e5c"\r
+                "7639ee60.41df3",\r
+                "7e06cc80.35387c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5a5405e.ab64e8",\r
+        "id": "7639ee60.41df3",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5509.5498046875,\r
-        "y": 4106.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4109.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "76dcdb2b.58523c"\r
+                "d6573f78.845c78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39efe4c8.977e5c",\r
+        "id": "7e06cc80.35387c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5502.5498046875,\r
-        "y": 4165.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4168.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e34b9d00.f34da8"\r
+                "14bc3378.1253a5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76dcdb2b.58523c",\r
+        "id": "d6573f78.845c78",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5639.5498046875,\r
-        "y": 4110.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4113.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e34b9d00.f34da8",\r
+        "id": "14bc3378.1253a5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5644.5498046875,\r
-        "y": 4164.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4167.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d870e573.0525d",\r
-                "daec44c5.c4ca2"\r
+                "f0b195ca.19df6",\r
+                "fec7cdec.3f23"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d870e573.0525d",\r
+        "id": "f0b195ca.19df6",\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": 4131.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4134.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "77e6d570.0136ec",\r
+        "id": "14cfe3f0.60188c",\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": 4183.276336669922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4186.276336669922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "daec44c5.c4ca2",\r
+        "id": "fec7cdec.3f23",\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": 4252.866668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4255.866668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "99817ef0.1be558",\r
+        "id": "efb01679.580728",\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": 4078.766571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4081.766571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4a51985e.972e68",\r
+        "id": "16d898b2.82d4af",\r
         "type": "switchNode",\r
         "name": "switch tmp.stillHasUni?",\r
         "xml": "\n<switch test=\"`$tmp.stillHasUni`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 383.7339172363281,\r
-        "y": 5348.966278076172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5351.966278076172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "35e41a11.58bd1e",\r
-                "8fea1632.f2d7a"\r
+                "2ef37de6.fb696a",\r
+                "d4b46a3b.e544d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a89b0c9.686c5",\r
+        "id": "bb7a24ed.4756b",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 4288.516357421875,\r
-        "y": 5512.850067138672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5515.850067138672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "11eb64db.01f3fb",\r
-                "edc304ba.5ec56",\r
-                "e3707812.01b138"\r
+                "b93cd05c.18e338",\r
+                "28c478b5.8c3cf",\r
+                "ad4069fd.35ec2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8fd56902.a16fd8",\r
+        "id": "cd789bfb.94ca8",\r
         "type": "comment",\r
         "name": "Update ROOT UNI's bw -- ALREADY DONE",\r
         "info": "",\r
         "comments": "",\r
         "x": 4286.516845703125,\r
-        "y": 5464.850311279297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5467.850311279297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe5a805b.6befb8",\r
+        "id": "f7d2d4f8.f1e648",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 4903.5166015625,\r
-        "y": 5582.850311279297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5585.850311279297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "edc304ba.5ec56",\r
+        "id": "28c478b5.8c3cf",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4506.007568359375,\r
-        "y": 5483.424285888672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5486.424285888672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d06cf255.10cad"\r
+                "4927866f.a84e1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3707812.01b138",\r
+        "id": "ad4069fd.35ec2",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4501.5166015625,\r
-        "y": 5527.850250244141,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5530.850250244141,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c2ada4d7.cf23a"\r
+                "c4a31719.674e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d06cf255.10cad",\r
+        "id": "4927866f.a84e1",\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": 5482.709991455078,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5485.709991455078,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c2ada4d7.cf23a",\r
+        "id": "c4a31719.674e",\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": 5527.850250244141,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5530.850250244141,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "487370c3.c16b7",\r
+        "id": "f08cda49.ab7188",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4666.5166015625,\r
-        "y": 5577.850311279297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5580.850311279297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6c262f9d.59d16",\r
-                "fe5a805b.6befb8"\r
+                "ed324322.59277",\r
+                "f7d2d4f8.f1e648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11eb64db.01f3fb",\r
+        "id": "b93cd05c.18e338",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4497.5166015625,\r
-        "y": 5577.850311279297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5580.850311279297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "487370c3.c16b7"\r
+                "f08cda49.ab7188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c262f9d.59d16",\r
+        "id": "ed324322.59277",\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": 5502.850311279297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5505.850311279297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "472764ad.0e5da4",\r
+        "id": "61d36925.a62e",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 5288.216796875,\r
-        "y": 5440.616912841797,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5443.616912841797,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a96c5a1a.d66bf",\r
+        "id": "31a9971.ad96268",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5314,\r
-        "y": 5482.817108154297,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5485.817108154297,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "35e41a11.58bd1e",\r
+        "id": "2ef37de6.fb696a",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 567.8836059570312,\r
-        "y": 5399.999969482422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5402.999969482422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "49ab1cdc.2b3dfc"\r
+                "97fb2b7.67063d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8fea1632.f2d7a",\r
+        "id": "d4b46a3b.e544d",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 550.883544921875,\r
-        "y": 5321.999969482422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5324.999969482422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "44e1ece4.47debc"\r
+                "d28cabbc.30ca5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71bd2e28.fdc428",\r
+        "id": "4a0919d1.fbc9d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 679.8833923339844,\r
-        "y": 4408.999694824219,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4411.999694824219,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "ab47ddf.140532",\r
-                "d3485e4a.cbde48",\r
-                "964a9d6b.511ef",\r
-                "58993466.bcba34",\r
-                "b72e55ab.bc6bd8",\r
-                "8d45971b.519e08"\r
+                "551f2a9f.a9466c",\r
+                "6f7adb55.d0de94",\r
+                "7279f474.ca532c",\r
+                "c28774e0.0f37e8",\r
+                "fd804c17.d00668",\r
+                "6504876a.65a0e",\r
+                "d39caf18.6babe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab47ddf.140532",\r
+        "id": "551f2a9f.a9466c",\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": 4387.049499511719,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4390.049499511719,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "83fd3013.a6f008",\r
+        "id": "1a5de4c8.98ba3b",\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": 4335.132995605469,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4338.132995605469,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8b20d7ab.715e18",\r
+        "id": "35555086.07bd08",\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": 4416.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4419.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d3485e4a.cbde48",\r
+        "id": "6f7adb55.d0de94",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 911.9837341308594,\r
-        "y": 4505.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4508.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "8b20d7ab.715e18",\r
-                "3ddce0eb.9cdfd8"\r
+                "35555086.07bd08",\r
+                "f6475b04.522d68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ddce0eb.9cdfd8",\r
+        "id": "f6475b04.522d68",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1147.9837341308594,\r
-        "y": 4498.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4501.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c4f933ed.6c6328",\r
-                "c8f61cf.a6fdde",\r
-                "31635596.d79712"\r
+                "d9d0b846.fc4eb",\r
+                "859bebef.e15268",\r
+                "82bf3fe2.ca776"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4f933ed.6c6328",\r
+        "id": "d9d0b846.fc4eb",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1343.4838562011719,\r
-        "y": 4450.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4453.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "40098ed2.4f4dd"\r
+                "54e66745.d0a218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8f61cf.a6fdde",\r
+        "id": "859bebef.e15268",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1335.4838562011719,\r
-        "y": 4505.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4508.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "8f4995e7.00e5b8"\r
+                "6c2244a0.55dae4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40098ed2.4f4dd",\r
+        "id": "54e66745.d0a218",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1487.8661804199219,\r
-        "y": 4449.988861083984,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4452.988861083984,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4b557dbd.14d794"\r
+                "c5450793.0d4ff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b557dbd.14d794",\r
+        "id": "c5450793.0d4ff8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1671.9837341308594,\r
-        "y": 4448.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4451.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a0958afe.9d1b"\r
+                "8c14dfae.797ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0958afe.9d1b",\r
+        "id": "8c14dfae.797ac",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1866.9837341308594,\r
-        "y": 4448.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4451.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "31026a11.2a4bde"\r
+                "2cd4e727.640d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31635596.d79712",\r
+        "id": "82bf3fe2.ca776",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1340.4838562011719,\r
-        "y": 4562.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4565.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c3c84b5.76fc5b8"\r
+                "1f28baf3.4c601d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3c84b5.76fc5b8",\r
+        "id": "1f28baf3.4c601d",\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": 4563.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4566.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8f4995e7.00e5b8",\r
+        "id": "6c2244a0.55dae4",\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": 4506.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4509.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ca7cc65e.e299b",\r
+        "id": "c7d8a4a1.11fab",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2248.9837341308594,\r
-        "y": 4452.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4455.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "7e1000fc.f7ace",\r
-                "10f0f2b8.28ecdd",\r
-                "1cf608fc.280f8f"\r
+                "51d3a91c.c42e68",\r
+                "d0954d9b.2799a8",\r
+                "454e24ff.d6924c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31026a11.2a4bde",\r
+        "id": "2cd4e727.640d2",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2069.9837341308594,\r
-        "y": 4452.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4455.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "ca7cc65e.e299b"\r
+                "c7d8a4a1.11fab"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "964a9d6b.511ef",\r
+        "id": "7279f474.ca532c",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1053.4839782714844,\r
-        "y": 4609.932800292969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4612.932800292969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a14b7306.f0f088",\r
-                "edc3d42b.21d3d"\r
+                "63493229.c5487c",\r
+                "9b59a379.ae234"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "edc3d42b.21d3d",\r
+        "id": "9b59a379.ae234",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1417.9837341308594,\r
-        "y": 4657.932800292969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4660.932800292969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "7d2a7da9.46fdfc"\r
+                "7641260e.a4325"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a14b7306.f0f088",\r
+        "id": "63493229.c5487c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1413.9837341308594,\r
-        "y": 4617.932800292969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4620.932800292969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "db3e9725.884648"\r
+                "3e92540.7763d2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db3e9725.884648",\r
+        "id": "3e92540.7763d2c",\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": 4617.932800292969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4620.932800292969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7d2a7da9.46fdfc",\r
+        "id": "7641260e.a4325",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1575.4837341308594,\r
-        "y": 4657.932800292969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4660.932800292969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "10f0f2b8.28ecdd",\r
+        "id": "d0954d9b.2799a8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2454.9837341308594,\r
-        "y": 4465.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4468.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "25e5e61.acf541a",\r
-                "12a14aa1.cf2fb5",\r
-                "c1a2b3a0.8c75c"\r
+                "53623639.5d8eb",\r
+                "11f800c8.cf014f",\r
+                "e0ce2e99.74a758"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e1000fc.f7ace",\r
+        "id": "51d3a91c.c42e68",\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": 4413.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4416.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "25e5e61.acf541a",\r
+        "id": "53623639.5d8eb",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2664.9837341308594,\r
-        "y": 4456.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4459.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5696d51e.dbfe64"\r
+                "73587898.c5bc6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12a14aa1.cf2fb5",\r
+        "id": "11f800c8.cf014f",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2656.9837341308594,\r
-        "y": 4511.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4514.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "8d572a45.011df8"\r
+                "7759dd63.3c0bd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1a2b3a0.8c75c",\r
+        "id": "e0ce2e99.74a758",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2661.9837341308594,\r
-        "y": 4568.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4571.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "dddace6e.f9e9f"\r
+                "29744fd6.f0a3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dddace6e.f9e9f",\r
+        "id": "29744fd6.f0a3",\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": 4569.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4572.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8d572a45.011df8",\r
+        "id": "7759dd63.3c0bd4",\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": 4514.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4517.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5696d51e.dbfe64",\r
+        "id": "73587898.c5bc6",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2809.3660583496094,\r
-        "y": 4453.988861083984,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4456.988861083984,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e4cea83c.4d71a"\r
+                "2b6c0b59.4c3f54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4cea83c.4d71a",\r
+        "id": "2b6c0b59.4c3f54",\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": 4450.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4453.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1cf608fc.280f8f",\r
+        "id": "454e24ff.d6924c",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 2404.9837341308594,\r
-        "y": 4529.333190917969,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4532.333190917969,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "58993466.bcba34",\r
+        "id": "c28774e0.0f37e8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1082.5667419433594,\r
-        "y": 4830.049499511719,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4833.049499511719,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b72e55ab.bc6bd8",\r
+        "id": "fd804c17.d00668",\r
         "type": "switchNode",\r
         "name": "switch found-root-connectivity",\r
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 897.5667419433594,\r
-        "y": 4897.049499511719,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4900.049499511719,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "191ee334.0f09fd",\r
-                "b8911820.2c8f68"\r
+                "c90d3790.0c31f",\r
+                "b432c8fe.988cb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "191ee334.0f09fd",\r
+        "id": "c90d3790.0c31f",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1162.5667419433594,\r
-        "y": 4882.049499511719,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4885.049499511719,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "328aa2d2.c36a96"\r
+                "b12f48c6.75129"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8911820.2c8f68",\r
+        "id": "b432c8fe.988cb",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1158.5667419433594,\r
-        "y": 4930.049499511719,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4933.049499511719,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "88b54a6f.ba3898"\r
+                "7a2784c6.a60bf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "328aa2d2.c36a96",\r
+        "id": "b12f48c6.75129",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1318.5667419433594,\r
-        "y": 4878.049499511719,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4881.049499511719,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4a7a1b00.5fe524"\r
+                "b537e67c.ce751"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88b54a6f.ba3898",\r
+        "id": "7a2784c6.a60bf4",\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": 4925.049499511719,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4928.049499511719,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d5cdb27.e4e575",\r
+        "id": "5b301854.48435",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 1587.4664001464844,\r
-        "y": 4828.749694824219,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4831.749694824219,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4a7a1b00.5fe524",\r
+        "id": "b537e67c.ce751",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1613.2496032714844,\r
-        "y": 4870.949890136719,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4873.949890136719,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1003b628.8cf272",\r
+        "id": "46575909.129948",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1026.8833923339844,\r
-        "y": 4144.316589355469,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4147.316589355469,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "44e1ece4.47debc",\r
+        "id": "d28cabbc.30ca5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 632.8834228515625,\r
-        "y": 4148.999725341797,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4151.999725341797,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "1003b628.8cf272",\r
-                "71bd2e28.fdc428"\r
+                "46575909.129948",\r
+                "4a0919d1.fbc9d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49ab1cdc.2b3dfc",\r
+        "id": "97fb2b7.67063d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 716.3333740234375,\r
-        "y": 5401.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5404.516571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "723c2903.f58428",\r
-                "98b88954.793148",\r
-                "b393338f.3c0a5",\r
-                "119574e6.129413"\r
+                "8c98b36e.448bc8",\r
+                "4b4a8b6f.30cb4c",\r
+                "232ef942.027ea6",\r
+                "9956c6b0.e8f5b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "723c2903.f58428",\r
+        "id": "8c98b36e.448bc8",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1067.7166748046875,\r
-        "y": 5332.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1077.7166748046875,\r
+        "y": 5167.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "98b88954.793148",\r
+        "id": "4b4a8b6f.30cb4c",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 978.7166748046875,\r
-        "y": 5401.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 988.7166748046875,\r
+        "y": 5236.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b393338f.3c0a5",\r
+        "id": "232ef942.027ea6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 869.88330078125,\r
-        "y": 5636.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 879.88330078125,\r
+        "y": 5471.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "df7f814b.30dca",\r
-                "680a6c2d.c81304",\r
-                "f02d2a13.d0aa48"\r
+                "3ef7ef40.ec34",\r
+                "afe6825d.3e4ed8",\r
+                "56fc7b03.ef7a34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8c4cb96.f9d8b",\r
+        "id": "8f4e88cb.a2731",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2585.882568359375,\r
-        "y": 5523.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 2588.882568359375,\r
+        "y": 5396.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "43900724.7021a8",\r
-                "b5fd98a.36736e8",\r
-                "3c26b3f8.230acc"\r
+                "4a46c897.331cf",\r
+                "c619cf4e.8ea4f8",\r
+                "c904c4c1.6a362"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de9e1e1d.dcbc3",\r
+        "id": "c656ce5c.18cf6",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 2535.882568359375,\r
-        "y": 5587.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 2538.882568359375,\r
+        "y": 5460.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d2b1cccb.1f5468",\r
+        "id": "c0938886.470a7",\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": 2615.882568359375,\r
-        "y": 5471.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 2618.882568359375,\r
+        "y": 5344.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "43900724.7021a8",\r
+        "id": "4a46c897.331cf",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2795.882568359375,\r
-        "y": 5514.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 2906.8826904296875,\r
+        "y": 5327.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "dc7a8a3b.a925f8"\r
+                "a7e4d7d8.d8bee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5fd98a.36736e8",\r
+        "id": "c619cf4e.8ea4f8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2787.882568359375,\r
-        "y": 5569.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 2898.8826904296875,\r
+        "y": 5382.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c1ab7307.8305a8"\r
+                "8289ee53.c79808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c26b3f8.230acc",\r
+        "id": "c904c4c1.6a362",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2792.882568359375,\r
-        "y": 5626.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 2903.8826904296875,\r
+        "y": 5439.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f1d869f8.b644e"\r
+                "6baa18e0.e89e88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1d869f8.b644e",\r
+        "id": "6baa18e0.e89e88",\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": 2944.882568359375,\r
-        "y": 5627.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3055.8826904296875,\r
+        "y": 5440.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c1ab7307.8305a8",\r
+        "id": "8289ee53.c79808",\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": 2955.882568359375,\r
-        "y": 5572.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3066.8826904296875,\r
+        "y": 5385.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dc7a8a3b.a925f8",\r
+        "id": "a7e4d7d8.d8bee",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2940.264892578125,\r
-        "y": 5512.1722412109375,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3051.2650146484375,\r
+        "y": 5325.172271728516,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "99f651cc.e3a158"\r
+                "ec15425b.c6de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99f651cc.e3a158",\r
+        "id": "ec15425b.c6de8",\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": 3154.882568359375,\r
-        "y": 5508.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 3265.8826904296875,\r
+        "y": 5321.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df7f814b.30dca",\r
+        "id": "3ef7ef40.ec34",\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": 1151.88330078125,\r
-        "y": 5505.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1161.88330078125,\r
+        "y": 5340.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1d552db6.d6aaca",\r
+        "id": "a4339be5.b80c5",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1362.3834228515625,\r
-        "y": 5644.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1372.3834228515625,\r
+        "y": 5479.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2d69161c.7523aa"\r
+                "1127f42a.b3bf34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d7946986.6d0968",\r
+        "id": "2e74a78.3df33d8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1365.3834228515625,\r
-        "y": 5532.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1375.3834228515625,\r
+        "y": 5367.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b24f95b.8630968"\r
+                "5612018f.6df8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ea8b87c.75f8b",\r
+        "id": "70a06659.f7e26",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1357.3834228515625,\r
-        "y": 5587.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1367.3834228515625,\r
+        "y": 5422.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d1cfde55.05efd"\r
+                "f549eabc.91dae8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b24f95b.8630968",\r
+        "id": "5612018f.6df8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1499.765625,\r
-        "y": 5527.172332763672,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1509.765625,\r
+        "y": 5362.17236328125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "57f5a4ed.934544"\r
+                "e700427f.a90ed"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d69161c.7523aa",\r
+        "id": "1127f42a.b3bf34",\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": 1514.3834228515625,\r
-        "y": 5645.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1524.3834228515625,\r
+        "y": 5480.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d1cfde55.05efd",\r
+        "id": "f549eabc.91dae8",\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": 1525.3834228515625,\r
-        "y": 5588.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1535.3834228515625,\r
+        "y": 5423.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "57f5a4ed.934544",\r
+        "id": "e700427f.a90ed",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1686.8828125,\r
-        "y": 5528.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1696.8828125,\r
+        "y": 5363.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "489e94a0.cb0724"\r
+                "5799adae.feee0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "489e94a0.cb0724",\r
+        "id": "5799adae.feee0c",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1914.8828125,\r
-        "y": 5521.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1924.8828125,\r
+        "y": 5356.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "70d2a39a.39c914"\r
+                "1e23480b.f981d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "680a6c2d.c81304",\r
+        "id": "afe6825d.3e4ed8",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1169.88330078125,\r
-        "y": 5580.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1179.88330078125,\r
+        "y": 5415.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "1d552db6.d6aaca",\r
-                "d7946986.6d0968",\r
-                "9ea8b87c.75f8b"\r
+                "a4339be5.b80c5",\r
+                "2e74a78.3df33d8",\r
+                "70a06659.f7e26"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70d2a39a.39c914",\r
+        "id": "1e23480b.f981d8",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2120.8828125,\r
-        "y": 5518.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 2130.8828125,\r
+        "y": 5353.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "11f0110f.f1cbd7"\r
+                "82b93b0b.3752a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11f0110f.f1cbd7",\r
+        "id": "82b93b0b.3752a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2335.8822021484375,\r
-        "y": 5521.516571044922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 2345.8822021484375,\r
+        "y": 5356.5166015625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d2b1cccb.1f5468",\r
-                "c8c4cb96.f9d8b",\r
-                "de9e1e1d.dcbc3"\r
+                "c0938886.470a7",\r
+                "8f4e88cb.a2731",\r
+                "c656ce5c.18cf6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f02d2a13.d0aa48",\r
+        "id": "56fc7b03.ef7a34",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1293.6500244140625,\r
-        "y": 5729.916473388672,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1303.6500244140625,\r
+        "y": 5564.91650390625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "73cc7454.46b21c",\r
-                "983cf462.7773e"\r
+                "5de191f6.0adf08",\r
+                "8645dbc5.336bd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73cc7454.46b21c",\r
+        "id": "5de191f6.0adf08",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1640.1500244140625,\r
-        "y": 5722.916473388672,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1650.1500244140625,\r
+        "y": 5557.91650390625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d64e37c.99aa9c8"\r
+                "1d2e7b8b.bb158c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "983cf462.7773e",\r
+        "id": "8645dbc5.336bd",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1644.1500244140625,\r
-        "y": 5762.916473388672,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1654.1500244140625,\r
+        "y": 5597.91650390625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "63d68d1b.26356c"\r
+                "7a1f5009.c19bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d64e37c.99aa9c8",\r
+        "id": "1d2e7b8b.bb158c",\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": 1798.1500244140625,\r
-        "y": 5722.916473388672,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1808.1500244140625,\r
+        "y": 5557.91650390625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "63d68d1b.26356c",\r
+        "id": "7a1f5009.c19bf",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1801.6500244140625,\r
-        "y": 5762.916473388672,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1811.6500244140625,\r
+        "y": 5597.91650390625,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "119574e6.129413",\r
+        "id": "9956c6b0.e8f5b",\r
         "type": "switchNode",\r
         "name": "switch tmp.MMstillHasUni?",\r
         "xml": "\n<switch test=\"`$tmp.MMstillHasUni`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 913.183349609375,\r
-        "y": 5891.716766357422,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5894.716766357422,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "20383b77.9d13bc",\r
-                "9b5788ce.9c9408"\r
+                "1b3dc283.1c72c5",\r
+                "6927d979.135438"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20383b77.9d13bc",\r
+        "id": "1b3dc283.1c72c5",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1105.183349609375,\r
-        "y": 5868.716766357422,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1107.183349609375,\r
+        "y": 5721.716796875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c8a5ff15.a0cc5"\r
+                "90688337.4fcde8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9b5788ce.9c9408",\r
+        "id": "6927d979.135438",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1093.3500366210938,\r
-        "y": 6041.316864013672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6044.316864013672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "80ab1272.8cacd"\r
+                "66475002.0efde8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8a5ff15.a0cc5",\r
+        "id": "90688337.4fcde8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1253.35009765625,\r
-        "y": 5868.316864013672,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1255.35009765625,\r
+        "y": 5721.31689453125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b646edcc.5849d8",\r
-                "7aaef741.32dd88"\r
+                "88d77fb7.cde5d8",\r
+                "89314dbf.8366b8",\r
+                "68e0d31a.2e51f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b646edcc.5849d8",\r
+        "id": "88d77fb7.cde5d8",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1675.199951171875,\r
-        "y": 5839.716766357422,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1677.199951171875,\r
+        "y": 5692.716796875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7aaef741.32dd88",\r
+        "id": "89314dbf.8366b8",\r
         "type": "switchNode",\r
         "name": "switch found-root-connectivity",\r
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1490.199951171875,\r
-        "y": 5906.716766357422,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1492.199951171875,\r
+        "y": 5759.716796875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f0373e80.9f5c1",\r
-                "17b9923a.e6ff36"\r
+                "4d863da6.047404",\r
+                "e3c67257.c0375"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0373e80.9f5c1",\r
+        "id": "4d863da6.047404",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1755.199951171875,\r
-        "y": 5891.716766357422,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1757.199951171875,\r
+        "y": 5744.716796875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "ea0794c3.5caad8"\r
+                "798adf3a.473ef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17b9923a.e6ff36",\r
+        "id": "e3c67257.c0375",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1751.199951171875,\r
-        "y": 5939.716766357422,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1756.199951171875,\r
+        "y": 5792.716796875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f785b40a.2c0f08"\r
+                "88e52eb1.fc93f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea0794c3.5caad8",\r
+        "id": "798adf3a.473ef",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1911.199951171875,\r
-        "y": 5887.716766357422,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1913.199951171875,\r
+        "y": 5740.716796875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c184cafd.df5108"\r
+                "733c34ed.517f9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f785b40a.2c0f08",\r
+        "id": "88e52eb1.fc93f",\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": 1899.199951171875,\r
-        "y": 5934.716766357422,\r
-        "z": "d1eceead.adafe",\r
+        "x": 1904.199951171875,\r
+        "y": 5787.716796875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c184cafd.df5108",\r
+        "id": "733c34ed.517f9c",\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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2219.8826904296875,\r
-        "y": 5881.617156982422,\r
-        "z": "d1eceead.adafe",\r
+        "x": 2221.8826904296875,\r
+        "y": 5734.6171875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c1da52d9.9cf468",\r
+        "id": "51bb42c1.6468fc",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2194.0994873046875,\r
-        "y": 5839.416961669922,\r
-        "z": "d1eceead.adafe",\r
+        "x": 2196.0994873046875,\r
+        "y": 5692.4169921875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80ab1272.8cacd",\r
+        "id": "66475002.0efde8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1230.916748046875,\r
-        "y": 6040.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6043.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "49431e5b.e46588",\r
-                "1475339.a9ed04c"\r
+                "a0a718de.f23a",\r
+                "e9e38848.54da1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49431e5b.e46588",\r
+        "id": "a0a718de.f23a",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1544.23291015625,\r
-        "y": 6034.816864013672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6037.816864013672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f57bdc9.9ead4a"\r
+                "76936a5f.84bc84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f57bdc9.9ead4a",\r
+        "id": "76936a5f.84bc84",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1844.566650390625,\r
-        "y": 6029.816802978516,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6032.816802978516,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "ba35dccb.3b6bb8"\r
+                "44a7328f.e8be34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba35dccb.3b6bb8",\r
+        "id": "44a7328f.e8be34",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2024.2332763671875,\r
-        "y": 6029.81689453125,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6032.81689453125,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "86341ec4.ccb728"\r
+                "208791a0.d9f786"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86341ec4.ccb728",\r
+        "id": "208791a0.d9f786",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2224.233154296875,\r
-        "y": 6029.816864013672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6032.816864013672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "73b15a95.c45e6c",\r
-                "577c89f1.70257",\r
-                "ebf7b15b.49862"\r
+                "574a6228.5b1754",\r
+                "eafb76a9.ded53",\r
+                "327d9363.1aef4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73b15a95.c45e6c",\r
+        "id": "574a6228.5b1754",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2431.23291015625,\r
-        "y": 6079.816864013672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6082.816864013672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d5e5b35.6604c5"\r
+                "23760b0c.48685c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "925dd5ef.2fc678",\r
+        "id": "460767d0.d2c1b8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2408.466552734375,\r
-        "y": 6264.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6267.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "42725353.b4a374",\r
-                "1745f7ad.eada2",\r
-                "ebfc9334.bdf468"\r
+                "88082c33.393",\r
+                "e1f0fae1.b8f4d8",\r
+                "822aec8b.abd888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ac4c475.ce37cc",\r
+        "id": "6361e7ff.46b828",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1607.466552734375,\r
-        "y": 6179.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6182.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "df9efed7.82417"\r
+                "75dfc93.82d2038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df9efed7.82417",\r
+        "id": "75dfc93.82d2038",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1804.466552734375,\r
-        "y": 6193.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6196.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "376f554a.32ded2",\r
-                "e86a8d88.08809"\r
+                "a28db7b9.a381c8",\r
+                "9f04b050.7c6fe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "376f554a.32ded2",\r
+        "id": "a28db7b9.a381c8",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1972.466552734375,\r
-        "y": 6186.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6189.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "bc2d7c0c.7cc4a8"\r
+                "136ceea8.d9cdf9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc2d7c0c.7cc4a8",\r
+        "id": "136ceea8.d9cdf9",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2135.466552734375,\r
-        "y": 6186.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6189.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "925dd5ef.2fc678"\r
+                "460767d0.d2c1b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e86a8d88.08809",\r
+        "id": "9f04b050.7c6fe8",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1988.466552734375,\r
-        "y": 6482.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6485.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "32fa6a7d.612076"\r
+                "5e0bc78d.ba716"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32fa6a7d.612076",\r
+        "id": "5e0bc78d.ba716",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2151.466552734375,\r
-        "y": 6482.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6485.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6e62ca.5284a538"\r
+                "2848a471.d7d3ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e62ca.5284a538",\r
+        "id": "2848a471.d7d3ac",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2394.466552734375,\r
-        "y": 6482.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6485.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "91368e45.2e3cd8",\r
+        "id": "14cdbd34.9d5433",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1362.466552734375,\r
-        "y": 7248.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 7251.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d5e5b35.6604c5",\r
+        "id": "23760b0c.48685c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1433.466552734375,\r
-        "y": 6177.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6180.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6ac4c475.ce37cc",\r
-                "91368e45.2e3cd8",\r
-                "5c661b6d.db566c"\r
+                "6361e7ff.46b828",\r
+                "14cdbd34.9d5433",\r
+                "468cb6c4.ffb168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42725353.b4a374",\r
+        "id": "88082c33.393",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2619.466552734375,\r
-        "y": 6266.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6269.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "aedd4240.642968"\r
+                "83017d89.d2d33"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1745f7ad.eada2",\r
+        "id": "e1f0fae1.b8f4d8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2619.95751953125,\r
-        "y": 6311.590606689453,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6314.590606689453,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "6425bc45.5cdfcc"\r
+                "ec259daf.cc4758"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ebfc9334.bdf468",\r
+        "id": "822aec8b.abd888",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2617.466552734375,\r
-        "y": 6355.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6358.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "337169e1.665c2e"\r
+                "ba3c2552.11f0b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ebf7b15b.49862",\r
+        "id": "327d9363.1aef4c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2455.282958984375,\r
-        "y": 5980.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5983.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "577c89f1.70257",\r
+        "id": "eafb76a9.ded53",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2452.7919921875,\r
-        "y": 6024.042633056641,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6027.042633056641,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1475339.a9ed04c",\r
+        "id": "e9e38848.54da1",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1531.400146484375,\r
-        "y": 6109.416473388672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6112.416473388672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "aedd4240.642968",\r
+        "id": "83017d89.d2d33",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2785.466552734375,\r
-        "y": 6256.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6259.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "20a20b24.b18d74",\r
-                "da0ac321.ebd92",\r
-                "450533a8.9c748c",\r
-                "dc80e7d7.692bf8",\r
-                "7b453ddd.4a4edc"\r
+                "c9d43f06.0d115",\r
+                "b37c19e0.f8f32",\r
+                "60da6725.d98bd8",\r
+                "be2af461.e005a",\r
+                "cbf01fd8.d058c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "337169e1.665c2e",\r
+        "id": "ba3c2552.11f0b",\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": 6354.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6357.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6425bc45.5cdfcc",\r
+        "id": "ec259daf.cc4758",\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": 6311.8763427734375,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6314.8763427734375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "20a20b24.b18d74",\r
+        "id": "c9d43f06.0d115",\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": 5974.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5977.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "da0ac321.ebd92",\r
+        "id": "b37c19e0.f8f32",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 3033.466552734375,\r
-        "y": 6091.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6094.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "ab328def.9c2568",\r
-                "1e0d49ce.54650e",\r
-                "83f96b0e.23503"\r
+                "410583dd.d8121c",\r
+                "88eb934e.2f5b08",\r
+                "a865a4a5.d4df78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "450533a8.9c748c",\r
+        "id": "60da6725.d98bd8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 3136.466552734375,\r
-        "y": 6358.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6361.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e189248a.5308d8",\r
-                "42e13b38.68927c"\r
+                "72b47bea.9a0f24",\r
+                "66f0d6b4.eb7008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc80e7d7.692bf8",\r
+        "id": "be2af461.e005a",\r
         "type": "switchNode",\r
         "name": "switch connectivity has ethernet service",\r
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3074.466552734375,\r
-        "y": 6493.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6496.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "75c39310.64e10c",\r
-                "865b2c0.812e658"\r
+                "2f67e97f.141fd6",\r
+                "7b5fd505.3b0694"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b453ddd.4a4edc",\r
+        "id": "cbf01fd8.d058c",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 3055.466552734375,\r
-        "y": 6609.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6612.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ab328def.9c2568",\r
+        "id": "410583dd.d8121c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3228.9666748046875,\r
-        "y": 6043.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6046.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "7b2173a0.a25f4c"\r
+                "4a83ae1e.07b578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e0d49ce.54650e",\r
+        "id": "88eb934e.2f5b08",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3220.9666748046875,\r
-        "y": 6098.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6101.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "3e21d08a.9cf2d8"\r
+                "282085b8.0d4512"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b2173a0.a25f4c",\r
+        "id": "4a83ae1e.07b578",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3363.348876953125,\r
-        "y": 6037.672332763672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6040.672332763672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "d783eb8.e8d4418"\r
+                "33baf8b0.f059c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83f96b0e.23503",\r
+        "id": "a865a4a5.d4df78",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3225.9666748046875,\r
-        "y": 6155.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6158.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "39d187f7.387c08"\r
+                "63323518.7bcbac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39d187f7.387c08",\r
+        "id": "63323518.7bcbac",\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": 6156.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6159.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3e21d08a.9cf2d8",\r
+        "id": "282085b8.0d4512",\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": 6099.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6102.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "865b2c0.812e658",\r
+        "id": "7b5fd505.3b0694",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3327.466552734375,\r
-        "y": 6471.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6474.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "772ac851.ed388"\r
+                "948366f4.fec95"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75c39310.64e10c",\r
+        "id": "2f67e97f.141fd6",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3327.466552734375,\r
-        "y": 6527.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6530.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d783eb8.e8d4418",\r
+        "id": "33baf8b0.f059c8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 3550.466064453125,\r
-        "y": 6039.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6042.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "22737809.d5a598"\r
+                "e2cf1880.b9d7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22737809.d5a598",\r
+        "id": "e2cf1880.b9d7c",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3791.466064453125,\r
-        "y": 6030.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6033.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "8e816736.3f1518"\r
+                "bc484497.a79ff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "772ac851.ed388",\r
+        "id": "948366f4.fec95",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 3677.466064453125,\r
-        "y": 6461.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6464.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "7e278410.d4a45c",\r
-                "5323d43d.ae4a94"\r
+                "c37cd95d.368e7",\r
+                "92455633.bf0ee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e189248a.5308d8",\r
+        "id": "72b47bea.9a0f24",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3443.966064453125,\r
-        "y": 6383.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6386.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a38fc7bd.ddbeb"\r
+                "f1048a1f.996e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42e13b38.68927c",\r
+        "id": "66f0d6b4.eb7008",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3444.966064453125,\r
-        "y": 6328.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6331.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "ca98e797.f9c13"\r
+                "314550b5.0a064"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a38fc7bd.ddbeb",\r
+        "id": "f1048a1f.996e4",\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": 6381.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6384.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ca98e797.f9c13",\r
+        "id": "314550b5.0a064",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3612.466064453125,\r
-        "y": 6330.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6333.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "63dcc10.1e934c",\r
+        "id": "926cd0b8.871b1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4148.4658203125,\r
-        "y": 5979.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5982.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "cb51edb2.a6957",\r
-                "7da0f639.3db538",\r
-                "dfe02514.308cd"\r
+                "e5e99dd1.35ed8",\r
+                "977d12a.f8bd9f",\r
+                "b449b2c0.535c38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e816736.3f1518",\r
+        "id": "bc484497.a79ff8",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3997.466064453125,\r
-        "y": 6027.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6030.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "63dcc10.1e934c"\r
+                "926cd0b8.871b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e278410.d4a45c",\r
+        "id": "c37cd95d.368e7",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4009.966064453125,\r
-        "y": 6435.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6438.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "21b3d920.ac879e"\r
+                "b162e50d.7cae58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5323d43d.ae4a94",\r
+        "id": "92455633.bf0ee8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4013.966064453125,\r
-        "y": 6475.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6478.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "da782471.0e218"\r
+                "2199ad10.a55eda"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da782471.0e218",\r
+        "id": "2199ad10.a55eda",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4201.466064453125,\r
-        "y": 6479.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6482.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "21b3d920.ac879e",\r
+        "id": "b162e50d.7cae58",\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": 6439.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6442.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7da0f639.3db538",\r
+        "id": "977d12a.f8bd9f",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 4354.4658203125,\r
-        "y": 5992.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5995.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2a4fa91b.b928a6",\r
-                "3708f6c9.39ed2a",\r
-                "7ad7cb3f.866b74"\r
+                "7f661594.98b80c",\r
+                "b4244919.5b3fa8",\r
+                "fd8c4c61.cc25e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb51edb2.a6957",\r
+        "id": "e5e99dd1.35ed8",\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": 5940.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5943.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a4fa91b.b928a6",\r
+        "id": "7f661594.98b80c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4564.4658203125,\r
-        "y": 5983.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5986.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "bee63261.4dfe28"\r
+                "b64e3b3c.b2614"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3708f6c9.39ed2a",\r
+        "id": "b4244919.5b3fa8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4556.4658203125,\r
-        "y": 6038.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6041.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "9ceb2b97.8189"\r
+                "13dd75f8.aa1f6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ad7cb3f.866b74",\r
+        "id": "fd8c4c61.cc25e8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4561.4658203125,\r
-        "y": 6095.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6098.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "84d1d52.6203b28"\r
+                "67c0a219.8d5f1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dfe02514.308cd",\r
+        "id": "b449b2c0.535c38",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4304.4658203125,\r
-        "y": 6056.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6059.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "84d1d52.6203b28",\r
+        "id": "67c0a219.8d5f1c",\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": 6096.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6099.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9ceb2b97.8189",\r
+        "id": "13dd75f8.aa1f6a",\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": 6041.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6044.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bee63261.4dfe28",\r
+        "id": "b64e3b3c.b2614",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4708.84814453125,\r
-        "y": 5980.6722412109375,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5983.6722412109375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "595ecbb0.cd7dfc"\r
+                "a6322085.6bb328"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "595ecbb0.cd7dfc",\r
+        "id": "a6322085.6bb328",\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": 5977.016571044922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5980.016571044922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e8d2c16f.36acb",\r
+        "id": "90358f7a.3bc868",\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": 6774.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6777.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "656fa541.af35f4",\r
+        "id": "a442da27.96a27",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1685.2332763671875,\r
-        "y": 6891.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6894.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "35de354f.e14d62",\r
-                "aedf728e.4bd508",\r
-                "d65aa6c1.4a58e"\r
+                "5457374d.6393a8",\r
+                "c43cf1bd.3a9c48",\r
+                "aafe4c92.ab6148"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "35de354f.e14d62",\r
+        "id": "5457374d.6393a8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1880.7333984375,\r
-        "y": 6843.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6846.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5345535d.1f34d4"\r
+                "53717e38.4ed96"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aedf728e.4bd508",\r
+        "id": "c43cf1bd.3a9c48",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1872.7333984375,\r
-        "y": 6898.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6901.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "20bec1fa.80674e"\r
+                "f440d45f.e2c3b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5345535d.1f34d4",\r
+        "id": "53717e38.4ed96",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2015.1156005859375,\r
-        "y": 6838.272430419922,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6841.272430419922,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "eb473582.da829"\r
+                "237db843.e1a28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d65aa6c1.4a58e",\r
+        "id": "aafe4c92.ab6148",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1877.7333984375,\r
-        "y": 6955.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6958.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "15a64cb6.b20343"\r
+                "f21c5384.45f0a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15a64cb6.b20343",\r
+        "id": "f21c5384.45f0a8",\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": 6956.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6959.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "20bec1fa.80674e",\r
+        "id": "f440d45f.e2c3b",\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": 6899.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6902.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb473582.da829",\r
+        "id": "237db843.e1a28",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2202.2327880859375,\r
-        "y": 6839.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6842.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "b73dec8d.f89198"\r
+                "df53e846.0627d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b73dec8d.f89198",\r
+        "id": "df53e846.0627d8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2443.2327880859375,\r
-        "y": 6830.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6833.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "1ceb2f26.68ec79"\r
+                "1dea4397.4ddefc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e7e1d35.45d4c8",\r
+        "id": "ddd8f461.6b9a28",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2800.2325439453125,\r
-        "y": 6779.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6782.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a1ade3fe.d4148",\r
-                "2a08582e.e9a11",\r
-                "a2d9c162.524c1"\r
+                "da1d6ae3.19a4a",\r
+                "f17b263b.0b92b8",\r
+                "e6be1026.0fc218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1ceb2f26.68ec79",\r
+        "id": "1dea4397.4ddefc",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2649.2327880859375,\r
-        "y": 6827.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6830.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "8e7e1d35.45d4c8"\r
+                "ddd8f461.6b9a28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a08582e.e9a11",\r
+        "id": "f17b263b.0b92b8",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 3006.2325439453125,\r
-        "y": 6792.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6795.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "cc4e4323.ff0c8",\r
-                "37454266.958e06",\r
-                "fc54918e.b07f78"\r
+                "93d3ae4.c48255",\r
+                "a8b7b61a.880ff",\r
+                "1b334b23.690f3d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2d9c162.524c1",\r
+        "id": "e6be1026.0fc218",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 2956.2325439453125,\r
-        "y": 6856.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6859.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a1ade3fe.d4148",\r
+        "id": "da1d6ae3.19a4a",\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": 6740.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6743.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cc4e4323.ff0c8",\r
+        "id": "93d3ae4.c48255",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3216.2325439453125,\r
-        "y": 6783.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6786.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e3f7ab37.cd3338"\r
+                "38012aaa.4db4be"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37454266.958e06",\r
+        "id": "a8b7b61a.880ff",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3208.2325439453125,\r
-        "y": 6838.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6841.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "c423f303.cf0fc"\r
+                "3b0a565e.7b9b52"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc54918e.b07f78",\r
+        "id": "1b334b23.690f3d",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3213.2325439453125,\r
-        "y": 6895.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6898.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "f7cc4fee.3d03d8"\r
+                "a42eaf3a.6fbc5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7cc4fee.3d03d8",\r
+        "id": "a42eaf3a.6fbc5",\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": 6896.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6899.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c423f303.cf0fc",\r
+        "id": "3b0a565e.7b9b52",\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": 6841.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6844.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e3f7ab37.cd3338",\r
+        "id": "38012aaa.4db4be",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3360.6148681640625,\r
-        "y": 6781.2723388671875,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6784.2723388671875,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a32f770f.0bf93"\r
+                "2c7d526d.80fc76"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a32f770f.0bf93",\r
+        "id": "2c7d526d.80fc76",\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": 6777.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6780.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5c661b6d.db566c",\r
+        "id": "468cb6c4.ffb168",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 1451.2332763671875,\r
-        "y": 6902.616668701172,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6905.616668701172,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "e8d2c16f.36acb",\r
-                "656fa541.af35f4",\r
-                "f25051a6.fa4e28"\r
+                "90358f7a.3bc868",\r
+                "a442da27.96a27",\r
+                "12fc611d.1c5a0f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f25051a6.fa4e28",\r
+        "id": "12fc611d.1c5a0f",\r
         "type": "switchNode",\r
         "name": "switch connectivity has ethernet service",\r
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1733.433349609375,\r
-        "y": 7043.816864013672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 7046.816864013672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "81385ecf.138098",\r
-                "de989c54.09997"\r
+                "fd3fa457.558cb8",\r
+                "5e9ee12a.d5b628"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de989c54.09997",\r
+        "id": "5e9ee12a.d5b628",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1986.433349609375,\r
-        "y": 7021.816864013672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 7024.816864013672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "78a6b529.99c6a4"\r
+                "c43e864.6fdea78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81385ecf.138098",\r
+        "id": "fd3fa457.558cb8",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1986.433349609375,\r
-        "y": 7077.816864013672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 7080.816864013672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "78a6b529.99c6a4",\r
+        "id": "c43e864.6fdea78",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 2336.432861328125,\r
-        "y": 7011.816864013672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 7014.816864013672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a19873b6.a4d6e",\r
-                "94634cdd.23be6"\r
+                "d8cf4668.e6bf58",\r
+                "fc9a7200.07e08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a19873b6.a4d6e",\r
+        "id": "d8cf4668.e6bf58",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2668.932861328125,\r
-        "y": 6985.816864013672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6988.816864013672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2dad16ef.224d22"\r
+                "fa6e7b78.6ccd98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94634cdd.23be6",\r
+        "id": "fc9a7200.07e08",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2672.932861328125,\r
-        "y": 7025.816864013672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 7028.816864013672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "4ffd9da0.18218c"\r
+                "f96cab06.f1bd18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ffd9da0.18218c",\r
+        "id": "f96cab06.f1bd18",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2860.432861328125,\r
-        "y": 7029.816864013672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 7032.816864013672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2dad16ef.224d22",\r
+        "id": "fa6e7b78.6ccd98",\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": 6989.816864013672,\r
-        "z": "d1eceead.adafe",\r
+        "y": 6992.816864013672,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8d45971b.519e08",\r
+        "id": "6504876a.65a0e",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 1089.25,\r
-        "y": 4729.39990234375,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4732.39990234375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "5dcba2e4.9fe114",\r
-                "1fae83d7.8f54e4"\r
+                "2f2c7d69.04a202",\r
+                "749e3757.254fd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5dcba2e4.9fe114",\r
+        "id": "2f2c7d69.04a202",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1517.749755859375,\r
-        "y": 4717.39990234375,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4720.39990234375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "504ce75b.b6442"\r
+                "e83630dc.e1ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1fae83d7.8f54e4",\r
+        "id": "749e3757.254fd8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1521.749755859375,\r
-        "y": 4757.39990234375,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4760.39990234375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2463a8bc.d76748"\r
+                "28010736.1a772"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "504ce75b.b6442",\r
+        "id": "e83630dc.e1ba",\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": 4717.39990234375,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4720.39990234375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2463a8bc.d76748",\r
+        "id": "28010736.1a772",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1679.249755859375,\r
-        "y": 4757.39990234375,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4760.39990234375,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b2c9765c.25999",\r
+        "id": "2f2661a7.5dc1e6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5113,\r
-        "y": 5050,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5053,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "86e944dc.0c4178",\r
-                "5fccecfa.290f3c",\r
-                "76c53fa0.8ab25"\r
+                "ae15e960.f1e88",\r
+                "28b0c0f7.1a36d8",\r
+                "8a83aff9.8ddf38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76c53fa0.8ab25",\r
+        "id": "8a83aff9.8ddf38",\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": 4995,\r
-        "z": "d1eceead.adafe",\r
+        "y": 4998,\r
+        "z": "8bd89607.6248d8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "86e944dc.0c4178",\r
+        "id": "ae15e960.f1e88",\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
         "comments": "",\r
         "outputs": 1,\r
         "x": 5494,\r
-        "y": 5047,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5050,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5fccecfa.290f3c",\r
+        "id": "28b0c0f7.1a36d8",\r
         "type": "switchNode",\r
         "name": "switch $foundVpnName",\r
         "xml": "<switch test=\"`$foundVpnName`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5339,\r
-        "y": 5102,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5105,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "2a17f2a1.8a9c0e"\r
+                "48fdd2f1.2b095c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a17f2a1.8a9c0e",\r
+        "id": "48fdd2f1.2b095c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5518,\r
-        "y": 5101,\r
-        "z": "d1eceead.adafe",\r
+        "y": 5104,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "a26e073.3ca98f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e3b4a4d3.b60598",\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": 459,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "22dcd918.a9e88e",\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": 709,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1743864d.d3d2f2",\r
+        "type": "switchNode",\r
+        "name": "switch secondary empty?",\r
+        "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3347.666473388672,\r
+        "y": 751.2499694824219,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "a9f40bfb.e2369",\r
+                "3b2a9389.6292cc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a9f40bfb.e2369",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3586.6663513183594,\r
+        "y": 587.25,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "143a1a38.4be736"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3b2a9389.6292cc",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3595.6663513183594,\r
+        "y": 634.25,\r
+        "z": "8bd89607.6248d8",\r
         "wires": [\r
             [\r
-                "a5ecb13c.9c7548"\r
+                "90836078.d811b"\r
             ]\r
         ]\r
+    },\r
+    {\r
+        "id": "90836078.d811b",\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": 628.25,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "143a1a38.4be736",\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": 584.25,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c2039341.ed7fe",\r
+        "type": "outcome",\r
+        "name": "SECONDARY-ROOT",\r
+        "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4175.700408935547,\r
+        "y": 537.699951171875,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "8f42381e.256918"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8f42381e.256918",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4349.700408935547,\r
+        "y": 532.699951171875,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "2dfbe8eb.6df208",\r
+                "ae5efca5.b13ee"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2dfbe8eb.6df208",\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": 524.699951171875,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ae5efca5.b13ee",\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": 564.699951171875,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "49cd1e6.2c21e6",\r
+        "type": "outcome",\r
+        "name": "SECONDARY-ROOT",\r
+        "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4144.700408935547,\r
+        "y": 767.0999755859375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "37d7c141.43238e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "37d7c141.43238e",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4302.700164794922,\r
+        "y": 810.0997924804688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "3e1881a7.808dae",\r
+                "e3ee5030.818c18"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3e1881a7.808dae",\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": 796.0999145507812,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e3ee5030.818c18",\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": 836.0999145507812,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "898efbe9.b7aab8",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3356.133270263672,\r
+        "y": 1003.333251953125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "648675ef.25d1f4",\r
+                "2e60c86e.fc1c08",\r
+                "80896ca0.c29cc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "648675ef.25d1f4",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3596.133270263672,\r
+        "y": 986.333251953125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "2e60c86e.fc1c08",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3591.642333984375,\r
+        "y": 1028.7593078613281,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "80896ca0.c29cc8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3595.642303466797,\r
+        "y": 1076.75927734375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "1a4bd447.a95bf4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1a4bd447.a95bf4",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3751.133270263672,\r
+        "y": 1046.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "caee9e1d.8e2348"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "caee9e1d.8e2348",\r
+        "type": "switchNode",\r
+        "name": "switch nr type",\r
+        "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3873.133270263672,\r
+        "y": 993.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "63dc4834.c55f2",\r
+                "861e97a1.4a94",\r
+                "50fdf697.5f0398"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "63dc4834.c55f2",\r
+        "type": "outcome",\r
+        "name": "ROOT",\r
+        "xml": "<outcome value='ROOT'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4109.133270263672,\r
+        "y": 843.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "15fc5ae7.def135"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "861e97a1.4a94",\r
+        "type": "outcome",\r
+        "name": "LEAF",\r
+        "xml": "<outcome value='LEAF'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4105.133270263672,\r
+        "y": 899.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "de3f550a.e65dd8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "15fc5ae7.def135",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4235.133270263672,\r
+        "y": 851.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "a2d4f205.05df18",\r
+                "97e552b.298d73"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "de3f550a.e65dd8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4238.133270263672,\r
+        "y": 904.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "77158a83.3502bc",\r
+                "fb7ab28b.9d9ce8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "50fdf697.5f0398",\r
+        "type": "outcome",\r
+        "name": "SECONDARY-ROOT",\r
+        "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4098.133270263672,\r
+        "y": 977.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "4a03238e.72a4b4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4a03238e.72a4b4",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4254.133270263672,\r
+        "y": 998.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "8f9b7ac9.e6c508",\r
+                "4399bcd6.51e06c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a2d4f205.05df18",\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": 881.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "97e552b.298d73",\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": 923.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "77158a83.3502bc",\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": 975.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fb7ab28b.9d9ce8",\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": 1015.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4399bcd6.51e06c",\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": 1109.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8f9b7ac9.e6c508",\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": 1065.3331909179688,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ac53fadb.549658",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3700.13330078125,\r
+        "y": 2249,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "a75c6a9f.cbf01",\r
+                "92c4a208.e0cb28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c76e7c83.8acf1",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3527.466796875,\r
+        "y": 2250,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "ac53fadb.549658"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ac317b44.b3b988",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3536.957763671875,\r
+        "y": 2292.5740356445312,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a866b4cc.e0caa",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3525.466796875,\r
+        "y": 2339,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a75c6a9f.cbf01",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3990.466796875,\r
+        "y": 2265,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "af57ae08.dd681",\r
+                "e5cbeb5f.6e9468"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e5cbeb5f.6e9468",\r
+        "type": "failure",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4213.466796875,\r
+        "y": 2220,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "5a256296.5bc59c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "af57ae08.dd681",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4215.466796875,\r
+        "y": 2284,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "c3ad5792.8dfac"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f7bdbced.e4e6e",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3321.466796875,\r
+        "y": 2271,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "c76e7c83.8acf1",\r
+                "ac317b44.b3b988",\r
+                "a866b4cc.e0caa"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4d6bf9fc.2af3d8",\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": 2229,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3ddfa25a.4bc3f6",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3341.466796875,\r
+        "y": 2119,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "1f8f213c.23a987",\r
+                "723c86fe.b2129"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "723c86fe.b2129",\r
+        "type": "failure",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3564.466796875,\r
+        "y": 2105,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "2b76ade7.37f3aa"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1f8f213c.23a987",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3566.466796875,\r
+        "y": 2138,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "2b76ade7.37f3aa",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3712.466796875,\r
+        "y": 2098,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "a96a9fab.149bd",\r
+                "6bae074d.4cc69"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a96a9fab.149bd",\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": 2035,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "92c4a208.e0cb28",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3971.466796875,\r
+        "y": 2396,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "fb667e00.cdee38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fb667e00.cdee38",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4177.466796875,\r
+        "y": 2396,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "7f231a25.219aec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6bae074d.4cc69",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3926.4666748046875,\r
+        "y": 2103,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "6f9fafbd.595338",\r
+                "5fece99f.57a078",\r
+                "53c7941c.fd6f84"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6f9fafbd.595338",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4121.966796875,\r
+        "y": 2055,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "1ef2a52f.ce58c3"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5fece99f.57a078",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4113.966796875,\r
+        "y": 2110,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "d353a27e.170a88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "53c7941c.fd6f84",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4118.966796875,\r
+        "y": 2167,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "815f83cf.c9ecf"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "815f83cf.c9ecf",\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": 2168,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1ef2a52f.ce58c3",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4266.34912109375,\r
+        "y": 2052.6556701660156,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "df579443.2dfaa"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b2f7d29a.c36bc8",\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": 2364,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "29a75985.a4b2ae",\r
+        "type": "comment",\r
+        "name": "NOT NEEDED ANYMORE?",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 4001.133270263672,\r
+        "y": 2339.9998474121094,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c3ad5792.8dfac",\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": 2303,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5a256296.5bc59c",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4378.466796875,\r
+        "y": 2217,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "a0a57c60.9feaa",\r
+                "8f9217bc.ce51e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7f231a25.219aec",\r
+        "type": "outcome",\r
+        "name": "tunnel-termination-point",\r
+        "xml": "<outcome value='tunnel-termination-point'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4394.75244140625,\r
+        "y": 2394.82177734375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "f1964530.52cb1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d353a27e.170a88",\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": 2113,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a0a57c60.9feaa",\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": 2178,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8f9217bc.ce51e",\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": 2283,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1ea5e7d3.f23f9",\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": 2232,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f1964530.52cb1",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4601.583984375,\r
+        "y": 2384.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "cbbeb825.19f92",\r
+                "b0c2600a.46c7c",\r
+                "511030eb.63bcc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cbbeb825.19f92",\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": 2346.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b0c2600a.46c7c",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4813.583984375,\r
+        "y": 2385.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "ce425175.45de18"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "511030eb.63bcc8",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 4769.083984375,\r
+        "y": 2427.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b757d82d.12f65",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4850.466796875,\r
+        "y": 2137.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "8ab896d8.87229"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "df579443.2dfaa",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4450.4666748046875,\r
+        "y": 2067,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "51046da7.24d494"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "51046da7.24d494",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4647.466796875,\r
+        "y": 2133.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "b757d82d.12f65",\r
+                "4ad69efc.b2bd68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4ad69efc.b2bd68",\r
+        "type": "outcome",\r
+        "name": "network-resource",\r
+        "xml": "<outcome value='network-resource'>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4852.466796875,\r
+        "y": 2210.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "a0ad2556.3951b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ce425175.45de18",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4994.083984375,\r
+        "y": 2384.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "822b3c7.3a67ac"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "822b3c7.3a67ac",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5152.083984375,\r
+        "y": 2384.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "71be1479.f150cc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "71be1479.f150cc",\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": 2384.3404541015625,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8ab896d8.87229",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5027.466796875,\r
+        "y": 2129.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "d7fa69fb.085438",\r
+                "ce745876.37fbb"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ce745876.37fbb",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5235.466796875,\r
+        "y": 2136.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "10a5091f.ce791f",\r
+                "70c5216d.20762",\r
+                "eee03948.c8ee08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a0ad2556.3951b8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5029.466796875,\r
+        "y": 2202.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "dba8eb8b.b7ea7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d7fa69fb.085438",\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": 2084.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "dba8eb8b.b7ea7",\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": 2326.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "10a5091f.ce791f",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5445.466796875,\r
+        "y": 2127.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "d091f788.e8c778"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "70c5216d.20762",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5437.466796875,\r
+        "y": 2182.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "52797bd8.2181a4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "eee03948.c8ee08",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5442.466796875,\r
+        "y": 2239.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "a5f87747.8903"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a5f87747.8903",\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": 2240.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "52797bd8.2181a4",\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": 2185.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d091f788.e8c778",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5589.84912109375,\r
+        "y": 2124.655792236328,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "4f5aa4ec.a9ba44"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4f5aa4ec.a9ba44",\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": 2121.0001220703125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b98aea07.4499",\r
+        "type": "switchNode",\r
+        "name": "switch $hasSecondary",\r
+        "xml": "<switch test='`$hasSecondary`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3836.13330078125,\r
+        "y": 2733,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "7d724c43.dd872c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7d724c43.dd872c",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4027.13330078125,\r
+        "y": 2737,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "c26943ed.871ed8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c26943ed.871ed8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4154.13330078125,\r
+        "y": 2736,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "a43135d6.d32b28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a43135d6.d32b28",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4380.467041015625,\r
+        "y": 2729.3336181640625,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "a8ebbe95.3f6e4",\r
+                "38e80218.b5d4ce",\r
+                "b6cd2169.c74bc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a8ebbe95.3f6e4",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4747.466796875,\r
+        "y": 2623.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "e22da322.d0127"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "38e80218.b5d4ce",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4742.975830078125,\r
+        "y": 2667.7594604492188,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "cc355488.cae9f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b6cd2169.c74bc8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4738.975830078125,\r
+        "y": 2717.759521484375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "78c42cb1.03bbb4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "61178516.955b94",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5186.976318359375,\r
+        "y": 2712.7596435546875,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e22da322.d0127",\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": 2622.6192016601562,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cc355488.cae9f",\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": 2667.7594604492188,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "78c42cb1.03bbb4",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4907.975830078125,\r
+        "y": 2717.759521484375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "67900f7a.aee708",\r
+                "61178516.955b94"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "67900f7a.aee708",\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": 2659.759521484375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "28b93260.26eace",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4624.467041015625,\r
+        "y": 3573.333251953125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "462ac15.49ec0c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "462ac15.49ec0c",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4914.467041015625,\r
+        "y": 3575.333251953125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "db4c40a7.875698"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "abf74f44.8bd74",\r
+        "type": "switchNode",\r
+        "name": "switch $hasSecondary",\r
+        "xml": "<switch test='`$hasSecondary`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4277,\r
+        "y": 5803.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "b3e521a4.a97f4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b3e521a4.a97f4",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4468,\r
+        "y": 5807.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "aa154017.d63388"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "aa154017.d63388",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4595,\r
+        "y": 5806.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "ea396a9e.94917"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ea396a9e.94917",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4820.3330078125,\r
+        "y": 5808.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "4aa7a407.8eccb4",\r
+                "90951777.87e61"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4aa7a407.8eccb4",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5030.3330078125,\r
+        "y": 5785.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "6131b803.ead228"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "90951777.87e61",\r
+        "type": "outcomeTrue",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5035.3330078125,\r
+        "y": 5834.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "9203f8f4.976da"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6131b803.ead228",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5156.3330078125,\r
+        "y": 5785.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "9203f8f4.976da",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5153.3330078125,\r
+        "y": 5841.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "252aad6f.949002",\r
+                "2be015ab.396d82"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "252aad6f.949002",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5467.3330078125,\r
+        "y": 5900.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "1524ee99.1e1cd1",\r
+        "type": "comment",\r
+        "name": "Update connectivity status to modified",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 5399.550048828125,\r
+        "y": 5852.13330078125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2be015ab.396d82",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5598,\r
+        "y": 5810.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d39caf18.6babe",\r
+        "type": "switchNode",\r
+        "name": "switch $hasSecondary",\r
+        "xml": "<switch test='`$hasSecondary`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 868,\r
+        "y": 5000.3330078125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "bb5f541b.ab1a88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bb5f541b.ab1a88",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1059,\r
+        "y": 5004.3330078125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "d475fb98.0c79f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d475fb98.0c79f",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1186,\r
+        "y": 5003.3330078125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "4975d2d3.1f477c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4975d2d3.1f477c",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1411.3330078125,\r
+        "y": 5005.3330078125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "78d676eb.347948",\r
+                "b9cebfbe.3a16d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "78d676eb.347948",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1621.3330078125,\r
+        "y": 4982.3330078125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "be0beff9.053b6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b9cebfbe.3a16d8",\r
+        "type": "outcomeTrue",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1626.3330078125,\r
+        "y": 5031.3330078125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "1ec18968.883e37"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "be0beff9.053b6",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1747.3330078125,\r
+        "y": 4982.3330078125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "1ec18968.883e37",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1744.3330078125,\r
+        "y": 5038.3330078125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "3f1c1ffb.4cacd8",\r
+                "643240ac.3a15a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "643240ac.3a15a",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2189,\r
+        "y": 5007.3330078125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "16675ac.2ba7ba5",\r
+        "type": "comment",\r
+        "name": "Update connectivity status to modified",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1990.550048828125,\r
+        "y": 5049.1328125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3f1c1ffb.4cacd8",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2058.3330078125,\r
+        "y": 5097.3330078125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "68e0d31a.2e51f4",\r
+        "type": "switchNode",\r
+        "name": "switch $hasSecondary",\r
+        "xml": "<switch test='`$hasSecondary`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1470.3333740234375,\r
+        "y": 5841.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "2c8509f2.c5786e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2c8509f2.c5786e",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1661.3333740234375,\r
+        "y": 5845.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "30f6f14a.076056"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "30f6f14a.076056",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1788.3333740234375,\r
+        "y": 5844.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "b9a2493.fce2438"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b9a2493.fce2438",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2013.6663818359375,\r
+        "y": 5846.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "7c5427a0.bfcb2",\r
+                "2b71ce9a.05df6a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7c5427a0.bfcb2",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2223.6663818359375,\r
+        "y": 5823.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "7c8ca33d.b99804"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2b71ce9a.05df6a",\r
+        "type": "outcomeTrue",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2228.6663818359375,\r
+        "y": 5872.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "af2e72.47de599"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7c8ca33d.b99804",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2349.6663818359375,\r
+        "y": 5823.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "af2e72.47de599",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2346.6663818359375,\r
+        "y": 5879.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            [\r
+                "2f308234.b92f6e",\r
+                "e716a684.8ec94"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e716a684.8ec94",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2791.3333740234375,\r
+        "y": 5848.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "1f18634c.d886cd",\r
+        "type": "comment",\r
+        "name": "Update connectivity status to modified",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 2592.8834228515625,\r
+        "y": 5890.13330078125,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2f308234.b92f6e",\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
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2660.6663818359375,\r
+        "y": 5938.33349609375,\r
+        "z": "8bd89607.6248d8",\r
+        "wires": [\r
+            []\r
+        ]\r
     }\r
 ]
\ No newline at end of file