Temporarily removing the 'unsubscribe' operation from CLL deletion call flow.

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / cloud_leased_line / GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json

index fb09dbd..21b2270 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
@@ -1,20 +1,20 @@
  [\r
      {\r
-        "id": "d1a7bbc1.540ca8",\r
+        "id": "c958c928.fc7fe",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 171.88333129882812,\r
-        "y": 131.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 157.88330078125,\r
+        "y": 156.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6b49e250.7dcf1c"\r
+                "8b28c589.12d4a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b49e250.7dcf1c",\r
+        "id": "8b28c589.12d4a8",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -23,221 +23,221 @@
          "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
          "outputs": 1,\r
          "x": 456.1690216064453,\r
-        "y": 193.12143993377686,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 212.52387523651123,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "7d29f447.50c89c"\r
+                "39af1a7f.521d1e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7d29f447.50c89c",\r
+        "id": "39af1a7f.521d1e",\r
          "type": "method",\r
          "name": "method cll-vnf-topology-operation-cll-delete",\r
          "xml": "<method rpc='cll-vnf-topology-operation-cll-delete' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 462.3119354248047,\r
-        "y": 277.88336181640625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 297.2857971191406,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "eaada3e3.80126"\r
+                "7656a28c.ac0ab4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eaada3e3.80126",\r
+        "id": "7656a28c.ac0ab4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 811.8833312988281,\r
-        "y": 336.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 356.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "48b97bf1.34ba04",\r
-                "4cae2f6c.f9579",\r
-                "47d3b263.d1c534"\r
+                "fdfa5720.e8c418",\r
+                "3ac5985c.f18eb8",\r
+                "9905a45e.0c7298"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "48b97bf1.34ba04",\r
+        "id": "fdfa5720.e8c418",\r
          "type": "returnSuccess",\r
          "name": "return success",\r
          "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
          "comments": "",\r
          "x": 1113.2168273925781,\r
-        "y": 607.8136291503906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 627.216064453125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4cae2f6c.f9579",\r
+        "id": "3ac5985c.f18eb8",\r
          "type": "save",\r
          "name": "get service-instance from aai",\r
          "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1134.6452941894531,\r
-        "y": 310.2166442871094,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 329.61907958984375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "eecf5ed7.260848",\r
-                "c7a2a22f.bd7b1",\r
-                "44494afd.f0c474"\r
+                "af28127c.d820d8",\r
+                "63469daf.849ae4",\r
+                "71a31314.344984"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eecf5ed7.260848",\r
+        "id": "af28127c.d820d8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1359.6452941894531,\r
-        "y": 168.21664428710938,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 187.61907958984375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "cddb4078.0dee18"\r
+                "a801d61e.c75b88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7a2a22f.bd7b1",\r
+        "id": "63469daf.849ae4",\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": 237.79067993164062,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 257.193115234375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "7789aaf8.1fe7d4"\r
+                "3d43dcc5.27db6c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "44494afd.f0c474",\r
+        "id": "71a31314.344984",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1343.6452941894531,\r
-        "y": 284.2166442871094,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 303.61907958984375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "64127148.01c618"\r
+                "858124ec.81d0f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1679e3cd.763d6c",\r
+        "id": "d6a6cf8b.cb8788",\r
          "type": "comment",\r
          "name": "new for TransportSlicing",\r
          "info": "",\r
          "comments": "",\r
          "x": 1113.6452941894531,\r
-        "y": 198.21664428710938,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 217.61907958984375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "47d3b263.d1c534",\r
+        "id": "9905a45e.0c7298",\r
          "type": "execute",\r
          "name": "execute properties",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1101.6452941894531,\r
-        "y": 250.21664428710938,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 269.61907958984375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "cddb4078.0dee18",\r
+        "id": "a801d61e.c75b88",\r
          "type": "switchNode",\r
          "name": "switch allotted-resources_length != 0",\r
          "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1599.8833312988281,\r
-        "y": 164.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 184.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6a54ba66.1cde8c",\r
-                "7bb2b732.d43ff8"\r
+                "e0f3a386.0fe6",\r
+                "301731c1.c04b8e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7789aaf8.1fe7d4",\r
+        "id": "3d43dcc5.27db6c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
          "x": 1509.9457092285156,\r
-        "y": 240.74310302734375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 260.1455383300781,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "64127148.01c618",\r
+        "id": "858124ec.81d0f8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
          "x": 1513.8833312988281,\r
-        "y": 284.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 304.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6a54ba66.1cde8c",\r
+        "id": "e0f3a386.0fe6",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1804.8833312988281,\r
-        "y": 201.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 221.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d1e88455.43ef2"\r
+                "128d7cd4.e28ffb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7bb2b732.d43ff8",\r
+        "id": "301731c1.c04b8e",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1814.8833312988281,\r
-        "y": 128.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 148.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d1e88455.43ef2",\r
+        "id": "128d7cd4.e28ffb",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -245,751 +245,751 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 1797.8833312988281,\r
-        "y": 276.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 296.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "8390a16b.5a156",\r
-                "341b8f1.ea5ec7",\r
-                "1d2c9241.740b2e",\r
-                "4208fd35.4a6c74",\r
-                "e351db25.84cdc8"\r
+                "1f66e7ef.b5efe",\r
+                "b392bf29.b70228",\r
+                "49e6917b.6d0138",\r
+                "391971a2.696836",\r
+                "7226ce6d.bf87d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2db9f3bd.0d65e4",\r
+        "id": "c1485ca8.2ec768",\r
          "type": "save",\r
          "name": "get allotted-resource from aai",\r
          "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2283.883331298828,\r
-        "y": 327.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 347.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "11f248b6.2b0fe7",\r
-                "fd3681a1.487b1",\r
-                "9338a88f.aebeb"\r
+                "42d08205.101f24",\r
+                "280ca852.5c8478",\r
+                "9260e446.97cb2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "11f248b6.2b0fe7",\r
+        "id": "42d08205.101f24",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2499.883331298828,\r
-        "y": 394.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 414.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "7fe5ebf8.de6a64"\r
+                "1cda58ca.c0ca0f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd3681a1.487b1",\r
+        "id": "280ca852.5c8478",\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": 294.4573059082031,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 313.8597412109375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6e8f233d.c6dbd4"\r
+                "37d08b63.267f54"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9338a88f.aebeb",\r
+        "id": "9260e446.97cb2",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2495.883331298828,\r
-        "y": 343.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 363.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "8a3025a0.71b76"\r
+                "3db04a4.fcc1db6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8390a16b.5a156",\r
+        "id": "1f66e7ef.b5efe",\r
          "type": "for",\r
          "name": "for each allotted-resource",\r
          "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2000.8833312988281,\r
-        "y": 308.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 328.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "7858ac8a.d0ed24",\r
-                "2db9f3bd.0d65e4",\r
-                "98563074.1e7ea",\r
-                "c475408d.68ef"\r
+                "ae5848cb.e1b328",\r
+                "c1485ca8.2ec768",\r
+                "c9139602.db9618",\r
+                "aadbe6b3.d2bba"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7858ac8a.d0ed24",\r
+        "id": "ae5848cb.e1b328",\r
          "type": "set",\r
          "name": "set the current allotted-resource-id",\r
          "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",\r
          "comments": "",\r
          "x": 2280.883331298828,\r
-        "y": 246.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 266.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4208fd35.4a6c74",\r
+        "id": "391971a2.696836",\r
          "type": "set",\r
          "name": "set tmp.arr",\r
          "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",\r
          "comments": "",\r
          "x": 1974.8833312988281,\r
-        "y": 258.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 278.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "341b8f1.ea5ec7",\r
+        "id": "b392bf29.b70228",\r
          "type": "get-resource",\r
          "name": "get-resource pnfs-list",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2017.8833312988281,\r
-        "y": 117.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 137.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1d2c9241.740b2e",\r
+        "id": "49e6917b.6d0138",\r
          "type": "get-resource",\r
          "name": "get-resource logical-links",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2029.8833312988281,\r
-        "y": 158.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 178.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a3743fb5.49e31",\r
+        "id": "33859df.81a8362",\r
          "type": "comment",\r
          "name": "The following two nodes are for PCE",\r
          "info": "",\r
          "comments": "",\r
          "x": 2054.883331298828,\r
-        "y": 70.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 90.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a5956784.1c6ce8",\r
+        "id": "16362fdd.257198",\r
          "type": "set",\r
          "name": "set tmp.arr",\r
          "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",\r
          "comments": "",\r
          "x": 1974.8833312988281,\r
-        "y": 204.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 224.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6e8f233d.c6dbd4",\r
+        "id": "37d08b63.267f54",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
          "x": 2678.883331298828,\r
-        "y": 296.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 316.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8a3025a0.71b76",\r
+        "id": "3db04a4.fcc1db6",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
          "x": 2678.820831298828,\r
-        "y": 346.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 365.426025390625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7fe5ebf8.de6a64",\r
+        "id": "1cda58ca.c0ca0f",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 2680.820831298828,\r
-        "y": 397.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 416.426025390625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "27474730.1479c8"\r
+                "8ac18ed0.a417b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "27474730.1479c8",\r
+        "id": "8ac18ed0.a417b8",\r
          "type": "save",\r
          "name": "get allotted-resource relationship from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2973.820831298828,\r
-        "y": 344.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 363.426025390625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "bdd221b3.05669",\r
-                "9c61f989.c8eaf8",\r
-                "fabffff4.e28138"\r
+                "2f801aa3.62899e",\r
+                "8d0c42c.041064",\r
+                "39093638.1e8092"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c61f989.c8eaf8",\r
+        "id": "8d0c42c.041064",\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": 236.59756469726562,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3277.311767578125,\r
+        "y": 20,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "1e4b4cbe.e5dbab"\r
+                "25cca067.117fb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1e4b4cbe.e5dbab",\r
+        "id": "25cca067.117fb8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3424.883331298828,\r
-        "y": 236.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3454.88330078125,\r
+        "y": 20.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fabffff4.e28138",\r
+        "id": "39093638.1e8092",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3242.820831298828,\r
-        "y": 286.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3272.82080078125,\r
+        "y": 69.426025390625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3e91db11.95e81c"\r
+                "45859305.7fd9ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3e91db11.95e81c",\r
+        "id": "45859305.7fd9ac",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3424.820831298828,\r
-        "y": 286.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3454.82080078125,\r
+        "y": 69.426025390625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bdd221b3.05669",\r
+        "id": "2f801aa3.62899e",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3246.820831298828,\r
-        "y": 337.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3276.82080078125,\r
+        "y": 120.426025390625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "8cb6a22.c9637e"\r
+                "6880d10c.55d838"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8cb6a22.c9637e",\r
+        "id": "6880d10c.55d838",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3426.820831298828,\r
-        "y": 337.0235900878906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3456.82080078125,\r
+        "y": 120.426025390625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6f3506c3.cf97d8"\r
+                "e9027b62.9e003"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6f3506c3.cf97d8",\r
+        "id": "e9027b62.9e003",\r
          "type": "switchNode",\r
          "name": "switch allotted-resource.relationship-list not empty",\r
          "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2992.883331298828,\r
-        "y": 471.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 491.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "5a58fe79.709e",\r
-                "5401f43b.ed03f4"\r
+                "72fd55d0.427e94",\r
+                "bb0cc7e.bea8238"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5401f43b.ed03f4",\r
+        "id": "bb0cc7e.bea8238",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3302.883331298828,\r
-        "y": 478.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3332.88330078125,\r
+        "y": 262.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5a58fe79.709e",\r
+        "id": "72fd55d0.427e94",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3301.883331298828,\r
-        "y": 532.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3331.88330078125,\r
+        "y": 316.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "126c6f21.417e99"\r
+                "32c96151.c1aa2e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24e00055.8ca808",\r
+        "id": "a8b50f84.db474",\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": 486.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4076.88330078125,\r
+        "y": 270.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "8c1020d2.e3fc88"\r
+                "9b999d2e.09c6d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c1020d2.e3fc88",\r
+        "id": "9b999d2e.09c6d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4223.883209228516,\r
-        "y": 479.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4253.8831787109375,\r
+        "y": 263.28564453125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "709d8f82.9f2e1",\r
-                "cef8768a.ac6e48"\r
+                "13e93d82.810a42",\r
+                "3997cabd.9c2abe"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "126c6f21.417e99",\r
+        "id": "32c96151.c1aa2e",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3465.883331298828,\r
-        "y": 458.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3495.88330078125,\r
+        "y": 242.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f0253be2.ef6388",\r
-                "d30875df.4619e8"\r
+                "6a03759c.b65ec4",\r
+                "2a091548.5d967a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f0253be2.ef6388",\r
+        "id": "6a03759c.b65ec4",\r
          "type": "for",\r
          "name": "for each allotted-resource relationship",\r
          "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3746.883331298828,\r
-        "y": 414.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3776.88330078125,\r
+        "y": 198.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6ce9e370.67b09c"\r
+                "6d840347.ad0de4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ce9e370.67b09c",\r
+        "id": "6d840347.ad0de4",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4008.883331298828,\r
-        "y": 414.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4038.88330078125,\r
+        "y": 198.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "24e00055.8ca808"\r
+                "a8b50f84.db474"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "709d8f82.9f2e1",\r
+        "id": "13e93d82.810a42",\r
          "type": "set",\r
          "name": "set the 1st network-policy-id",\r
          "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4466.883209228516,\r
-        "y": 436.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4496.8831787109375,\r
+        "y": 220.28564453125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cef8768a.ac6e48",\r
+        "id": "3997cabd.9c2abe",\r
          "type": "save",\r
          "name": "get network-policy from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4455.883209228516,\r
-        "y": 491.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4485.8831787109375,\r
+        "y": 275.28564453125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "442d2e35.9513b",\r
-                "6b7a340a.d73c24",\r
-                "1cf09fd1.237e88"\r
+                "1629cf91.336928",\r
+                "7e24e3bc.4dd5bc",\r
+                "e3d66604.874708"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1cf09fd1.237e88",\r
+        "id": "e3d66604.874708",\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": 377.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4738.88330078125,\r
+        "y": 161.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "830d3a39.a47178"\r
+                "9dd0299.013fdd8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "830d3a39.a47178",\r
+        "id": "9dd0299.013fdd8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4857.454864501953,\r
-        "y": 378.1690979003906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4887.454833984375,\r
+        "y": 161.571533203125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4e42818f.48a268",\r
+        "id": "1b29ba86.57c2a5",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 4856.392364501953,\r
-        "y": 422.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4886.392333984375,\r
+        "y": 205.7117919921875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6b7a340a.d73c24",\r
+        "id": "7e24e3bc.4dd5bc",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4697.392364501953,\r
-        "y": 422.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4727.392333984375,\r
+        "y": 205.7117919921875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "4e42818f.48a268"\r
+                "1b29ba86.57c2a5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "442d2e35.9513b",\r
+        "id": "1629cf91.336928",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4704.392364501953,\r
-        "y": 501.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4734.392333984375,\r
+        "y": 284.7117919921875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "dd05e839.54d638"\r
+                "b86241e1.90f6f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dd05e839.54d638",\r
+        "id": "b86241e1.90f6f",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4843.392364501953,\r
-        "y": 501.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4873.392333984375,\r
+        "y": 284.7117919921875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d5c9a2a0.f0c188",\r
-                "585ee28c.970d44"\r
+                "6d437f62.f0b9e8",\r
+                "c60cac93.77d028"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d5c9a2a0.f0c188",\r
+        "id": "6d437f62.f0b9e8",\r
          "type": "set",\r
          "name": "set the max bandwidth",\r
          "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
          "comments": "",\r
-        "x": 5048.883331298828,\r
-        "y": 498.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5078.88330078125,\r
+        "y": 282.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "585ee28c.970d44",\r
+        "id": "c60cac93.77d028",\r
          "type": "set",\r
          "name": "set the max bandwidth",\r
          "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
          "comments": "",\r
-        "x": 5047.883331298828,\r
-        "y": 544.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5077.88330078125,\r
+        "y": 328.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d30875df.4619e8",\r
+        "id": "2a091548.5d967a",\r
          "type": "for",\r
          "name": "for each allotted-resource relationship",\r
          "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3563.883331298828,\r
-        "y": 530.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3593.88330078125,\r
+        "y": 314.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "bcf8f8b2.ee17c"\r
+                "2f22efb0.7f6638"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bcf8f8b2.ee17c",\r
+        "id": "2f22efb0.7f6638",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3843.883331298828,\r
-        "y": 530.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3873.88330078125,\r
+        "y": 314.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f92213c8.e6e61"\r
+                "a8ed1762.dadd28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f92213c8.e6e61",\r
+        "id": "a8ed1762.dadd28",\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": 783.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 803.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f147a584.43d0d8"\r
+                "d4da35fd.31c82"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f147a584.43d0d8",\r
+        "id": "d4da35fd.31c82",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 2433.883331298828,\r
-        "y": 776.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 796.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "5a35df58.3972",\r
-                "2dab28b6.2641a"\r
+                "de7b00e3.6a171",\r
+                "e6ab014c.406db"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5a35df58.3972",\r
+        "id": "de7b00e3.6a171",\r
          "type": "set",\r
          "name": "set the current logical-link-name",\r
          "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
          "comments": "",\r
          "x": 2676.883331298828,\r
-        "y": 733.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 753.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2dab28b6.2641a",\r
+        "id": "e6ab014c.406db",\r
          "type": "save",\r
          "name": "get logical-link from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2665.883331298828,\r
-        "y": 788.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 808.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ffb30860.4224d",\r
-                "abeb5cc2.3015b",\r
-                "e13761ad.544c58"\r
+                "5a07beae.8794d8",\r
+                "1d7b95c6.606562",\r
+                "7f820a8.8f172f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ffb30860.4224d",\r
+        "id": "5a07beae.8794d8",\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": 767.4573059082031,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 786.8597412109375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "bd849955.1204b"\r
+                "ae195dbf.1750f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "abeb5cc2.3015b",\r
+        "id": "1d7b95c6.606562",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2945.883331298828,\r
-        "y": 811.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 831.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "33701bc2.b5a40c"\r
+                "f12ba9c8.9a28f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd849955.1204b",\r
+        "id": "ae195dbf.1750f",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
          "x": 3105.945831298828,\r
-        "y": 767.7430725097656,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 787.1455078125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "33701bc2.b5a40c",\r
+        "id": "f12ba9c8.9a28f8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
          "x": 3104.883331298828,\r
-        "y": 811.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 831.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e13761ad.544c58",\r
+        "id": "7f820a8.8f172f4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2952.883331298828,\r
-        "y": 890.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 910.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d2f3b92.5263348"\r
+                "344a6e64.f3725a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2f3b92.5263348",\r
+        "id": "344a6e64.f3725a",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -997,2769 +997,2645 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 3091.883331298828,\r
-        "y": 890.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
-        "wires": [\r
-            [\r
-                "ef467ac0.6f7c18",\r
-                "f9d1859a.061ab8",\r
-                "3e963f23.c2be88",\r
-                "f9ae4741.757498",\r
-                "2907fb26.565cec",\r
-                "26f3b8c8.1692a",\r
-                "94a806e9.b63df",\r
-                "a001cedc.58f128",\r
-                "221f1c18.663f6c",\r
-                "77955a17.d633ac",\r
-                "1e4146ab.95c211",\r
-                "c8da4017.620ba8",\r
-                "a4dfc5e6.4600f",\r
-                "ce0d81bd.d28a7",\r
-                "7f04acf4.5afc3c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "4165b419.5fd914",\r
+        "y": 910.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "fb96464b.51f05",\r
+                "51750f01.3f406",\r
+                "63f47c85.a7fa6c",\r
+                "96258457.425ae8",\r
+                "f469e44d.0f84d",\r
+                "f7610f35.e81b98",\r
+                "d89362f7.406e48",\r
+                "87d9c57.361fa38",\r
+                "ab43f120.02b19",\r
+                "7042856b.1828cc",\r
+                "f434b230.257eb8",\r
+                "2ac41e54.9dfb2a",\r
+                "ebbe2f0a.10f36",\r
+                "7162acbd.73776c",\r
+                "2683d5ea.5fda52",\r
+                "da74bb6.e442948",\r
+                "feffc86e.486bc",\r
+                "12bfceb8.d75889",\r
+                "3b541994.2db38e",\r
+                "b3267f6f.ff1998",\r
+                "729e2fc5.81fb",\r
+                "62f42d2.2eff654"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e06cec26.4f9a08",\r
          "type": "execute",\r
          "name": "execute UUID generator for ethernet-service-name",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3405.883331298828,\r
-        "y": 696.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3435.883270263672,\r
+        "y": 384.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ef467ac0.6f7c18",\r
+        "id": "fb96464b.51f05",\r
          "type": "execute",\r
          "name": "execute UUID generator for otn-tunnel-name",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3386.883331298828,\r
-        "y": 746.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3416.883270263672,\r
+        "y": 484.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c8da4017.620ba8",\r
+        "id": "2ac41e54.9dfb2a",\r
          "type": "set",\r
          "name": "set new ethernet-service-name",\r
          "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 3343.883331298828,\r
-        "y": 791.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3370.883270263672,\r
+        "y": 535.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f9d1859a.061ab8",\r
+        "id": "51750f01.3f406",\r
          "type": "set",\r
          "name": "set network-route-one",\r
          "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 3318.883331298828,\r
-        "y": 854.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3344.883270263672,\r
+        "y": 584.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e963f23.c2be88",\r
+        "id": "63f47c85.a7fa6c",\r
          "type": "set",\r
          "name": "set network-route-two",\r
          "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 3319.883331298828,\r
-        "y": 909.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3343.883270263672,\r
+        "y": 633.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f9ae4741.757498",\r
+        "id": "96258457.425ae8",\r
          "type": "save",\r
          "name": "get network-route-one from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3335.883331298828,\r
-        "y": 957.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3352.883270263672,\r
+        "y": 771.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d029c3a1.942f48",\r
-                "34db9b18.f85a0c",\r
-                "a8f47dda.1a0bb8"\r
+                "9bd02754.7964a8",\r
+                "8e7e5fd2.7d02c8",\r
+                "6675b2ad.72fd8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2907fb26.565cec",\r
+        "id": "f469e44d.0f84d",\r
          "type": "save",\r
          "name": "get network-route-two from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3324.883331298828,\r
-        "y": 1044.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3345.883270263672,\r
+        "y": 832.28564453125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ad570631.23385",\r
-                "75596bb2.8de11c",\r
-                "ae6194f6.92ada8"\r
+                "772ff0fe.2f34f",\r
+                "8d67ee85.1205f",\r
+                "96627f08.cbe71"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d029c3a1.942f48",\r
+        "id": "9bd02754.7964a8",\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": 841.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3601.883026123047,\r
+        "y": 666.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9c52bc0.78abb48"\r
+                "4d13468a.d3ecb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "34db9b18.f85a0c",\r
+        "id": "8e7e5fd2.7d02c8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3532.392364501953,\r
-        "y": 891.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3595.392059326172,\r
+        "y": 707.7117919921875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "946c30bd.bd527"\r
+                "ff1b9a29.a11d98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8f47dda.1a0bb8",\r
+        "id": "6675b2ad.72fd8c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3536.392364501953,\r
-        "y": 944.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3590.392059326172,\r
+        "y": 757.7117919921875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "1dcb46a1.3c7d49"\r
+                "97bfc6e9.fba1d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c52bc0.78abb48",\r
+        "id": "4d13468a.d3ecb8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3685.454864501953,\r
-        "y": 841.1690979003906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3750.454559326172,\r
+        "y": 665.571533203125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "946c30bd.bd527",\r
+        "id": "ff1b9a29.a11d98",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3675.392364501953,\r
-        "y": 891.3093566894531,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3740.392059326172,\r
+        "y": 715.7117919921875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ad570631.23385",\r
+        "id": "772ff0fe.2f34f",\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": 1014.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3566.883270263672,\r
+        "y": 818.28564453125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "5f295173.cbbf5"\r
+                "d6ce8ecd.6264d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75596bb2.8de11c",\r
+        "id": "8d67ee85.1205f",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3543.392364501953,\r
-        "y": 1064.3092346191406,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3562.392303466797,\r
+        "y": 867.711669921875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "355d767e.1de55a"\r
+                "cdc0e121.35daf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ae6194f6.92ada8",\r
+        "id": "96627f08.cbe71",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3544.392364501953,\r
-        "y": 1117.3092346191406,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3563.392303466797,\r
+        "y": 920.711669921875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "a436621f.a466c"\r
+                "58d9f56e.c48314"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f295173.cbbf5",\r
+        "id": "d6ce8ecd.6264d",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3696.454864501953,\r
-        "y": 1014.1689758300781,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3719.4546508789062,\r
+        "y": 823.5714111328125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "355d767e.1de55a",\r
+        "id": "cdc0e121.35daf",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3686.392364501953,\r
-        "y": 1064.3092346191406,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3705.392303466797,\r
+        "y": 867.711669921875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1dcb46a1.3c7d49",\r
+        "id": "97bfc6e9.fba1d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3697.883331298828,\r
-        "y": 943.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3762.883026123047,\r
+        "y": 768.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f5b5d495.086d"\r
+                "15d53662.387c32"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a436621f.a466c",\r
+        "id": "58d9f56e.c48314",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3697.883331298828,\r
-        "y": 1116.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3716.883270263672,\r
+        "y": 920.28564453125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "43e5bf6b.ff29a8"\r
+                "46dc8745.e3cd18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f5b5d495.086d",\r
+        "id": "15d53662.387c32",\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": 943.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3923.883270263672,\r
+        "y": 655.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "55f80e1b.2635f",\r
-                "43049869.5a7d88"\r
+                "5f27def0.590658",\r
+                "b4572ec6.b95d6",\r
+                "50bdde17.ca9b2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "43e5bf6b.ff29a8",\r
+        "id": "46dc8745.e3cd18",\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": 1116.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3915.883270263672,\r
+        "y": 840.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f9772113.de9e58",\r
-                "79517b7a.195d94"\r
+                "be87179f.d632f8",\r
+                "ace0b3c8.e628e",\r
+                "f2575655.f8e378"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "55f80e1b.2635f",\r
+        "id": "5f27def0.590658",\r
          "type": "outcome",\r
          "name": "ROOT",\r
          "xml": "<outcome value='ROOT'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4045.883331298828,\r
-        "y": 922.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4147.883758544922,\r
+        "y": 359.28570556640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d9c9bf69.d54ef8"\r
+                "61b5f01d.b80d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "43049869.5a7d88",\r
+        "id": "b4572ec6.b95d6",\r
          "type": "outcome",\r
          "name": "LEAF",\r
          "xml": "<outcome value='LEAF'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4047.883331298828,\r
-        "y": 976.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4149.883758544922,\r
+        "y": 413.28570556640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "5ac63627.c33ff"\r
+                "c4a12276.3b1638"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f9772113.de9e58",\r
+        "id": "be87179f.d632f8",\r
          "type": "outcome",\r
          "name": "ROOT",\r
          "xml": "<outcome value='ROOT'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4046.883331298828,\r
-        "y": 1086.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4113.883758544922,\r
+        "y": 619.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "35523eeb.15287a"\r
+                "d3817023.608058"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "79517b7a.195d94",\r
+        "id": "ace0b3c8.e628e",\r
          "type": "outcome",\r
          "name": "LEAF",\r
          "xml": "<outcome value='LEAF'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4048.883331298828,\r
-        "y": 1140.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4115.883758544922,\r
+        "y": 673.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "377b88b8.aaeb48"\r
+                "515f06a6.62b11"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eba0d9fe.14aff8",\r
+        "id": "be2b27bb.08a9c8",\r
          "type": "set",\r
          "name": "set network-route-ROOT",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4355.883331298828,\r
-        "y": 874.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4457.883758544922,\r
+        "y": 311.28570556640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b156164c.4afee",\r
+        "id": "b06c3c05.9b2298",\r
          "type": "set",\r
          "name": "set network-route-LEAF",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4348.883331298828,\r
-        "y": 972.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4450.883758544922,\r
+        "y": 409.28570556640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c46834b2.126828",\r
+        "id": "d2d6cd47.633ea8",\r
          "type": "set",\r
          "name": "set network-route-ROOT",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4348.883331298828,\r
-        "y": 1059.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4429.883758544922,\r
+        "y": 592.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "67f1e499.325a54",\r
+        "id": "1e090814.77ece",\r
          "type": "set",\r
          "name": "set network-route-LEAF",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4352.883331298828,\r
-        "y": 1152.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4433.883758544922,\r
+        "y": 685.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fa18abdb.1f3b58",\r
+        "id": "6f64ab1a.72d4ac",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3579.883331298828,\r
-        "y": 1561.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3609.88330078125,\r
+        "y": 1345.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "acfe7f1b.815bb8"\r
+                "fcfd7965.d24e6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "504369a4.383c58",\r
+        "id": "670e6fe3.827898",\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": 1604.4573669433594,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3619.374267578125,\r
+        "y": 1387.8598022460938,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "2cc2d2a0.0189de"\r
+                "329f67fd.7314c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "48dc6834.fa2a",\r
+        "id": "69392cc6.84928c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3577.883331298828,\r
-        "y": 1650.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3607.88330078125,\r
+        "y": 1434.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "5165f4d1.561cf4"\r
+                "a3d0ff69.d983b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a5821370.c906a8",\r
+        "id": "dee477e6.792e68",\r
          "type": "comment",\r
          "name": "Question?",\r
          "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
          "comments": "",\r
-        "x": 3279.883331298828,\r
-        "y": 1523.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3309.88330078125,\r
+        "y": 1307.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "94a806e9.b63df",\r
+        "id": "d89362f7.406e48",\r
          "type": "save",\r
          "name": "get p-interface-src from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3322.883331298828,\r
-        "y": 1588.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3352.88330078125,\r
+        "y": 1372.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "fa18abdb.1f3b58",\r
-                "504369a4.383c58",\r
-                "48dc6834.fa2a"\r
+                "6f64ab1a.72d4ac",\r
+                "670e6fe3.827898",\r
+                "69392cc6.84928c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26f3b8c8.1692a",\r
+        "id": "f7610f35.e81b98",\r
          "type": "execute",\r
          "name": "execute split tp-id to get pnf-name",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3323.883331298828,\r
-        "y": 1258.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3353.883270263672,\r
+        "y": 1124.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e1766e3b.d98f7",\r
-                "2b2fec17.7ad784"\r
+                "c7f5f619.d51258",\r
+                "a4e5ad2b.c867e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b2fec17.7ad784",\r
+        "id": "a4e5ad2b.c867e",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3546.883331298828,\r
-        "y": 1244.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3576.883270263672,\r
+        "y": 1110.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9fa24ca4.2bf57"\r
+                "8e8c42f1.638b2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e1766e3b.d98f7",\r
+        "id": "c7f5f619.d51258",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3548.883331298828,\r
-        "y": 1277.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3578.883270263672,\r
+        "y": 1143.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "43f11543.33be3c"\r
+                "5f49f3a7.a8042c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "acfe7f1b.815bb8",\r
+        "id": "fcfd7965.d24e6",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3752.549835205078,\r
-        "y": 1560.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3782.5498046875,\r
+        "y": 1344.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "72fd24ba.a9210c",\r
-                "abb77544.4a8348"\r
+                "6f4130f2.684b3",\r
+                "363079f1.761036"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2cc2d2a0.0189de",\r
+        "id": "329f67fd.7314c8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3742.9457092285156,\r
-        "y": 1607.7431030273438,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3772.9456787109375,\r
+        "y": 1391.1455383300781,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5165f4d1.561cf4",\r
+        "id": "a3d0ff69.d983b",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3746.883331298828,\r
-        "y": 1651.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3776.88330078125,\r
+        "y": 1435.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "72fd24ba.a9210c",\r
+        "id": "6f4130f2.684b3",\r
          "type": "execute",\r
          "name": "execute split tp-id to get pnf-name",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4016.883331298828,\r
-        "y": 1544.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4046.88330078125,\r
+        "y": 1328.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e6b87836.bef2f8",\r
-                "b8a921ef.444378"\r
+                "1e584023.51383",\r
+                "f8d90041.f96538"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b8a921ef.444378",\r
+        "id": "f8d90041.f96538",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4239.883331298828,\r
-        "y": 1499.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4269.88330078125,\r
+        "y": 1283.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "54ec9e81.9a2fc"\r
+                "9697fa74.602bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6b87836.bef2f8",\r
+        "id": "1e584023.51383",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4241.883331298828,\r
-        "y": 1563.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4271.88330078125,\r
+        "y": 1347.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "27ce4c05.8bf1dc"\r
+                "c43abb24.f757f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "27ce4c05.8bf1dc",\r
+        "id": "c43abb24.f757f",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 4403.883331298828,\r
-        "y": 1559.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4433.88330078125,\r
+        "y": 1343.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "54ec9e81.9a2fc",\r
+        "id": "9697fa74.602bc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4404.883331298828,\r
-        "y": 1496.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4434.88330078125,\r
+        "y": 1280.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f6774ff2.abd22",\r
-                "bb24ac55.01a618"\r
+                "3aa59d52.2c8e1a",\r
+                "83c5954c.7a838"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e1ea98e.240716",\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": 1703.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "19e24364.492f0d",\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": 1613.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "aefdb41a.15ed9",\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": 1751.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "43f11543.33be3c",\r
+        "id": "5f49f3a7.a8042c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 3691.883331298828,\r
-        "y": 1274.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3721.883270263672,\r
+        "y": 1140.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fa24ca4.2bf57",\r
+        "id": "8e8c42f1.638b2",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3694.883331298828,\r
-        "y": 1237.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3724.883270263672,\r
+        "y": 1103.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "fc422c00.a0a738",\r
-                "4c9af5cc.7cdc6c"\r
+                "3b3764ed.353b8c",\r
+                "1fd3d7ac.934188"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fc422c00.a0a738",\r
+        "id": "3b3764ed.353b8c",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",\r
          "comments": "",\r
-        "x": 3868.883331298828,\r
-        "y": 1193.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3916.883270263672,\r
+        "y": 1105.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "abb77544.4a8348",\r
+        "id": "363079f1.761036",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3970.883331298828,\r
-        "y": 1828.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4006.88330078125,\r
+        "y": 1460.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "af71b606.ad1ca8"\r
+                "9254521f.b3181"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "af71b606.ad1ca8",\r
+        "id": "9254521f.b3181",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4176.883331298828,\r
-        "y": 1828.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4212.88330078125,\r
+        "y": 1460.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "1586191.cb5c467"\r
+                "4418ce2f.a0c9d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1586191.cb5c467",\r
+        "id": "4418ce2f.a0c9d",\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": 1828.7051086425781,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4428.1689453125,\r
+        "y": 1460.1075439453125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "2efd1433.a69a04"\r
+                "8ea77952.a62e58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4c9af5cc.7cdc6c",\r
+        "id": "1fd3d7ac.934188",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3883.883331298828,\r
-        "y": 1304.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3913.883270263672,\r
+        "y": 1170.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f48c8915.33d9e8",\r
-                "cce55dcf.842618",\r
-                "5e74a015.2ca67"\r
+                "8290c612.7a239",\r
+                "966ac70d.6028c8",\r
+                "1ce11a36.13fbae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f48c8915.33d9e8",\r
+        "id": "8290c612.7a239",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4079.3834533691406,\r
-        "y": 1256.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4109.383392333984,\r
+        "y": 1122.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "5a7d862f.3b4ad8"\r
+                "14e203c.361db7c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cce55dcf.842618",\r
+        "id": "966ac70d.6028c8",\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": 1311.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4101.383392333984,\r
+        "y": 1177.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9061c72.32ffe38"\r
+                "ed056b5d.302798"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5e74a015.2ca67",\r
+        "id": "1ce11a36.13fbae",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4076.3834533691406,\r
-        "y": 1368.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4106.383392333984,\r
+        "y": 1234.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6b55247c.21dab4"\r
+                "cd3e83f.158db8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b55247c.21dab4",\r
+        "id": "cd3e83f.158db8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4228.383453369141,\r
-        "y": 1369.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4258.383392333984,\r
+        "y": 1235.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9061c72.32ffe38",\r
+        "id": "ed056b5d.302798",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4239.383453369141,\r
-        "y": 1314.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4269.383392333984,\r
+        "y": 1180.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5a7d862f.3b4ad8",\r
+        "id": "14e203c.361db7c",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4223.765777587891,\r
-        "y": 1254.5390014648438,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4253.765716552734,\r
+        "y": 1119.9414367675781,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d89a976.d88e5e8"\r
+                "618a03ad.e0bdc4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d89a976.d88e5e8",\r
+        "id": "618a03ad.e0bdc4",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4407.883331298828,\r
-        "y": 1268.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4447.883270263672,\r
+        "y": 1164.2857055664062,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "155fb221.0dbf8e"\r
+                "2cbaaf2e.c8d728"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bb24ac55.01a618",\r
+        "id": "83c5954c.7a838",\r
          "type": "set",\r
          "name": "set ltpId",\r
          "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",\r
          "comments": "",\r
-        "x": 4574.883331298828,\r
-        "y": 1454.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4604.88330078125,\r
+        "y": 1238.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f6774ff2.abd22",\r
+        "id": "3aa59d52.2c8e1a",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",\r
          "comments": "",\r
-        "x": 4575.883331298828,\r
-        "y": 1562.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4605.88330078125,\r
+        "y": 1346.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1f2d63dd.89956c",\r
+        "id": "7cc13839.b2e03",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
          "comments": "",\r
-        "x": 4576.883331298828,\r
-        "y": 1511.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4606.88330078125,\r
+        "y": 1295.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2efd1433.a69a04",\r
+        "id": "8ea77952.a62e58",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4599.000518798828,\r
-        "y": 1829.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4635.00048828125,\r
+        "y": 1460.6260986328125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9738e3.11ec3f2",\r
-                "b90b51f7.bc063",\r
-                "e565f202.9406"\r
+                "f27b51c4.4be918",\r
+                "106457d2.e488d",\r
+                "3867b2c0.836c9e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9738e3.11ec3f2",\r
+        "id": "f27b51c4.4be918",\r
          "type": "set",\r
          "name": "set source ttp-id",\r
          "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 4814.000518798828,\r
-        "y": 1791.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4850.00048828125,\r
+        "y": 1422.6260986328125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b90b51f7.bc063",\r
+        "id": "106457d2.e488d",\r
          "type": "get-resource",\r
          "name": "get-resource src TTP",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4811.000518798828,\r
-        "y": 1830.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4847.00048828125,\r
+        "y": 1461.6260986328125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "2d0e3a15.1426a6"\r
+                "d07dc21f.bf396"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e565f202.9406",\r
+        "id": "3867b2c0.836c9e",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 4766.500518798828,\r
-        "y": 1872.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4802.50048828125,\r
+        "y": 1503.6260986328125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2d0e3a15.1426a6",\r
+        "id": "d07dc21f.bf396",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4991.500518798828,\r
-        "y": 1829.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5027.50048828125,\r
+        "y": 1460.6260986328125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "a863747c.f65e78"\r
+                "a0338f35.aa887"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60c94053.2751c",\r
+        "id": "7ad015c9.163974",\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": 1272.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4835.88330078125,\r
+        "y": 1056.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "de3b61b0.e43d2"\r
+                "79e701a7.e6bda"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "de3b61b0.e43d2",\r
+        "id": "79e701a7.e6bda",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4982.883331298828,\r
-        "y": 1264.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5012.88330078125,\r
+        "y": 1048.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b2f44bdb.9dc5e8",\r
-                "1f8e5eff.5b4f51"\r
+                "74575ab5.dab66c",\r
+                "bb3b928a.241048"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "155fb221.0dbf8e",\r
+        "id": "2cbaaf2e.c8d728",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4602.883331298828,\r
-        "y": 1268.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4638.883270263672,\r
+        "y": 1154.2857055664062,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "60c94053.2751c",\r
-                "ecc099ad.aafee8"\r
+                "7ad015c9.163974",\r
+                "67f00ea1.c4a38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ecc099ad.aafee8",\r
+        "id": "67f00ea1.c4a38",\r
          "type": "outcome",\r
          "name": "network-resource",\r
          "xml": "<outcome value='network-resource'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4808.883331298828,\r
-        "y": 1346.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4838.88330078125,\r
+        "y": 1130.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e5e04393.9d571"\r
+                "b8dbf273.d60738"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5e04393.9d571",\r
+        "id": "b8dbf273.d60738",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4985.883331298828,\r
-        "y": 1338.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5015.88330078125,\r
+        "y": 1122.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "39969cdd.a78634"\r
+                "36a761a6.6edbc6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a863747c.f65e78",\r
+        "id": "a0338f35.aa887",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5149.500518798828,\r
-        "y": 1829.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5185.50048828125,\r
+        "y": 1460.6260986328125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9ec1944.f167b68"\r
+                "ac7f5dcb.abfbe"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9ec1944.f167b68",\r
+        "id": "ac7f5dcb.abfbe",\r
          "type": "set",\r
          "name": "set source tunnel tp ip",\r
          "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",\r
          "comments": "",\r
-        "x": 5356.500518798828,\r
-        "y": 1829.2236633300781,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5392.50048828125,\r
+        "y": 1460.6260986328125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1f8e5eff.5b4f51",\r
+        "id": "bb3b928a.241048",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5190.883331298828,\r
-        "y": 1271.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5220.88330078125,\r
+        "y": 1055.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "1422dd1f.ed1903",\r
-                "306288e7.8d0b68",\r
-                "adc4d006.c9a618"\r
+                "14a2b948.3a7307",\r
+                "4db5fa80.8a7584",\r
+                "1d1f45c7.aa8332"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b2f44bdb.9dc5e8",\r
+        "id": "74575ab5.dab66c",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainA id",\r
          "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5220.883331298828,\r
-        "y": 1219.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5250.88330078125,\r
+        "y": 1003.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1422dd1f.ed1903",\r
+        "id": "14a2b948.3a7307",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5400.883331298828,\r
-        "y": 1262.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5430.88330078125,\r
+        "y": 1046.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9be58098.9885c8"\r
+                "755aafd7.9f4fa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "306288e7.8d0b68",\r
+        "id": "4db5fa80.8a7584",\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": 1317.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5422.88330078125,\r
+        "y": 1101.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ddbc66fb.291808"\r
+                "70535561.166e44"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "adc4d006.c9a618",\r
+        "id": "1d1f45c7.aa8332",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5397.883331298828,\r
-        "y": 1374.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5427.88330078125,\r
+        "y": 1158.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f026a629.a20b28"\r
+                "91b4ba95.e0ecd8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f026a629.a20b28",\r
+        "id": "91b4ba95.e0ecd8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5549.883331298828,\r
-        "y": 1375.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5579.88330078125,\r
+        "y": 1159.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ddbc66fb.291808",\r
+        "id": "70535561.166e44",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5560.883331298828,\r
-        "y": 1320.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5590.88330078125,\r
+        "y": 1104.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9be58098.9885c8",\r
+        "id": "755aafd7.9f4fa8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5545.265655517578,\r
-        "y": 1260.5390014648438,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5575.265625,\r
+        "y": 1043.9414367675781,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b1324a29.092c8"\r
+                "be3e1006.2c5ef"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "39969cdd.a78634",\r
+        "id": "36a761a6.6edbc6",\r
          "type": "set",\r
          "name": "set domainA ethernet layer network-id",\r
          "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5220.883331298828,\r
-        "y": 1462.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5250.88330078125,\r
+        "y": 1246.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b1324a29.092c8",\r
+        "id": "be3e1006.2c5ef",\r
          "type": "set",\r
          "name": "set controller domainA data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5759.883331298828,\r
-        "y": 1256.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5789.88330078125,\r
+        "y": 1040.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e7c33475.7e91e8",\r
+        "id": "9e818253.3db4c8",\r
          "type": "set",\r
          "name": "set network-route-B",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4343.883331298828,\r
-        "y": 910.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4445.883758544922,\r
+        "y": 347.28570556640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5025b50.00b0f4c",\r
+        "id": "e41aea83.6c1b9",\r
          "type": "set",\r
          "name": "set network-route-A",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4334.883331298828,\r
-        "y": 1008.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4446.883728027344,\r
+        "y": 451.28570556640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d9c9bf69.d54ef8",\r
+        "id": "61b5f01d.b80d4",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4168.883331298828,\r
-        "y": 916.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4270.883758544922,\r
+        "y": 353.28570556640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "eba0d9fe.14aff8",\r
-                "e7c33475.7e91e8"\r
+                "be2b27bb.08a9c8",\r
+                "9e818253.3db4c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5ac63627.c33ff",\r
+        "id": "c4a12276.3b1638",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4174.883331298828,\r
-        "y": 980.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4276.883758544922,\r
+        "y": 417.28570556640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b156164c.4afee",\r
-                "5025b50.00b0f4c"\r
+                "b06c3c05.9b2298",\r
+                "e41aea83.6c1b9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "35523eeb.15287a",\r
+        "id": "d3817023.608058",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4174.883331298828,\r
-        "y": 1086.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4241.883758544922,\r
+        "y": 619.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "c46834b2.126828",\r
-                "7dcc31dd.14e278"\r
+                "d2d6cd47.633ea8",\r
+                "8a84a541.05baa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "377b88b8.aaeb48",\r
+        "id": "515f06a6.62b11",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4177.883331298828,\r
-        "y": 1139.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4244.883758544922,\r
+        "y": 672.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "67f1e499.325a54",\r
-                "e00fdb48.f91848"\r
+                "1e090814.77ece",\r
+                "f18416f.b59a2e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7dcc31dd.14e278",\r
+        "id": "8a84a541.05baa8",\r
          "type": "set",\r
          "name": "set network-route-B",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4334.883331298828,\r
-        "y": 1099.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4415.883758544922,\r
+        "y": 632.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e00fdb48.f91848",\r
+        "id": "f18416f.b59a2e8",\r
          "type": "set",\r
          "name": "set network-route-A",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4337.883331298828,\r
-        "y": 1190.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4418.883758544922,\r
+        "y": 723.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b1c3c9b6.d1dd38",\r
+        "id": "e3b8353b.1a716",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3709.883331298828,\r
-        "y": 2400.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3741.88330078125,\r
+        "y": 1802.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "8d971e70.183d4",\r
-                "ac7f0ae7.0820f"\r
+                "ff7eb3f1.2b5db",\r
+                "e41a1903.8d6c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "37cdc12f.574c9e",\r
+        "id": "cfbe25d.9897558",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3537.216827392578,\r
-        "y": 2401.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3569.216796875,\r
+        "y": 1803.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b1c3c9b6.d1dd38"\r
+                "e3b8353b.1a716"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "17fb9abf.e94b5d",\r
+        "id": "c7184b04.7c3a48",\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": 2444.4573669433594,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3578.707763671875,\r
+        "y": 1845.8599243164062,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ffec1f14.6b38f8"\r
+                "1df80989.06ffa6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "77126cff.9c26a4",\r
+        "id": "6421e4be.cfd334",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3535.216827392578,\r
-        "y": 2490.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3567.216796875,\r
+        "y": 1892.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6fe13c0.1437ac4"\r
+                "61347385.0e669c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ffec1f14.6b38f8",\r
+        "id": "1df80989.06ffa6",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3700.2792053222656,\r
-        "y": 2447.7431030273438,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3732.2791748046875,\r
+        "y": 1849.1456604003906,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6fe13c0.1437ac4",\r
+        "id": "61347385.0e669c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3704.216827392578,\r
-        "y": 2491.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3736.216796875,\r
+        "y": 1893.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8d971e70.183d4",\r
+        "id": "ff7eb3f1.2b5db",\r
          "type": "execute",\r
          "name": "execute split tp-id to get pnf-name",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3996.216827392578,\r
-        "y": 2404.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4028.216796875,\r
+        "y": 1806.2860107421875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "53133799.37d4b",\r
-                "a86f569d.6ab9f8"\r
+                "2c9a5d35.edc2ea",\r
+                "e16f62ba.253eb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a86f569d.6ab9f8",\r
+        "id": "e16f62ba.253eb",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4219.216827392578,\r
-        "y": 2359.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4251.216796875,\r
+        "y": 1761.2860107421875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "66c68013.ddb6b8"\r
+                "9d889672.fd9088"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "53133799.37d4b",\r
+        "id": "2c9a5d35.edc2ea",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4221.216827392578,\r
-        "y": 2423.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4253.216796875,\r
+        "y": 1825.2860107421875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "7ccc7afc.6f2a8c"\r
+                "67c6ff18.c6a758"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7ccc7afc.6f2a8c",\r
+        "id": "67c6ff18.c6a758",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 4380.216827392578,\r
-        "y": 2442.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4412.216796875,\r
+        "y": 1844.2860107421875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "66c68013.ddb6b8",\r
+        "id": "9d889672.fd9088",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4384.216827392578,\r
-        "y": 2356.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4416.216796875,\r
+        "y": 1758.2860107421875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "14b7c942.3a7d87",\r
-                "705ad60b.9c1b38"\r
+                "acf9d743.7735b8",\r
+                "dd400cb5.f9a5e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b364584.e1350c",\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": 2563.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "2e817e1e.7658f2",\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": 2473.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "1f716896.64ed2f",\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": 2628.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "221f1c18.663f6c",\r
+        "id": "ab43f120.02b19",\r
          "type": "save",\r
          "name": "get p-interface-dst from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3309.216827392578,\r
-        "y": 2436.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3341.216796875,\r
+        "y": 1838.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "37cdc12f.574c9e",\r
-                "17fb9abf.e94b5d",\r
-                "77126cff.9c26a4"\r
+                "cfbe25d.9897558",\r
+                "c7184b04.7c3a48",\r
+                "6421e4be.cfd334"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b3b2ce86.7d813",\r
+        "id": "443ec13c.3b1388",\r
          "type": "comment",\r
          "name": "Question?",\r
          "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
          "comments": "",\r
-        "x": 3270.216827392578,\r
-        "y": 2380.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3302.216796875,\r
+        "y": 1782.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a001cedc.58f128",\r
+        "id": "87d9c57.361fa38",\r
          "type": "execute",\r
          "name": "execute split tp-id to get pnf-name",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3327.216827392578,\r
-        "y": 2099.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3353.216796875,\r
+        "y": 1577.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d5568173.1326d",\r
-                "27e39e34.e8a4aa"\r
+                "47939321.8d0314",\r
+                "28e1d4e9.ca62fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "27e39e34.e8a4aa",\r
+        "id": "28e1d4e9.ca62fc",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3550.216827392578,\r
-        "y": 2085.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3576.216796875,\r
+        "y": 1563.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ba49d8fd.b81698"\r
+                "97457e61.73e3d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d5568173.1326d",\r
+        "id": "47939321.8d0314",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3552.216827392578,\r
-        "y": 2118.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3578.216796875,\r
+        "y": 1596.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "54689cfb.423da4"\r
+                "4d6d8144.ded038"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "54689cfb.423da4",\r
+        "id": "4d6d8144.ded038",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 3695.216827392578,\r
-        "y": 2115.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3721.216796875,\r
+        "y": 1593.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ba49d8fd.b81698",\r
+        "id": "97457e61.73e3d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3698.216827392578,\r
-        "y": 2078.8832092285156,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3724.216796875,\r
+        "y": 1556.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e65b9c6b.1cea38",\r
-                "e0207e5b.773f7"\r
+                "a9d92823.960608",\r
+                "aea3c9c3.593308"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e65b9c6b.1cea38",\r
+        "id": "a9d92823.960608",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",\r
          "comments": "",\r
-        "x": 3892.216827392578,\r
-        "y": 2081.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3918.216796875,\r
+        "y": 1559.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ac7f0ae7.0820f",\r
+        "id": "e41a1903.8d6c4",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3955.216827392578,\r
-        "y": 2713.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3969.216766357422,\r
+        "y": 1939.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "eb66de49.8a6178"\r
+                "6ce2701b.388768"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eb66de49.8a6178",\r
+        "id": "6ce2701b.388768",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4161.216827392578,\r
-        "y": 2713.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4175.216766357422,\r
+        "y": 1939.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "a3eb7777.2808e"\r
+                "879de70.58c1218"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a3eb7777.2808e",\r
+        "id": "879de70.58c1218",\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": 2712.705108642578,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4392.502410888672,\r
+        "y": 1938.1075439453125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "90bfeab5.6e04"\r
+                "3d45c8a4.47e81"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e0207e5b.773f7",\r
+        "id": "aea3c9c3.593308",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3914.216827392578,\r
-        "y": 2149.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3940.216796875,\r
+        "y": 1627.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ff3d2407.61718",\r
-                "f34e14e1.674a08",\r
-                "f7ebc3eb.0fe87"\r
+                "ce24caf2.6cde98",\r
+                "b9bbe7dc.00f29",\r
+                "76cad8df.00ad38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ff3d2407.61718",\r
+        "id": "ce24caf2.6cde98",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4109.716949462891,\r
-        "y": 2101.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4135.7169189453125,\r
+        "y": 1579.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e4f3177f.7fd418"\r
+                "c03aa3dc.16bd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f34e14e1.674a08",\r
+        "id": "b9bbe7dc.00f29",\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": 2156.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4127.7169189453125,\r
+        "y": 1634.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "7e75e0e1.a6768"\r
+                "c287be98.ae3d3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7ebc3eb.0fe87",\r
+        "id": "76cad8df.00ad38",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4106.716949462891,\r
-        "y": 2213.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4132.7169189453125,\r
+        "y": 1691.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "917fd40f.ec43b"\r
+                "eb7ced2b.1fef2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "917fd40f.ec43b",\r
+        "id": "eb7ced2b.1fef2",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4258.716949462891,\r
-        "y": 2214.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4284.7169189453125,\r
+        "y": 1692.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7e75e0e1.a6768",\r
+        "id": "c287be98.ae3d3",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4269.716949462891,\r
-        "y": 2159.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4295.7169189453125,\r
+        "y": 1637.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e4f3177f.7fd418",\r
+        "id": "c03aa3dc.16bd",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4254.099273681641,\r
-        "y": 2099.5390014648438,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4280.0992431640625,\r
+        "y": 1576.9415588378906,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "96db4a5c.6d74f"\r
+                "5afd22fd.80941c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "14b7c942.3a7d87",\r
+        "id": "acf9d743.7735b8",\r
          "type": "set",\r
          "name": "set ltpId",\r
          "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",\r
          "comments": "",\r
-        "x": 4554.216827392578,\r
-        "y": 2317.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4586.216796875,\r
+        "y": 1719.2860107421875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "705ad60b.9c1b38",\r
+        "id": "dd400cb5.f9a5e",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",\r
          "comments": "",\r
-        "x": 4555.216827392578,\r
-        "y": 2422.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4587.216796875,\r
+        "y": 1824.2860107421875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fe24857d.ec88f8",\r
+        "id": "d2c0902b.6c4ea",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
          "comments": "",\r
-        "x": 4550.216827392578,\r
-        "y": 2371.8834533691406,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4582.216796875,\r
+        "y": 1773.2860107421875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "90bfeab5.6e04",\r
+        "id": "3d45c8a4.47e81",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4585.334014892578,\r
-        "y": 2702.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4599.333953857422,\r
+        "y": 1927.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d29ec4c3.e3026",\r
-                "3dd34bd3.f84b34",\r
-                "855f6bda.886bb"\r
+                "616411e3.181da",\r
+                "d5236702.85efc8",\r
+                "63f505ec.f0050c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d29ec4c3.e3026",\r
+        "id": "616411e3.181da",\r
          "type": "set",\r
          "name": "set destination ttp-id",\r
          "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 4800.334014892578,\r
-        "y": 2664.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4814.333953857422,\r
+        "y": 1889.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3dd34bd3.f84b34",\r
+        "id": "d5236702.85efc8",\r
          "type": "get-resource",\r
          "name": "get-resource src TTP",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4797.334014892578,\r
-        "y": 2703.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4811.333953857422,\r
+        "y": 1928.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "498fc826.7744e"\r
+                "e9e8b1b.05378d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "855f6bda.886bb",\r
+        "id": "63f505ec.f0050c",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 4752.834014892578,\r
-        "y": 2745.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4766.833953857422,\r
+        "y": 1970.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "498fc826.7744e",\r
+        "id": "e9e8b1b.05378d",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4977.834014892578,\r
-        "y": 2702.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4991.833953857422,\r
+        "y": 1927.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3dffa556.ecd0ba"\r
+                "9850361c.da76c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3dffa556.ecd0ba",\r
+        "id": "9850361c.da76c8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5135.834014892578,\r
-        "y": 2702.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5149.833953857422,\r
+        "y": 1927.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e57a350c.677e18"\r
+                "db66a9b.93619d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e57a350c.677e18",\r
+        "id": "db66a9b.93619d8",\r
          "type": "set",\r
          "name": "set destination tunnel tp ip",\r
          "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",\r
          "comments": "",\r
-        "x": 5342.834014892578,\r
-        "y": 2702.2237854003906,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5356.833953857422,\r
+        "y": 1927.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "321528be.3d7ae",\r
+        "id": "84b58dac.88eef8",\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": 2117.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4862.216796875,\r
+        "y": 1595.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e56d9c92.9b763"\r
+                "26e5751a.9712e2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e56d9c92.9b763",\r
+        "id": "26e5751a.9712e2",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5013.216827392578,\r
-        "y": 2109.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5039.216796875,\r
+        "y": 1587.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "251b7dfd.9c2dea",\r
-                "f747044b.58f4e"\r
+                "6aba367d.688578",\r
+                "e91a3d87.4731c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "96db4a5c.6d74f",\r
+        "id": "5afd22fd.80941c",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4438.216827392578,\r
-        "y": 2113.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4464.216796875,\r
+        "y": 1591.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3dedc7fb.152e08"\r
+                "c4ef25e3.8547c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3dedc7fb.152e08",\r
+        "id": "c4ef25e3.8547c",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4633.216827392578,\r
-        "y": 2113.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4659.216796875,\r
+        "y": 1591.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "321528be.3d7ae",\r
-                "b22cff66.f669e8"\r
+                "84b58dac.88eef8",\r
+                "70651805.f7aa38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f747044b.58f4e",\r
+        "id": "e91a3d87.4731c",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5221.216827392578,\r
-        "y": 2116.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5247.216796875,\r
+        "y": 1594.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "1f813de4.828122",\r
-                "d83bccad.38e8b8",\r
-                "c46088f8.fb1e"\r
+                "52bb494b.9e9548",\r
+                "1f1e43c3.bd50ac",\r
+                "27bf06a9.82b122"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cd687e81.f269c8",\r
+        "id": "13e72829.65bf18",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5015.216827392578,\r
-        "y": 2182.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5041.216796875,\r
+        "y": 1660.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "44576406.503604"\r
+                "f997c96d.8efde"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b22cff66.f669e8",\r
+        "id": "70651805.f7aa38",\r
          "type": "outcome",\r
          "name": "network-resource",\r
          "xml": "<outcome value='network-resource'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4838.216827392578,\r
-        "y": 2190.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4864.216796875,\r
+        "y": 1668.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "cd687e81.f269c8"\r
+                "13e72829.65bf18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "251b7dfd.9c2dea",\r
+        "id": "6aba367d.688578",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainB id",\r
          "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5251.216827392578,\r
-        "y": 2064.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5277.216796875,\r
+        "y": 1542.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "44576406.503604",\r
+        "id": "f997c96d.8efde",\r
          "type": "set",\r
          "name": "set domainB ethernet layer network-id",\r
          "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5250.216827392578,\r
-        "y": 2306.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5254.216796875,\r
+        "y": 1726.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1f813de4.828122",\r
+        "id": "52bb494b.9e9548",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5431.216827392578,\r
-        "y": 2107.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5457.216796875,\r
+        "y": 1585.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9f1d5683.34bf48"\r
+                "32b0560b.723342"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d83bccad.38e8b8",\r
+        "id": "1f1e43c3.bd50ac",\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": 2162.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5449.216796875,\r
+        "y": 1640.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3d8c6a19.63c47e"\r
+                "6c345a14.f54524"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c46088f8.fb1e",\r
+        "id": "27bf06a9.82b122",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5428.216827392578,\r
-        "y": 2219.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5454.216796875,\r
+        "y": 1697.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "868d602e.d270d8"\r
+                "6641f5b5.b5523c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "868d602e.d270d8",\r
+        "id": "6641f5b5.b5523c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5580.216827392578,\r
-        "y": 2220.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5606.216796875,\r
+        "y": 1698.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3d8c6a19.63c47e",\r
+        "id": "6c345a14.f54524",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5591.216827392578,\r
-        "y": 2165.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5617.216796875,\r
+        "y": 1643.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9f1d5683.34bf48",\r
+        "id": "32b0560b.723342",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5575.599151611328,\r
-        "y": 2105.5390014648438,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5601.59912109375,\r
+        "y": 1582.9415588378906,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "580e8311.7470f4"\r
+                "1b5e2086.1509ff"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "580e8311.7470f4",\r
+        "id": "1b5e2086.1509ff",\r
          "type": "set",\r
          "name": "set controller domainB data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5790.216827392578,\r
-        "y": 2101.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5816.216796875,\r
+        "y": 1579.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "77955a17.d633ac",\r
+        "id": "7042856b.1828cc",\r
          "type": "set",\r
          "name": "set LEAF stuff",\r
-        "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",\r
-        "comments": "",\r
-        "x": 3288.883331298828,\r
-        "y": 1711.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "88408865.7d27f8",\r
-        "type": "comment",\r
-        "name": "This is it (should be)",\r
-        "info": "",\r
-        "comments": "",\r
-        "x": 4510.883331298828,\r
-        "y": 994.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "d43945c8.bc5bc",\r
-        "type": "comment",\r
-        "name": "This is it (should be)",\r
-        "info": "",\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": 4502.883331298828,\r
-        "y": 1084.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3314.88330078125,\r
+        "y": 1449.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1e4146ab.95c211",\r
+        "id": "f434b230.257eb8",\r
          "type": "set",\r
          "name": "set ROOT stuff",\r
-        "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",\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": 2567.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3301.88330078125,\r
+        "y": 1969.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "893317d2.3ef5f",\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": 1817.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "fd0edd2e.c98978",\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": 1764.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "98563074.1e7ea",\r
+        "id": "c9139602.db9618",\r
          "type": "execute",\r
          "name": "execute UUID generator for ethernet-service-name",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2426.883331298828,\r
-        "y": 142.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 162.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c475408d.68ef",\r
+        "id": "aadbe6b3.d2bba",\r
          "type": "set",\r
          "name": "set new ethernet-service-name",\r
          "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",\r
          "comments": "",\r
          "x": 2360.883331298828,\r
-        "y": 178.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 198.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e109d5f4.51e5d",\r
+        "id": "e7f44e9f.7383a",\r
          "type": "comment",\r
          "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",\r
          "info": "",\r
          "comments": "",\r
          "x": 2545.883331298828,\r
-        "y": 105.88333129882812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 125.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2e92209c.b2514",\r
+        "id": "106d7d06.a5399b",\r
          "type": "comment",\r
          "name": "NOT NEEDED ANYMORE?",\r
          "info": "",\r
          "comments": "",\r
-        "x": 4036.883331298828,\r
-        "y": 1795.8833312988281,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4072.88330078125,\r
+        "y": 1427.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cc84986.18b2868",\r
+        "id": "f63837b1.4cefc",\r
          "type": "comment",\r
          "name": "NOT NEEDED ANYMORE?",\r
          "info": "",\r
          "comments": "",\r
-        "x": 4014.883331298828,\r
-        "y": 2665.883331298828,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4028.883270263672,\r
+        "y": 1891.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e351db25.84cdc8",\r
+        "id": "7226ce6d.bf87d8",\r
          "type": "call",\r
          "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",\r
          "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3441.8837890625,\r
-        "y": 7438.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 2737.8836669921875,\r
+        "y": 7259.28564453125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bbb27c53.89e32",\r
+        "id": "56edb3ef.738a04",\r
          "type": "comment",\r
          "name": "START OF DELETE OPERATION",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3288.88330078125,\r
-        "y": 2897.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3296.88330078125,\r
+        "y": 2451.2857360839844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3023ae1c.6e2482",\r
+        "id": "3c54c8c2.c90b98",\r
          "type": "save",\r
          "name": "delete LEAF uni resource in AAI",\r
          "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3874.566650390625,\r
-        "y": 3087.283447265625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3880.566650390625,\r
+        "y": 2552.6858520507812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a4dfc5e6.4600f",\r
+        "id": "ebbe2f0a.10f36",\r
          "type": "save",\r
          "name": "get LEAF uni from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.LEAF.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.leafuni\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3245.566650390625,\r
-        "y": 3017.283447265625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3251.566650390625,\r
+        "y": 2532.6858520507812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3c4fb74b.12c308",\r
-                "cc5ca51c.d55828",\r
-                "10482aca.fa7bbd"\r
+                "2be68b52.20aa24",\r
+                "81d3f50b.6c4d9",\r
+                "2035d36a.c81f14"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cc5ca51c.d55828",\r
+        "id": "81d3f50b.6c4d9",\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": 2989.857421875,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3479.0576171875,\r
+        "y": 2505.2598266601562,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f3fff98e.f3e778"\r
+                "13ee2347.80286d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "10482aca.fa7bbd",\r
+        "id": "2035d36a.c81f14",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3468.566650390625,\r
-        "y": 3034.2833862304688,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3474.566650390625,\r
+        "y": 2549.685791015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "686bd6b1.dd501"\r
+                "991792d0.e4e98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f3fff98e.f3e778",\r
+        "id": "13ee2347.80286d",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3635.629150390625,\r
-        "y": 2989.1431274414062,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3641.629150390625,\r
+        "y": 2504.5455322265625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "686bd6b1.dd501",\r
+        "id": "991792d0.e4e98",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3636.566650390625,\r
-        "y": 3034.2833862304688,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3642.566650390625,\r
+        "y": 2549.685791015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3c4fb74b.12c308",\r
+        "id": "2be68b52.20aa24",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3480.566650390625,\r
-        "y": 3084.283447265625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3486.566650390625,\r
+        "y": 2599.6858520507812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9563229e.3fe02"\r
+                "f8565a8c.b30f28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9563229e.3fe02",\r
+        "id": "f8565a8c.b30f28",\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": 3087.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3638.88330078125,\r
+        "y": 2603.2857055664062,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f32c210.90e5fe",\r
-                "3023ae1c.6e2482",\r
-                "dfd78621.0c4df"\r
+                "133776d8.0b0dc9",\r
+                "3c54c8c2.c90b98",\r
+                "95fcacf8.b9d6a8",\r
+                "70f331ff.6983c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f32c210.90e5fe",\r
+        "id": "133776d8.0b0dc9",\r
          "type": "set",\r
          "name": "set bwToBeDecreased tpid cvlan",\r
          "xml": "<set>\n<parameter name='bwToBeDecreased' value=\"`$tmp.aai.leafuni.data-source`\" />\n<parameter name='tpid' value='`$tmp.aai.leafuni.tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.leafuni.cvlan`' />\n\n\n",\r
          "comments": "",\r
-        "x": 3877.566650390625,\r
-        "y": 3030.283447265625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3883.566650390625,\r
+        "y": 2495.6858520507812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4c9abbae.5d458c",\r
+        "id": "5f7e58ce.54f7f8",\r
          "type": "comment",\r
          "name": "Update ROOT UNI's bw",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3833.566650390625,\r
-        "y": 3193.083251953125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3845.566650390625,\r
+        "y": 2606.4857177734375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "547f08e5.b430b",\r
+        "id": "9cf7d79b.0475e8",\r
          "type": "save",\r
          "name": "update ROOT UNI in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4435.566650390625,\r
-        "y": 3298.083251953125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4523.566650390625,\r
+        "y": 2649.4857177734375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dfd78621.0c4df",\r
+        "id": "95fcacf8.b9d6a8",\r
          "type": "save",\r
          "name": "get root uni from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3825.56640625,\r
-        "y": 3239.083251953125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3837.56640625,\r
+        "y": 2652.4857177734375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "51d31fac.6dab6",\r
-                "d9c98a3d.c2af8",\r
-                "e932164d.0b10e8"\r
+                "8e888721.2a9c48",\r
+                "ad21a1a0.49ccd8",\r
+                "92e1736a.a036e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d9c98a3d.c2af8",\r
+        "id": "ad21a1a0.49ccd8",\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": 3211.6572265625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4141.057373046875,\r
+        "y": 2563.0596923828125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f1a39628.bdc748"\r
+                "b3d3b1a9.2b5fb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e932164d.0b10e8",\r
+        "id": "92e1736a.a036e",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4048.56640625,\r
-        "y": 3256.0831909179688,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4136.56640625,\r
+        "y": 2607.4856567382812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "dfc7b8eb.48de78"\r
+                "d5ecd5d7.ea0b88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f1a39628.bdc748",\r
+        "id": "b3d3b1a9.2b5fb",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4215.62890625,\r
-        "y": 3210.9429321289062,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4303.62890625,\r
+        "y": 2562.3453979492188,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dfc7b8eb.48de78",\r
+        "id": "d5ecd5d7.ea0b88",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 4216.56640625,\r
-        "y": 3256.0831909179688,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4304.56640625,\r
+        "y": 2607.4856567382812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dd0cc66d.fbf3a8",\r
+        "id": "70cc9613.b0a74",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4213.56640625,\r
-        "y": 3306.083251953125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4301.56640625,\r
+        "y": 2657.4857177734375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9a3f7682.b82b9",\r
-                "547f08e5.b430b"\r
+                "b767bcd4.bb2b6",\r
+                "9cf7d79b.0475e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51d31fac.6dab6",\r
+        "id": "8e888721.2a9c48",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4044.56640625,\r
-        "y": 3306.083251953125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4132.56640625,\r
+        "y": 2657.4857177734375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "dd0cc66d.fbf3a8"\r
+                "70cc9613.b0a74"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a3f7682.b82b9",\r
+        "id": "b767bcd4.bb2b6",\r
          "type": "set",\r
          "name": "set new bw",\r
          "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",\r
          "comments": "",\r
-        "x": 4395.567138671875,\r
-        "y": 3248.083251953125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 4483.567138671875,\r
+        "y": 2599.4857177734375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "998e4ab7.4d5be",\r
+        "id": "f9bbca0d.1c46f8",\r
          "type": "comment",\r
          "name": "Delete LEAF UNI",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3825.88330078125,\r
-        "y": 2971.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3831.88330078125,\r
+        "y": 2437.2857055664062,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "44b90aa0.b32f1c",\r
+        "id": "e994ec3a.2da648",\r
          "type": "set",\r
          "name": "set current-provider-id and current-cvlan-id",\r
          "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",\r
          "comments": "",\r
          "x": 3311.749969482422,\r
-        "y": 3750.483367919922,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3769.8858032226562,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2a719f3a.33348",\r
+        "id": "fbbab64f.85fdd8",\r
          "type": "call",\r
          "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
          "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3444.749969482422,\r
-        "y": 3798.483367919922,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3817.8858032226562,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "33975a1e.497a26",\r
+        "id": "33b02c47.fcccbc",\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": 3850.283416748047,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3869.6858520507812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6169e5ef.6af5c4",\r
-                "e3565ed9.a6bae8"\r
+                "6fdf1010.01d5e",\r
+                "10c0f7ca.be20e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6169e5ef.6af5c4",\r
+        "id": "6fdf1010.01d5e",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3459.749969482422,\r
-        "y": 3851.283416748047,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3870.6858520507812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3f7c202a.f0897"\r
+                "7864f46c.db26a4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3f7c202a.f0897",\r
+        "id": "7864f46c.db26a4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",\r
          "comments": "",\r
          "x": 3603.749969482422,\r
-        "y": 3847.483367919922,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3866.8858032226562,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e3565ed9.a6bae8",\r
+        "id": "10c0f7ca.be20e",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3463.749969482422,\r
-        "y": 3895.283416748047,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3914.6858520507812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "c54729aa.dea04"\r
+                "8add2f88.61a8b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c54729aa.dea04",\r
+        "id": "8add2f88.61a8b8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
@@ -3767,165 +3643,165 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 3602.749969482422,\r
-        "y": 3890.283416748047,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3909.6858520507812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "563cd7a4.5a9238",\r
-                "f2c9af7.5a8ebd",\r
-                "2a4d2a1b.ff481e"\r
+                "9b6852b0.a93d98",\r
+                "b900318c.bfd908",\r
+                "4cb0c066.1db128"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "563cd7a4.5a9238",\r
+        "id": "9b6852b0.a93d98",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3853.149627685547,\r
-        "y": 3898.800018310547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3918.2024536132812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ec034714.60ea58"\r
+                "54f58bcc.441714"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec034714.60ea58",\r
+        "id": "54f58bcc.441714",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4075.149627685547,\r
-        "y": 3876.800018310547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3896.2024536132812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e531db92.56031"\r
+                "7083e1.a84c342"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e531db92.56031",\r
+        "id": "7083e1.a84c342",\r
          "type": "outcome",\r
          "name": "uni",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4235.149139404297,\r
-        "y": 3856.800018310547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3876.2024536132812,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d94f5698.a9e22"\r
+                "94bd3415.1f22d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "717ee9f8.5f5168",\r
+        "id": "c56c894c.5bdb1",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 4388.149658203125,\r
-        "y": 3837.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3857.2024841308594,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "44024f46.b6d6d",\r
-                "8cf84976.9daac8"\r
+                "b6fdc844.b0e6b",\r
+                "1a640b2c.739935"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "44024f46.b6d6d",\r
+        "id": "b6fdc844.b0e6b",\r
          "type": "set",\r
          "name": "set tmp.stillHasUni to TRUE",\r
          "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",\r
          "comments": "",\r
          "x": 4584.649871826172,\r
-        "y": 3805.883270263672,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3825.2857055664062,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f2c9af7.5a8ebd",\r
+        "id": "b900318c.bfd908",\r
          "type": "set",\r
          "name": "set tmp.stillHasUn tmp.keepVPNBs to FALSE",\r
          "xml": "<set>\n<parameter name='tmp.stillHasUni' value='false' />\n<parameter name='tmp.keepVPNBs' value='false' />\n",\r
          "comments": "",\r
          "x": 3959.64990234375,\r
-        "y": 3817.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3837.2857360839844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2a4d2a1b.ff481e",\r
+        "id": "4cb0c066.1db128",\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": 4238.883544921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4258.285980224609,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "39fb0c16.c2b2c4",\r
-                "808499cb.5bf588"\r
+                "ae543eb1.206b4",\r
+                "219c19f6.cbd26e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8cf84976.9daac8",\r
+        "id": "1a640b2c.739935",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
          "x": 4552.88330078125,\r
-        "y": 3873.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3893.2857360839844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "808499cb.5bf588",\r
+        "id": "219c19f6.cbd26e",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 154.65066528320312,\r
-        "y": 5302.8837890625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5322.286224365234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "7018ac1a.7a3c7c"\r
+                "2520c605.40a22a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "39fb0c16.c2b2c4",\r
+        "id": "ae543eb1.206b4",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3988.650634765625,\r
-        "y": 4340.883544921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4360.285980224609,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "a235b563.2e3c2"\r
+                "8fd13dc7.dbef3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a235b563.2e3c2",\r
+        "id": "8fd13dc7.dbef3",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
@@ -3933,208 +3809,209 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 4131.650634765625,\r
-        "y": 4336.883544921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4356.285980224609,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ca74ec50.92ce48",\r
-                "76172197.657ac",\r
-                "2a3f4733.a29bc",\r
-                "c850b8e4.0504c8",\r
-                "46570b89.8afbb4",\r
-                "819543bf.270a9",\r
-                "ca7e6690.5ab92",\r
-                "26004944.36227e"\r
+                "6c48a46d.6b2974",\r
+                "de8af5e.f07e288",\r
+                "5285a28b.38c8dc",\r
+                "2212222d.1721a6",\r
+                "b943d622.b35cc",\r
+                "467c3bf.71cfdc4",\r
+                "cdd12e42.2ba1b8",\r
+                "7f0c132f.b1df44",\r
+                "dc36b830.307698"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d4f67a6.1fc128",\r
+        "id": "86b26306.89d478",\r
          "type": "comment",\r
          "name": "keepVPNBs == false, then check tmp.stillHasUni",\r
-        "info": "(2) keepVPNBs == false, means there are no other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\ncheck if tmp.stillHasUni is True or False?\n\nif TRUE --> means this domain (connectivity) still has other UNIs\n- delete VPNBs\n- delete LEAF UNI in AAI -- DONE\n- upadte bw in ROOT UNI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC\n- change ROOT conn status to Modified\n\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
+        "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": 5258.8837890625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5278.286224365234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cbdd9201.8f12c8",\r
+        "id": "10b960d7.987777",\r
          "type": "comment",\r
          "name": "There are still other UNIs in this connectivity that share same OLT node. Only update bw of the vpn-bindings involved",\r
          "info": "(1) keepVPNBs == true, means there are still other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\n- Only update bw of the vpn-bindings involved -- DONE\n- upadte bw in ROOT UNI -- DONE\n- change ROOT conn status to Modified -- DONE\n- delete LEAF UNI in AAI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC -- DONE\n- DON'T delete the connectivities of LEAF and ROOT -- DONE\nAlso update the ethernet services",\r
          "comments": "",\r
          "x": 4007.884033203125,\r
-        "y": 4303.883544921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4323.285980224609,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3d91414.090028",\r
+        "id": "e29766c.069bc98",\r
          "type": "set",\r
          "name": "set srcTtp OTN layer",\r
          "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",\r
          "comments": "",\r
          "x": 4820.667724609375,\r
-        "y": 4494.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4514.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8bf6af15.0a9a48",\r
+        "id": "70e9715b.943958",\r
          "type": "switchNode",\r
          "name": "switch provider-id domainA",\r
          "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5165.667724609375,\r
-        "y": 4356.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4376.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "8859d6ca.2f75b8"\r
+                "6e757b83.cb351c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c067ba23.0c8be",\r
+        "id": "b42b3ac.1b570c8",\r
          "type": "for",\r
          "name": "for netwidx..allNetworksList_length",\r
          "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4872.667724609375,\r
-        "y": 4350.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4370.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "8bf6af15.0a9a48"\r
+                "70e9715b.943958"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2da7141c.ae03fc",\r
+        "id": "b4fe4da5.f121d",\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": 4307.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4327.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1cbc0879.d4095",\r
+        "id": "574f0028.fbd13",\r
          "type": "set",\r
          "name": "unset parameters",\r
          "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
          "comments": "",\r
          "x": 4816.667724609375,\r
-        "y": 4402.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4422.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "faedf550.ca72d",\r
+        "id": "d130fc75.80466",\r
          "type": "set",\r
          "name": "set tmp.pce-src-node",\r
          "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",\r
          "comments": "",\r
          "x": 4824.667724609375,\r
-        "y": 4447.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4467.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1b550765.eaf4d1",\r
+        "id": "84c9d585.1543d",\r
          "type": "set",\r
          "name": "unset otnTopoIdSrc",\r
          "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
          "comments": "",\r
          "x": 4821.667724609375,\r
-        "y": 4300.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4320.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8859d6ca.2f75b8",\r
+        "id": "6e757b83.cb351c",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5074.667724609375,\r
-        "y": 4424.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4444.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b9fd6938.f76ca8"\r
+                "c54be700.be4fd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9fd6938.f76ca8",\r
+        "id": "c54be700.be4fd",\r
          "type": "switchNode",\r
          "name": "switch te-topo-id",\r
          "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5259.667724609375,\r
-        "y": 4423.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4443.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d7c2d227.430278"\r
+                "820246eb.c84c18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d7c2d227.430278",\r
+        "id": "820246eb.c84c18",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5451.667724609375,\r
-        "y": 4426.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4446.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9062d4ad.31e34"\r
+                "3a1b08b9.047658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9062d4ad.31e34",\r
+        "id": "3a1b08b9.047658",\r
          "type": "set",\r
          "name": "set otnTopoIdSrc",\r
          "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
          "comments": "",\r
          "x": 5623.667724609375,\r
-        "y": 4422.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4442.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c312f389.231768",\r
+        "id": "c9b94557.850d48",\r
          "type": "call",\r
          "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",\r
          "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4999.667724609375,\r
-        "y": 4537.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4557.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ca74ec50.92ce48",\r
+        "id": "6c48a46d.6b2974",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -4142,232 +4019,232 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 4516.667724609375,\r
-        "y": 4322.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4342.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3f12b93a.0cf81e",\r
-                "24786620.817bb2",\r
-                "1cbc0879.d4095",\r
-                "faedf550.ca72d",\r
-                "a3d91414.090028",\r
-                "c067ba23.0c8be",\r
-                "c312f389.231768"\r
+                "2a754e6c.bbb83a",\r
+                "94fc5eb6.895cc",\r
+                "574f0028.fbd13",\r
+                "d130fc75.80466",\r
+                "e29766c.069bc98",\r
+                "b42b3ac.1b570c8",\r
+                "c9b94557.850d48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1877ba6b.c5c236",\r
+        "id": "cd78afa3.c104f8",\r
          "type": "comment",\r
          "name": "The following section is to find srcTtp OTN layer (its long name)",\r
          "info": "The following section is to find srcTtp OTN layer (its long name)",\r
          "comments": "",\r
          "x": 4501.667724609375,\r
-        "y": 4256.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4276.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24786620.817bb2",\r
+        "id": "94fc5eb6.895cc",\r
          "type": "get-resource",\r
          "name": "get-resource network-resources-list",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4880.667724609375,\r
-        "y": 4243.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4263.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "c082f0f0.3fe63",\r
-                "8aa79b73.5d91b",\r
-                "2da7141c.ae03fc"\r
+                "17a57be5.3979b4",\r
+                "670b39d7.0b3ba",\r
+                "b4fe4da5.f121d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c082f0f0.3fe63",\r
+        "id": "17a57be5.3979b4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5116.667724609375,\r
-        "y": 4226.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4246.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8aa79b73.5d91b",\r
+        "id": "670b39d7.0b3ba",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5113.667724609375,\r
-        "y": 4267.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4287.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3f12b93a.0cf81e",\r
+        "id": "2a754e6c.bbb83a",\r
          "type": "set",\r
          "name": "unset parameters",\r
          "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
          "comments": "",\r
          "x": 4829.667724609375,\r
-        "y": 4200.6669921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4220.069427490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "76172197.657ac",\r
+        "id": "de8af5e.f07e288",\r
          "type": "set",\r
          "name": "unset tmp.aai.all-vpn-bindings",\r
          "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",\r
          "comments": "",\r
          "x": 4336.667724609375,\r
-        "y": 4655.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4674.469329833984,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d9693eef.d5133",\r
+        "id": "afb6c845.26534",\r
          "type": "comment",\r
          "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",\r
          "info": "",\r
          "comments": "",\r
          "x": 4459.968017578125,\r
-        "y": 4694.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4713.469329833984,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2a3f4733.a29bc",\r
+        "id": "5285a28b.38c8dc",\r
          "type": "save",\r
          "name": "get all-vpn-bindings from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4357.968017578125,\r
-        "y": 4729.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4748.469329833984,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e8babd58.4782b",\r
-                "e0bbecb2.837888",\r
-                "bb53595.0530328"\r
+                "c3de387c.6460a",\r
+                "b57ba7f8.c1c99",\r
+                "9da86502.5d643"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e8babd58.4782b",\r
+        "id": "c3de387c.6460a",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4562.968017578125,\r
-        "y": 4726.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4745.469329833984,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "8299b116.2a1f1"\r
+                "4e1f19c.9621d68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e0bbecb2.837888",\r
+        "id": "b57ba7f8.c1c99",\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": 4787.640930175781,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4807.043365478516,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "af952dc7.60185"\r
+                "ec0e24f9.a11f7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bb53595.0530328",\r
+        "id": "9da86502.5d643",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4543.968017578125,\r
-        "y": 4831.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4850.469329833984,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "a2d64007.4e8e68"\r
+                "182c3589.c7acda"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8299b116.2a1f1",\r
+        "id": "4e1f19c.9621d68",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 4730.96826171875,\r
-        "y": 4721.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4740.469329833984,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "575eea2a.c26ae4"\r
+                "af4afceb.006698"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "af952dc7.60185",\r
+        "id": "ec0e24f9.a11f7",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
          "x": 4709.0303955078125,\r
-        "y": 4787.926666259766,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4807.3291015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a2d64007.4e8e68",\r
+        "id": "182c3589.c7acda",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
          "x": 4710.968017578125,\r
-        "y": 4830.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4849.469329833984,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "575eea2a.c26ae4",\r
+        "id": "af4afceb.006698",\r
          "type": "for",\r
          "name": "for vpnidx in all-vpn-bindings",\r
          "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4968.96826171875,\r
-        "y": 4726.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4745.469329833984,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b0cdcdcc.86b948"\r
+                "31f75628.5330d2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b0cdcdcc.86b948",\r
+        "id": "31f75628.5330d2",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
@@ -4375,288 +4252,288 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 5202.968017578125,\r
-        "y": 4733.06689453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4752.469329833984,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "fe17da41.8d7458"\r
+                "ceae5964.7d9d38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63f7f511.d89814",\r
+        "id": "b40ed0f.db80e3",\r
          "type": "comment",\r
          "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
          "info": "",\r
          "comments": "",\r
-        "x": 5188.784423828125,\r
-        "y": 4955.2333984375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5119.783935546875,\r
+        "y": 4823.635650634766,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fe17da41.8d7458",\r
+        "id": "ceae5964.7d9d38",\r
          "type": "switchNode",\r
          "name": "switch ops-note is srcTtpOtnLayer",\r
          "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5221.784423828125,\r
-        "y": 5023.2333984375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5063.783935546875,\r
+        "y": 4872.635650634766,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "adceca9b.52be78",\r
-                "6371c80.a864db8"\r
+                "5a8ad6ff.27624",\r
+                "4b278311.73bb1c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6371c80.a864db8",\r
+        "id": "4b278311.73bb1c",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5465.784454345703,\r
-        "y": 4995.233184814453,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5306.784423828125,\r
+        "y": 4913.635162353516,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "adceca9b.52be78",\r
+        "id": "5a8ad6ff.27624",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5346.784423828125,\r
-        "y": 4921.233154296875,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5317.7841796875,\r
+        "y": 4870.6353759765625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "eabe2b02.0bc13"\r
+                "e95ba342.193f38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eabe2b02.0bc13",\r
+        "id": "9b07993f.50303",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5473.767822265625,\r
-        "y": 4859.649658203125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5544.767578125,\r
+        "y": 4878.0518798828125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b15dfc5.1130d",\r
-                "7054ba61.11f874",\r
-                "e5483e65.23a9a"\r
+                "574e2cd3.b5ba0c",\r
+                "e0ae9339.0aa92",\r
+                "e02f1f89.ad2d2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "771d8350.1c0644",\r
+        "id": "c3321d25.6b65f",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5709.8173828125,\r
-        "y": 4743.64990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4763.052337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3a42df45.8a578"\r
+                "88b3d964.1a518"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3a42df45.8a578",\r
+        "id": "88b3d964.1a518",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5901.8173828125,\r
-        "y": 4732.650146484375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4752.052581787109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f5feb746.9bcea8"\r
+                "949f67cc.1ebd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b15dfc5.1130d",\r
+        "id": "574e2cd3.b5ba0c",\r
          "type": "set",\r
          "name": "unset tmp.aai.the-vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",\r
          "comments": "",\r
          "x": 5658.334228515625,\r
-        "y": 4633.866943359375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4653.269378662109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7054ba61.11f874",\r
+        "id": "e0ae9339.0aa92",\r
          "type": "set",\r
          "name": "set tmp.aai.the-vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
          "comments": "",\r
          "x": 5650.334228515625,\r
-        "y": 4682.866943359375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4702.269378662109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e5483e65.23a9a",\r
+        "id": "e02f1f89.ad2d2",\r
          "type": "save",\r
          "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' />\n<parameter name='operational-status' value='Modified' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5881.751220703125,\r
-        "y": 4864.032958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4883.435394287109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c01f7460.fab75",\r
+        "id": "2481a087.0bf1c",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5833.401123046875,\r
-        "y": 4911.349853515625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4930.752288818359,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a637b405.b076f",\r
+        "id": "f95d52e7.62b688",\r
          "type": "comment",\r
          "name": "decrease the bw of the-vpn-binding and change status to modified",\r
          "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",\r
          "comments": "",\r
          "x": 5905.751220703125,\r
-        "y": 4825.032958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4844.435394287109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f5feb746.9bcea8",\r
+        "id": "949f67cc.1ebd",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 6083.8173828125,\r
-        "y": 4711.650146484375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4731.052581787109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "4f7dc832.d994c8"\r
+                "121ace63.3c455a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4f7dc832.d994c8",\r
+        "id": "121ace63.3c455a",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 6245.8173828125,\r
-        "y": 4700.650146484375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4720.052581787109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f7240b03.b46408",\r
-                "a1eea84d.7200b"\r
+                "776f73a4.7e64dc",\r
+                "1667f272.dd2c96"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7240b03.b46408",\r
+        "id": "776f73a4.7e64dc",\r
          "type": "set",\r
          "name": "unset tmp.the-connectivity",\r
          "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",\r
          "comments": "",\r
          "x": 6442.8173828125,\r
-        "y": 4629.650146484375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4649.052581787109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a1eea84d.7200b",\r
+        "id": "1667f272.dd2c96",\r
          "type": "set",\r
          "name": "set tmp.the-connectivity",\r
          "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",\r
          "comments": "",\r
          "x": 6440.2841796875,\r
-        "y": 4728.866943359375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4748.269378662109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ce0d81bd.d28a7",\r
+        "id": "7162acbd.73776c",\r
          "type": "call",\r
          "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",\r
          "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3097.800048828125,\r
-        "y": 3187.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3207.0857849121094,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7f04acf4.5afc3c",\r
+        "id": "2683d5ea.5fda52",\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": 3297.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3317.0857849121094,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d1c2eeb4.215af8",\r
-                "f1f6bb53.ccd5d8"\r
+                "111b3018.d0a418",\r
+                "b6f13f54.b0b718"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d1c2eeb4.215af8",\r
+        "id": "111b3018.d0a418",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3158.800048828125,\r
-        "y": 3276.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3296.0857849121094,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d53b6d30.115bd"\r
+                "d9364482.82062"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d53b6d30.115bd",\r
+        "id": "d9364482.82062",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
@@ -4664,43 +4541,43 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 3301.800048828125,\r
-        "y": 3276.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3296.0857849121094,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "5f773b5f.84092c"\r
+                "cf188c9f.ecc3c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f773b5f.84092c",\r
+        "id": "cf188c9f.ecc3c8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",\r
          "comments": "",\r
          "x": 3477.800048828125,\r
-        "y": 3274.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3294.0857849121094,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1f6bb53.ccd5d8",\r
+        "id": "b6f13f54.b0b718",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3156.800048828125,\r
-        "y": 3331.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3351.0857849121094,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e42ba1d9.fa7b7"\r
+                "fa2c2e9e.fbd89"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e42ba1d9.fa7b7",\r
+        "id": "fa2c2e9e.fbd89",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
@@ -4708,216 +4585,216 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 3003.800048828125,\r
-        "y": 3464.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3484.0857849121094,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "44b90aa0.b32f1c",\r
-                "2a719f3a.33348",\r
-                "33975a1e.497a26",\r
-                "c19f56be.5aa798",\r
-                "eb35e3d0.6d25d",\r
-                "5aebe180.f62f68"\r
+                "e994ec3a.2da648",\r
+                "fbbab64f.85fdd8",\r
+                "33b02c47.fcccbc",\r
+                "e05b8262.c1f5c8",\r
+                "b8b4eeda.6b348",\r
+                "3a07e59d.95a52a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c85f7ca.d8c4a",\r
+        "id": "aa1b84fb.ddf7b",\r
          "type": "comment",\r
          "name": "Find LEAF connectivity",\r
          "info": "",\r
          "comments": "",\r
          "x": 3225.88330078125,\r
-        "y": 3704.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3724.2857360839844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c19f56be.5aa798",\r
+        "id": "e05b8262.c1f5c8",\r
          "type": "set",\r
          "name": "set tmp.MMstillHasUni to FALSE",\r
          "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='false' />\n",\r
          "comments": "",\r
          "x": 3308.333251953125,\r
-        "y": 3477.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3497.0857849121094,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb35e3d0.6d25d",\r
+        "id": "b8b4eeda.6b348",\r
          "type": "for",\r
          "name": "for each relationship of middle-man-conn",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3306.8330078125,\r
-        "y": 3523.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3543.0025329589844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ca4bb58e.913108"\r
+                "28597309.d39dac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ca4bb58e.913108",\r
+        "id": "28597309.d39dac",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3569.8330078125,\r
-        "y": 3518.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3538.0025329589844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "468a474d.40c4d8"\r
+                "d8dec514.e87428"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "468a474d.40c4d8",\r
+        "id": "d8dec514.e87428",\r
          "type": "outcome",\r
          "name": "uni",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3729.83251953125,\r
-        "y": 3498.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3518.0025329589844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e61de8ad.7030f"\r
+                "5a2012d5.a1cef4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3444ada9.d2b992",\r
+        "id": "3416f94d.d55766",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4498.833740234375,\r
-        "y": 3533.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5066.834228515625,\r
+        "y": 3549.0025634765625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "7b31b3f.9c4444c",\r
-                "31b46b09.5b560c",\r
-                "a9c3a9a9.0f7c28"\r
+                "d47c10e5.abb1a",\r
+                "37972450.3f34e4",\r
+                "9d62dddf.19f4b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7b31b3f.9c4444c",\r
+        "id": "d47c10e5.abb1a",\r
          "type": "set",\r
          "name": "set tmp.MMstillHasUni to TRUE",\r
          "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='true' />\n",\r
          "comments": "",\r
-        "x": 4738.334228515625,\r
-        "y": 3482.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5306.334716796875,\r
+        "y": 3498.0858154296875,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "31b46b09.5b560c",\r
+        "id": "37972450.3f34e4",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 4671.567657470703,\r
-        "y": 3555.683380126953,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5239.568145751953,\r
+        "y": 3571.0858459472656,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dbe78677.7f04b8",\r
+        "id": "81bb4a2a.7bc33",\r
          "type": "comment",\r
          "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",\r
          "info": "",\r
          "comments": "",\r
          "x": 4432.88427734375,\r
-        "y": 5085.883544921875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5105.285980224609,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c850b8e4.0504c8",\r
+        "id": "2212222d.1721a6",\r
          "type": "set",\r
          "name": "set tmp.leafconn.",\r
          "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",\r
          "comments": "",\r
          "x": 4331.317138671875,\r
-        "y": 5137.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5157.202484130859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ca7e6690.5ab92",\r
+        "id": "cdd12e42.2ba1b8",\r
          "type": "call",\r
          "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
          "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4482.317138671875,\r
-        "y": 5580.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5600.202484130859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "26004944.36227e",\r
+        "id": "7f0c132f.b1df44",\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": 5647.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5667.202484130859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "c57768ca.7a8088",\r
-                "7224490d.b02598"\r
+                "926aab17.e275a",\r
+                "bc8bcaa1.d641e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c57768ca.7a8088",\r
+        "id": "926aab17.e275a",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4562.317138671875,\r
-        "y": 5632.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5652.202484130859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "25615183.2d4bd6"\r
+                "749c0d73.9fee4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7224490d.b02598",\r
+        "id": "bc8bcaa1.d641e8",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4558.317138671875,\r
-        "y": 5680.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5700.202484130859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "5dcdd7b9.89499"\r
+                "49001f8f.249f28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "25615183.2d4bd6",\r
+        "id": "749c0d73.9fee4c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
@@ -4925,116 +4802,116 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 4718.317138671875,\r
-        "y": 5628.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5648.202484130859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9b98cd10.6cfb68"\r
+                "17e137f7.f9138"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5dcdd7b9.89499",\r
+        "id": "49001f8f.249f28",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
          "comments": "",\r
          "x": 4706.317138671875,\r
-        "y": 5675.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5695.202484130859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f97c958c.da83b8",\r
+        "id": "e9eb95a.e0ce568",\r
          "type": "set",\r
          "name": "set tmp.rootconn.",\r
          "xml": "<set>\n<parameter name='tmp.rootconn.' value=\"`$tmp.aai.ROOT.connectivity.`\" />\n\n\n",\r
          "comments": "",\r
          "x": 5138.3173828125,\r
-        "y": 5570.800048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5590.202484130859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "903178c6.839788",\r
+        "id": "7c03a888.d651",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",\r
          "comments": "",\r
          "x": 4540.734130859375,\r
-        "y": 5167.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5186.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "46570b89.8afbb4",\r
+        "id": "b943d622.b35cc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 4311.734130859375,\r
-        "y": 5256.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5275.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "903178c6.839788",\r
-                "42c91ccf.e64244"\r
+                "7c03a888.d651",\r
+                "741f789d.c1701"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "42c91ccf.e64244",\r
+        "id": "741f789d.c1701",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4547.734130859375,\r
-        "y": 5249.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5268.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "30eabd9c.98c532",\r
-                "66fbb0fb.26a3f",\r
-                "fbd21163.a12cd8"\r
+                "8e631709.9703e",\r
+                "67d67460.c609e4",\r
+                "d648c0fa.0b77a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30eabd9c.98c532",\r
+        "id": "8e631709.9703e",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4743.2342529296875,\r
-        "y": 5201.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5220.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "26c5ac0c.2065fc"\r
+                "557dbe85.6b2148"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "66fbb0fb.26a3f",\r
+        "id": "67d67460.c609e4",\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": 5256.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5275.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "a0a0372d.9d324"\r
+                "5bf448c8.1a6988"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26c5ac0c.2065fc",\r
+        "id": "557dbe85.6b2148",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -5042,219 +4919,219 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 4887.6165771484375,\r
-        "y": 5200.739410400391,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5220.141845703125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "40d1dc2e.899afc"\r
+                "fe2fb306.35f718"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40d1dc2e.899afc",\r
+        "id": "fe2fb306.35f718",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5071.734130859375,\r
-        "y": 5199.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5218.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "137e1346.633fe5"\r
+                "623662a6.321084"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "137e1346.633fe5",\r
+        "id": "623662a6.321084",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5266.734130859375,\r
-        "y": 5199.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5218.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "19ce94ba.82e9d3"\r
+                "e938fab.b235908"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fbd21163.a12cd8",\r
+        "id": "d648c0fa.0b77a8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4740.2342529296875,\r
-        "y": 5313.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5332.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "4a6cd196.293db"\r
+                "b12af343.8616c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a6cd196.293db",\r
+        "id": "b12af343.8616c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 4892.2342529296875,\r
-        "y": 5314.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5333.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a0a0372d.9d324",\r
+        "id": "5bf448c8.1a6988",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 4903.2342529296875,\r
-        "y": 5257.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5276.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1398b0a6.59adbf",\r
+        "id": "45e37676.b3ae38",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 5648.734130859375,\r
-        "y": 5203.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5222.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ac703b64.91e208",\r
-                "60a60a9a.326334",\r
-                "feb4d66b.8d20f"\r
+                "ab290c95.7c31f8",\r
+                "9018bd5e.6b648",\r
+                "b0b7686a.f22a48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "19ce94ba.82e9d3",\r
+        "id": "e938fab.b235908",\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": 5203.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5222.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "1398b0a6.59adbf"\r
+                "45e37676.b3ae38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60a60a9a.326334",\r
+        "id": "9018bd5e.6b648",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5854.734130859375,\r
-        "y": 5216.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5235.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9885a0c6.ee00f8",\r
-                "a77a3d25.4123b",\r
-                "3b9ca266.b8d5f6"\r
+                "6880c853.571ac",\r
+                "27b0dc8.dc2bca4",\r
+                "88c18631.ac0cc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ac703b64.91e208",\r
+        "id": "ab290c95.7c31f8",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domain id",\r
          "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
          "x": 5884.734130859375,\r
-        "y": 5164.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5183.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9885a0c6.ee00f8",\r
+        "id": "6880c853.571ac",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 6064.734130859375,\r
-        "y": 5207.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5226.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "fd819e5.0208ae"\r
+                "23e6d39c.ca6f94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a77a3d25.4123b",\r
+        "id": "27b0dc8.dc2bca4",\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": 5262.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5281.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9503eaf8.25455"\r
+                "c0508cff.258128"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3b9ca266.b8d5f6",\r
+        "id": "88c18631.ac0cc8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 6061.734130859375,\r
-        "y": 5319.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5338.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "2f6c8ed.964c6f2"\r
+                "9fe983fa.692458"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2f6c8ed.964c6f2",\r
+        "id": "9fe983fa.692458",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 6213.734130859375,\r
-        "y": 5320.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5339.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9503eaf8.25455",\r
+        "id": "c0508cff.258128",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 6224.734130859375,\r
-        "y": 5265.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5284.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fd819e5.0208ae",\r
+        "id": "23e6d39c.ca6f94",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -5262,82 +5139,82 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 6209.116455078125,\r
-        "y": 5204.739410400391,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5224.141845703125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "fdf4316f.fecc18"\r
+                "e1b89291.825068"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fdf4316f.fecc18",\r
+        "id": "e1b89291.825068",\r
          "type": "set",\r
          "name": "set controller domain data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
          "x": 6423.734130859375,\r
-        "y": 5201.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5220.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "feb4d66b.8d20f",\r
+        "id": "b0b7686a.f22a48",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
          "x": 5804.734130859375,\r
-        "y": 5280.083740234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5299.486175537109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "819543bf.270a9",\r
+        "id": "467c3bf.71cfdc4",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4453.234375,\r
-        "y": 5360.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5380.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "fe68d2f2.044a28",\r
-                "9d6b0bdc.79122"\r
+                "475456de.095b28",\r
+                "e46dba62.d133c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe68d2f2.044a28",\r
+        "id": "475456de.095b28",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4813.734130859375,\r
-        "y": 5368.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5388.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "dd8bd538.48e76"\r
+                "e4100738.bedad8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dd8bd538.48e76",\r
+        "id": "e4100738.bedad8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
          "comments": "",\r
          "x": 4971.734130859375,\r
-        "y": 5368.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5388.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "17aac5bf.8ce3ca",\r
+        "id": "2c862c6c.12858c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
@@ -5345,97 +5222,97 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 4975.234130859375,\r
-        "y": 5408.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5428.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9d6b0bdc.79122",\r
+        "id": "e46dba62.d133c8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4817.734130859375,\r
-        "y": 5408.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5428.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "17aac5bf.8ce3ca"\r
+                "2c862c6c.12858c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "67f63093.820248",\r
+        "id": "4be3ffba.2e7d2",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 5126.451171875,\r
-        "y": 5622.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5642.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9523ac21.fb27e8",\r
-                "ee545a84.5a0b8"\r
+                "6bb3bb26.aa81b4",\r
+                "1977e509.6db2ab"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ee545a84.5a0b8",\r
+        "id": "1977e509.6db2ab",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5368.450927734375,\r
-        "y": 5572.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5592.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3e67e67b.64c0f2",\r
-                "83fa1a94.1fdef",\r
-                "8d7d3b80.341b3"\r
+                "b10ef966.1e9bd8",\r
+                "14377f23.b76f19",\r
+                "338fe6b.9e69f9a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3e67e67b.64c0f2",\r
+        "id": "b10ef966.1e9bd8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5563.951171875,\r
-        "y": 5506.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5526.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "4b842a3.ce68254"\r
+                "ca399707.489dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "83fa1a94.1fdef",\r
+        "id": "14377f23.b76f19",\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": 5562.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5582.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "fe24638.108ff2"\r
+                "9a688c1c.979b18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4b842a3.ce68254",\r
+        "id": "ca399707.489dc",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -5443,114 +5320,114 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 5708.3333740234375,\r
-        "y": 5524.339019775391,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5543.741455078125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "471b8aca.2d2d8c"\r
+                "518bb115.3e1828"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "471b8aca.2d2d8c",\r
+        "id": "518bb115.3e1828",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5892.450927734375,\r
-        "y": 5522.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5542.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "835403d4.ab8a4"\r
+                "a95efbd.96c1f88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8d7d3b80.341b3",\r
+        "id": "338fe6b.9e69f9a",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5569.951171875,\r
-        "y": 5607.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5627.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "dbe8e8e2.82532"\r
+                "2bd9cd74.b57772"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dbe8e8e2.82532",\r
+        "id": "2bd9cd74.b57772",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 5748.951171875,\r
-        "y": 5623.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5643.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fe24638.108ff2",\r
+        "id": "9a688c1c.979b18",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 5730.951171875,\r
-        "y": 5575.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5595.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "23127469.8e053c",\r
+        "id": "a5be160b.7233f8",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Delete UNI of ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.rootconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.ROOT.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5279.951171875,\r
-        "y": 5678.282958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5697.685394287109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "2dc53207.e6e746",\r
-                "5dfbf094.3dd5e"\r
+                "21841842.1d8ad8",\r
+                "25d11f87.0e38d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2dc53207.e6e746",\r
+        "id": "21841842.1d8ad8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5628.451171875,\r
-        "y": 5660.282958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5679.685394287109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d62622e9.977188"\r
+                "77a65248.1f8454"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d62622e9.977188",\r
+        "id": "77a65248.1f8454",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
          "comments": "",\r
          "x": 5884.451171875,\r
-        "y": 5663.282958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5682.685394287109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b15c93b0.c4d298",\r
+        "id": "36c31917.4e963e",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
@@ -5558,190 +5435,190 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 5836.951171875,\r
-        "y": 5704.282958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5723.685394287109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5dfbf094.3dd5e",\r
+        "id": "25d11f87.0e38d",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5638.451171875,\r
-        "y": 5709.282958984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5728.685394287109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b15c93b0.c4d298"\r
+                "36c31917.4e963e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9523ac21.fb27e8",\r
+        "id": "6bb3bb26.aa81b4",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.rootconn.access-provider-id + '-clientId-' +\n                                                   $tmp.rootconn.access-client-id + '-topologyId-' +\n                                                   $tmp.rootconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.rootconn.access-node-id`\" />\n",\r
          "comments": "",\r
          "x": 5361.450927734375,\r
-        "y": 5490.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5510.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "835403d4.ab8a4",\r
+        "id": "a95efbd.96c1f88",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 6087.450927734375,\r
-        "y": 5522.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5542.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "44025b35.70e694"\r
+                "5b53283.237bd58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "defb6a74.ad63a8",\r
+        "id": "32954f05.a0f998",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 6469.450927734375,\r
-        "y": 5526.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5546.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f54f4ae0.ec5cf",\r
-                "af149106.171db",\r
-                "c5fc8f53.576908"\r
+                "77ce96c2.5602e8",\r
+                "3fe633a6.1c94b4",\r
+                "2e5333ff.9beaf4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "44025b35.70e694",\r
+        "id": "5b53283.237bd58",\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": 5526.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5546.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "defb6a74.ad63a8"\r
+                "32954f05.a0f998"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "af149106.171db",\r
+        "id": "3fe633a6.1c94b4",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 6675.450927734375,\r
-        "y": 5539.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5559.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "c7dae6ee.db5f08",\r
-                "40d56e1d.9aacd",\r
-                "1547569.25d2329"\r
+                "6653ee89.119c48",\r
+                "90d289d3.d64128",\r
+                "65b6f2f3.cb40dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f54f4ae0.ec5cf",\r
+        "id": "77ce96c2.5602e8",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domain id",\r
          "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
          "x": 6705.450927734375,\r
-        "y": 5487.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5507.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c7dae6ee.db5f08",\r
+        "id": "6653ee89.119c48",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 6885.450927734375,\r
-        "y": 5530.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5550.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f0410cd5.fae628"\r
+                "e4a1281d.94a088"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40d56e1d.9aacd",\r
+        "id": "90d289d3.d64128",\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": 5585.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5605.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "76b0a417.e1276c"\r
+                "c0981577.68ad28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1547569.25d2329",\r
+        "id": "65b6f2f3.cb40dc",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 6882.450927734375,\r
-        "y": 5642.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5662.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b3783d48.7ea6c8"\r
+                "9cc01382.31d9c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b3783d48.7ea6c8",\r
+        "id": "9cc01382.31d9c8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 7034.450927734375,\r
-        "y": 5643.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5663.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "76b0a417.e1276c",\r
+        "id": "c0981577.68ad28",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 7045.450927734375,\r
-        "y": 5588.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5608.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f0410cd5.fae628",\r
+        "id": "e4a1281d.94a088",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -5749,38 +5626,38 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 7029.833251953125,\r
-        "y": 5528.339019775391,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5547.741455078125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "4ccba011.1ac588"\r
+                "e0ec5a36.3fa468"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4ccba011.1ac588",\r
+        "id": "e0ec5a36.3fa468",\r
          "type": "set",\r
          "name": "set controller domain data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
          "x": 7244.450927734375,\r
-        "y": 5524.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5544.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c5fc8f53.576908",\r
+        "id": "2e5333ff.9beaf4",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
          "x": 6625.450927734375,\r
-        "y": 5603.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5623.085784912109,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e61de8ad.7030f",\r
+        "id": "5a2012d5.a1cef4",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -5788,77 +5665,77 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 3854.88330078125,\r
-        "y": 3492.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3512.2857360839844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f1f60f7b.897558",\r
-                "9394ecba.bbac2"\r
+                "2e4356c1.85e5c2",\r
+                "817ee67a.98bbb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f1f60f7b.897558",\r
+        "id": "2e4356c1.85e5c2",\r
          "type": "set",\r
          "name": "set tmp.mmUNI-id-long",\r
          "xml": "<set>\n<parameter name='tmp.mmUNI-id-long' value='`$middle-man-conn.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",\r
          "comments": "",\r
          "x": 4045.466552734375,\r
-        "y": 3435.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3455.0857849121094,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9394ecba.bbac2",\r
+        "id": "817ee67a.98bbb8",\r
          "type": "switchNode",\r
          "name": "switch tmp.mmUNI-id-long != ROOT UNI",\r
          "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.ROOT.uni-p-interface-long`\">\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4092.466552734375,\r
-        "y": 3506.683349609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3526.0857849121094,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "62b44b4b.e9462c",\r
-                "2e901346.daa35c"\r
+                "eff8b608.f4ac8",\r
+                "aeb603b8.1d9588"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "62b44b4b.e9462c",\r
+        "id": "eff8b608.f4ac8",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4330.884033203125,\r
-        "y": 3465.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3485.2857360839844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "646ee476.4b949c"\r
+                "bb88d9bc.29cfc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e901346.daa35c",\r
+        "id": "aeb603b8.1d9588",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4337.884246826172,\r
-        "y": 3522.883270263672,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3542.2857055664062,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3444ada9.d2b992"\r
+                "c59416d6.8ba4c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "646ee476.4b949c",\r
+        "id": "bb88d9bc.29cfc",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -5866,126 +5743,126 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 4458.884521484375,\r
-        "y": 3461.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3481.2857360839844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5aebe180.f62f68",\r
+        "id": "3a07e59d.95a52a",\r
          "type": "set",\r
          "name": "set tmp.MMonlyHasROOT to TRUE",\r
          "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='true' />\n",\r
          "comments": "",\r
          "x": 3314.083251953125,\r
-        "y": 3420.283447265625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3439.6858825683594,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a9c3a9a9.0f7c28",\r
+        "id": "9d62dddf.19f4b",\r
          "type": "set",\r
          "name": "set tmp.MMonlyHasROOT to FALSE",\r
          "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='false' />\n",\r
          "comments": "",\r
-        "x": 4727.9169921875,\r
-        "y": 3426.283447265625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 5295.91748046875,\r
+        "y": 3441.6859130859375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d94f5698.a9e22",\r
+        "id": "94bd3415.1f22d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 4407.6669921875,\r
-        "y": 3942.5,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3961.9024353027344,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "eb39fbed.f65188",\r
-                "716ce6ad.3df158"\r
+                "6935663a.9d5408",\r
+                "be9be1c2.b73f18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eb39fbed.f65188",\r
+        "id": "6935663a.9d5408",\r
          "type": "set",\r
          "name": "set tmp.uni.id",\r
          "xml": "<set>\n<parameter name='tmp.uni.id' value='`$tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",\r
          "comments": "",\r
          "x": 4580.5498046875,\r
-        "y": 3938.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3957.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "716ce6ad.3df158",\r
+        "id": "be9be1c2.b73f18",\r
          "type": "save",\r
          "name": "get uni from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.uni.id\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4583.5498046875,\r
-        "y": 3985.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4004.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "7301217f.c40fd8",\r
-                "4b487020.1f862",\r
-                "98e316f7.2a6e38"\r
+                "c0042631.4f4f28",\r
+                "22708d43.de1092",\r
+                "4a7fa995.9eae4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7301217f.c40fd8",\r
+        "id": "c0042631.4f4f28",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4755.5498046875,\r
-        "y": 3969.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3988.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "8014e6ef.ba6a4"\r
+                "ca5dd9fd.1cc728"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4b487020.1f862",\r
+        "id": "22708d43.de1092",\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": 4014.7337036132812,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4034.1361389160156,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "98e316f7.2a6e38",\r
+        "id": "4a7fa995.9eae4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4756.5498046875,\r
-        "y": 4055.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4074.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8014e6ef.ba6a4",\r
+        "id": "ca5dd9fd.1cc728",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
@@ -5993,165 +5870,165 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 4916.5498046875,\r
-        "y": 3965.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3984.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6c53b06a.be741",\r
-                "6040c967.bc9a38",\r
-                "6b2c883f.aecd1"\r
+                "47c9bf0a.a975f",\r
+                "7fbd75a1.7d6984",\r
+                "d27053b4.e2d198"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6986f860.3fd24",\r
+        "id": "4c40c5cd.79b95c",\r
          "type": "comment",\r
          "name": "find the node part of the uni.id (uni-tp-id-node-part)",\r
          "info": "",\r
          "comments": "",\r
          "x": 5249.5498046875,\r
-        "y": 3896.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3915.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6040c967.bc9a38",\r
+        "id": "7fbd75a1.7d6984",\r
          "type": "execute",\r
          "name": "execute split id to get pnf-name",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni-pnfName\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5184.5498046875,\r
-        "y": 3953.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3972.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "93771b2e.0a5438",\r
-                "494eca03.1cc0f4"\r
+                "daa849f8.0ba3e",\r
+                "4a912d90.87d7dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "494eca03.1cc0f4",\r
+        "id": "4a912d90.87d7dc",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5407.5498046875,\r
-        "y": 3939.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3958.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "4a647e39.1988"\r
+                "88c966fa.22614"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "93771b2e.0a5438",\r
+        "id": "daa849f8.0ba3e",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5409.5498046875,\r
-        "y": 3972.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3991.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3ee6f9fa.cfa80e"\r
+                "9f641079.ba835"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a647e39.1988",\r
+        "id": "88c966fa.22614",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 5555.5498046875,\r
-        "y": 3932.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3951.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d5960946.db6608"\r
+                "9a9d27fb.7b5ae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ee6f9fa.cfa80e",\r
+        "id": "9f641079.ba835",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
          "x": 5552.5498046875,\r
-        "y": 3969.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3988.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d5960946.db6608",\r
+        "id": "9a9d27fb.7b5ae",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.uni.pnf-name' value=\"`$param-prefix-uni-pnfName[0] + '-' +\n                                                   $param-prefix-uni-pnfName[1] + '-' +\n                                                   $param-prefix-uni-pnfName[2] + '-' +\n                                                   $param-prefix-uni-pnfName[3] + '-' +\n                                                   $param-prefix-uni-pnfName[4] + '-' +\n                                                   $param-prefix-uni-pnfName[5] + '-' +\n                                                   $param-prefix-uni-pnfName[6] + '-' +\n                                                   $param-prefix-uni-pnfName[7] + '-' +\n                                                   $param-prefix-uni-pnfName[8]`\" />\n",\r
          "comments": "",\r
          "x": 5732.5498046875,\r
-        "y": 3932.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 3951.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6c53b06a.be741",\r
+        "id": "47c9bf0a.a975f",\r
          "type": "switchNode",\r
          "name": "switch uni-tp-id-node-part is the same as the LEAF node",\r
          "xml": "<switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5228.5498046875,\r
-        "y": 4087.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4106.562103271484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f825463f.981388",\r
-                "3533ce81.16ad12"\r
+                "9f7c3aad.53ed38",\r
+                "d508e81a.16c548"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f825463f.981388",\r
+        "id": "9f7c3aad.53ed38",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5509.5498046875,\r
-        "y": 4064.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4083.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "1f58973d.a6a451"\r
+                "6b5444ec.0e74cc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3533ce81.16ad12",\r
+        "id": "d508e81a.16c548",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5502.5498046875,\r
-        "y": 4123.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4142.562103271484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "2ae9f04c.19c548"\r
+                "a57a183a.4f512"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1f58973d.a6a451",\r
+        "id": "6b5444ec.0e74cc",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -6159,14 +6036,14 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 5639.5498046875,\r
-        "y": 4068.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4087.5621032714844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2ae9f04c.19c548",\r
+        "id": "a57a183a.4f512",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
@@ -6174,276 +6051,276 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 5644.5498046875,\r
-        "y": 4122.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4141.562103271484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9dd58da7.f05d6",\r
-                "c9296d7d.c80358"\r
+                "b18806a7.b3bfd",\r
+                "ccf1cec1.bc032"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9dd58da7.f05d6",\r
+        "id": "b18806a7.b3bfd",\r
          "type": "set",\r
          "name": "set no-pce-call",\r
          "xml": "<set>\n<parameter name='no-pce-call' value=\"true\" />\n",\r
          "comments": "",\r
          "x": 5836.5498046875,\r
-        "y": 4089.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4108.562103271484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "985a0c89.e3f6d",\r
+        "id": "2b23daed.de49a6",\r
          "type": "set",\r
          "name": "set middle-man-conn",\r
          "xml": "<set>\n<parameter name='middle-man-conn.' value='`$tmp.aai.all-connectivities.connectivity[$connidx].`' />\n",\r
          "comments": "",\r
          "x": 5852.5498046875,\r
-        "y": 4141.15966796875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4160.562103271484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c9296d7d.c80358",\r
+        "id": "ccf1cec1.bc032",\r
          "type": "set",\r
          "name": "set tmp.stillHasUni and tmp.keepVPNBs to TRUE",\r
          "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n<parameter name='tmp.keepVPNBs' value='true' />\n",\r
          "comments": "",\r
          "x": 5870.83349609375,\r
-        "y": 4210.75,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4230.152435302734,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6b2c883f.aecd1",\r
+        "id": "d27053b4.e2d198",\r
          "type": "set",\r
          "name": "set tmp.stillHasUni to TRUE",\r
          "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",\r
          "comments": "",\r
          "x": 5147.533203125,\r
-        "y": 4036.64990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4056.0523376464844,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7018ac1a.7a3c7c",\r
+        "id": "2520c605.40a22a",\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": 5306.849609375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5326.252044677734,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d6a83452.cab528",\r
-                "a3cdb153.e05c2"\r
+                "c1b9af54.b56a3",\r
+                "ab60aff5.ef6de8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23ec2dfc.6ca3ea",\r
+        "id": "37365b38.b727a4",\r
          "type": "save",\r
          "name": "get root uni from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4288.516357421875,\r
-        "y": 5470.7333984375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5490.135833740234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "89ccdd98.c0add8",\r
-                "ffd72856.632858",\r
-                "d24e2f90.29ea68"\r
+                "81da98d4.afeb3",\r
+                "3ec2a5e9.1b8c7a",\r
+                "90c2c87a.2ba4f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e3a3ebb5.52e4d",\r
+        "id": "1b110349.17b25d",\r
          "type": "comment",\r
          "name": "Update ROOT UNI's bw -- ALREADY DONE",\r
          "info": "",\r
          "comments": "",\r
          "x": 4286.516845703125,\r
-        "y": 5422.733642578125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5442.136077880859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c0e896d2.f14fd",\r
+        "id": "feaf6c5c.b919f",\r
          "type": "save",\r
          "name": "update ROOT UNI in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4903.5166015625,\r
-        "y": 5540.733642578125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5560.136077880859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ffd72856.632858",\r
+        "id": "3ec2a5e9.1b8c7a",\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": 5441.3076171875,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5460.710052490234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "fe177ef1.d06678"\r
+                "3e15c1e0.3f5b3e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d24e2f90.29ea68",\r
+        "id": "90c2c87a.2ba4f8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4501.5166015625,\r
-        "y": 5485.733581542969,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5505.136016845703,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "632ed866.3f04b8"\r
+                "f6e77d5b.d9f6c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe177ef1.d06678",\r
+        "id": "3e15c1e0.3f5b3e",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
          "x": 4668.5791015625,\r
-        "y": 5440.593322753906,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5459.995758056641,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "632ed866.3f04b8",\r
+        "id": "f6e77d5b.d9f6c8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
          "x": 4669.5166015625,\r
-        "y": 5485.733581542969,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5505.136016845703,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "df87890d.bcb5c",\r
+        "id": "ac60929d.a61b6",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 4666.5166015625,\r
-        "y": 5535.733642578125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5555.136077880859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "2ff88b2d.295934",\r
-                "c0e896d2.f14fd"\r
+                "86bfdde2.f9d01",\r
+                "feaf6c5c.b919f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89ccdd98.c0add8",\r
+        "id": "81da98d4.afeb3",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4497.5166015625,\r
-        "y": 5535.733642578125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5555.136077880859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "df87890d.bcb5c"\r
+                "ac60929d.a61b6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ff88b2d.295934",\r
+        "id": "86bfdde2.f9d01",\r
          "type": "set",\r
          "name": "set new bw",\r
          "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",\r
          "comments": "",\r
          "x": 4859.517578125,\r
-        "y": 5460.733642578125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5480.136077880859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5d7f9ad7.0f862c",\r
+        "id": "ace6c92e.10b74",\r
          "type": "comment",\r
          "name": "Update connectivity status to modified",\r
          "info": "",\r
          "comments": "",\r
          "x": 5288.216796875,\r
-        "y": 5398.500244140625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5417.902679443359,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9b98cd10.6cfb68",\r
+        "id": "17e137f7.f9138",\r
          "type": "save",\r
          "name": "update ROOT connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 5314,\r
-        "y": 5440.700439453125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5460.102874755859,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d6a83452.cab528",\r
+        "id": "c1b9af54.b56a3",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 567.8836059570312,\r
-        "y": 5357.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5377.285736083984,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e5624f1d.dbf4b8"\r
+                "ee95a91b.c63f6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a3cdb153.e05c2",\r
+        "id": "ab60aff5.ef6de8",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 550.883544921875,\r
-        "y": 5279.88330078125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5299.285736083984,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "daa6681.3df0a98"\r
+                "50a1f630.9e921"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7731a568.885cdc",\r
+        "id": "e3a00d61.16ee98",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -6451,120 +6328,122 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 679.8833923339844,\r
-        "y": 4366.883026123047,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4386.285461425781,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "a5f98ac5.68fe98",\r
-                "74d156ed.4e9f",\r
-                "6135bf6.f11f5c",\r
-                "8458698c.d1be5",\r
-                "6cf7c0fc.18d4e8"\r
+                "31d81fe6.59b2e8",\r
+                "32e6c64e.1f59ea",\r
+                "ec3295c7.2b4e68",\r
+                "28934462.eda2dc",\r
+                "f47b26f.a890d58",\r
+                "787fd0ee.fe0408",\r
+                "e0d5d04e.46068"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a5f98ac5.68fe98",\r
+        "id": "31d81fe6.59b2e8",\r
          "type": "set",\r
          "name": "set tmp.leafconn.",\r
          "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",\r
          "comments": "",\r
          "x": 931.5667419433594,\r
-        "y": 4344.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4364.335266113281,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "155b7716.d28d91",\r
+        "id": "7f4eb95e.24b05",\r
          "type": "comment",\r
          "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",\r
          "info": "",\r
          "comments": "",\r
          "x": 1033.1338806152344,\r
-        "y": 4293.016326904297,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4312.418762207031,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "11c710da.f1a09f",\r
+        "id": "6288e052.96f2",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",\r
          "comments": "",\r
          "x": 1140.9837341308594,\r
-        "y": 4374.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4393.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "74d156ed.4e9f",\r
+        "id": "32e6c64e.1f59ea",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 911.9837341308594,\r
-        "y": 4463.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4482.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "11c710da.f1a09f",\r
-                "dd611a8.40420e8"\r
+                "6288e052.96f2",\r
+                "fe4b92e6.ffdd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dd611a8.40420e8",\r
+        "id": "fe4b92e6.ffdd",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1147.9837341308594,\r
-        "y": 4456.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4475.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "2cc9d43.2a3e32c",\r
-                "16f9c9a2.f3e64e",\r
-                "bd113683.3f90e8"\r
+                "a543f0e2.a728d8",\r
+                "2a0dd5d7.a28cf2",\r
+                "7ecf5c91.3a5cec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2cc9d43.2a3e32c",\r
+        "id": "a543f0e2.a728d8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1343.4838562011719,\r
-        "y": 4408.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4427.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "30afce54.3b0e7a"\r
+                "ff8dc86e.9ae7d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "16f9c9a2.f3e64e",\r
+        "id": "2a0dd5d7.a28cf2",\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": 4463.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4482.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ca51c401.6ecfa8"\r
+                "2e71c1c5.bae5ee"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30afce54.3b0e7a",\r
+        "id": "ff8dc86e.9ae7d8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -6572,180 +6451,180 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 1487.8661804199219,\r
-        "y": 4407.8721923828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4427.274627685547,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "4c495354.afa6a4"\r
+                "ea932b87.e300a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4c495354.afa6a4",\r
+        "id": "ea932b87.e300a",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1671.9837341308594,\r
-        "y": 4406.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4425.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "72a0b2fc.d6eab4"\r
+                "a57e88f9.3dbb78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "72a0b2fc.d6eab4",\r
+        "id": "a57e88f9.3dbb78",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1866.9837341308594,\r
-        "y": 4406.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4425.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3067a2de.bf9096"\r
+                "bc5f5f85.45dd38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd113683.3f90e8",\r
+        "id": "7ecf5c91.3a5cec",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1340.4838562011719,\r
-        "y": 4520.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4539.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "c72ac013.478f"\r
+                "555bfa65.d963d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c72ac013.478f",\r
+        "id": "555bfa65.d963d4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 1492.4838562011719,\r
-        "y": 4521.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4540.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ca51c401.6ecfa8",\r
+        "id": "2e71c1c5.bae5ee",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 1503.4838562011719,\r
-        "y": 4464.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4483.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fae6bda1.4d6a28",\r
+        "id": "b2af47a.be99538",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 2248.9837341308594,\r
-        "y": 4410.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4429.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "5ada214d.6d6df",\r
-                "230404bc.0330d4",\r
-                "8f5a3f0d.286f38"\r
+                "7d049acd.fef104",\r
+                "735b2479.3a3c34",\r
+                "9afda8fe.94c61"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3067a2de.bf9096",\r
+        "id": "bc5f5f85.45dd38",\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": 4410.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4429.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "fae6bda1.4d6a28"\r
+                "b2af47a.be99538"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6135bf6.f11f5c",\r
+        "id": "ec3295c7.2b4e68",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1053.4839782714844,\r
-        "y": 4567.816131591797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4587.218566894531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "63ad904f.f883c",\r
-                "612437fd.ee8ae"\r
+                "d93fc4e8.d2141",\r
+                "e3d87702.3e04a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "612437fd.ee8ae",\r
+        "id": "e3d87702.3e04a",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1417.9837341308594,\r
-        "y": 4615.816131591797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4635.218566894531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "7222d332.cab804"\r
+                "467380a4.6c5ea"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63ad904f.f883c",\r
+        "id": "d93fc4e8.d2141",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1413.9837341308594,\r
-        "y": 4575.816131591797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4595.218566894531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ffb15b5f.69bdb"\r
+                "74c8e4d8.aba72c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ffb15b5f.69bdb",\r
+        "id": "74c8e4d8.aba72c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
          "comments": "",\r
          "x": 1571.9837341308594,\r
-        "y": 4575.816131591797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4595.218566894531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7222d332.cab804",\r
+        "id": "467380a4.6c5ea",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
@@ -6753,113 +6632,113 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 1575.4837341308594,\r
-        "y": 4615.816131591797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4635.218566894531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "230404bc.0330d4",\r
+        "id": "735b2479.3a3c34",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2454.9837341308594,\r
-        "y": 4423.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4442.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "999c0ecf.dd9428",\r
-                "cadc4a62.3f428",\r
-                "9a118cc2.6cef58"\r
+                "c4e177eb.43ef28",\r
+                "2d977136.9bd1f6",\r
+                "57e5d5ac.7eac64"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5ada214d.6d6df",\r
+        "id": "7d049acd.fef104",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domain id",\r
          "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
          "x": 2484.9837341308594,\r
-        "y": 4371.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4390.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "999c0ecf.dd9428",\r
+        "id": "c4e177eb.43ef28",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2664.9837341308594,\r
-        "y": 4414.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4433.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "fb522408.bea2a8"\r
+                "e1f43f97.38cd18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cadc4a62.3f428",\r
+        "id": "2d977136.9bd1f6",\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": 4469.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4488.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ad21cc41.8772b"\r
+                "96a7d4c6.d3f4b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a118cc2.6cef58",\r
+        "id": "57e5d5ac.7eac64",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2661.9837341308594,\r
-        "y": 4526.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4545.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e3096426.02dcf"\r
+                "c392199a.c19ae8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e3096426.02dcf",\r
+        "id": "c392199a.c19ae8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 2813.9837341308594,\r
-        "y": 4527.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4546.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ad21cc41.8772b",\r
+        "id": "96a7d4c6.d3f4b",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 2824.9837341308594,\r
-        "y": 4472.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4491.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fb522408.bea2a8",\r
+        "id": "e1f43f97.38cd18",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -6867,101 +6746,101 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 2809.3660583496094,\r
-        "y": 4411.8721923828125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4431.274627685547,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6e503f35.5790c"\r
+                "a7aa546c.5009d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6e503f35.5790c",\r
+        "id": "a7aa546c.5009d8",\r
          "type": "set",\r
          "name": "set controller domain data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
          "x": 3023.9837341308594,\r
-        "y": 4408.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4427.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8f5a3f0d.286f38",\r
+        "id": "9afda8fe.94c61",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
          "x": 2404.9837341308594,\r
-        "y": 4487.216522216797,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4506.618957519531,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8458698c.d1be5",\r
+        "id": "28934462.eda2dc",\r
          "type": "call",\r
          "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
          "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1082.5667419433594,\r
-        "y": 4787.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4807.335266113281,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6cf7c0fc.18d4e8",\r
+        "id": "f47b26f.a890d58",\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": 4854.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4874.335266113281,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "31c266e8.6cad22",\r
-                "45786f9e.46f928"\r
+                "d8af5065.8b84b8",\r
+                "1e55c33.7a66f3d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "31c266e8.6cad22",\r
+        "id": "d8af5065.8b84b8",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1162.5667419433594,\r
-        "y": 4839.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4859.335266113281,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "25e4293a.b5a0de"\r
+                "f3c54a4a.4e3ba8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "45786f9e.46f928",\r
+        "id": "1e55c33.7a66f3d",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1158.5667419433594,\r
-        "y": 4887.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4907.335266113281,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9325c5b6.3d913"\r
+                "ce49485f.e53e78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "25e4293a.b5a0de",\r
+        "id": "f3c54a4a.4e3ba8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
@@ -6969,66 +6848,66 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 1318.5667419433594,\r
-        "y": 4835.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4855.335266113281,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "51a35a4f.5fbc64"\r
+                "f655fe6a.478a2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9325c5b6.3d913",\r
+        "id": "ce49485f.e53e78",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
          "comments": "",\r
          "x": 1306.5667419433594,\r
-        "y": 4882.932830810547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4902.335266113281,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c5019df.72c63e",\r
+        "id": "f3ecfcf6.c34748",\r
          "type": "comment",\r
          "name": "Update connectivity status to modified",\r
          "info": "",\r
          "comments": "",\r
          "x": 1587.4664001464844,\r
-        "y": 4786.633026123047,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4806.035461425781,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "51a35a4f.5fbc64",\r
+        "id": "f655fe6a.478a2",\r
          "type": "save",\r
          "name": "update ROOT connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1613.2496032714844,\r
-        "y": 4828.833221435547,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4848.235656738281,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "cbb82af5.87b298",\r
+        "id": "78dea2d4.65caf4",\r
          "type": "call",\r
          "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",\r
          "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1026.8833923339844,\r
-        "y": 4102.199920654297,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4121.602355957031,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "daa6681.3df0a98",\r
+        "id": "50a1f630.9e921",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -7036,17 +6915,17 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 632.8834228515625,\r
-        "y": 4106.883056640625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 4126.285491943359,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "cbb82af5.87b298",\r
-                "7731a568.885cdc"\r
+                "78dea2d4.65caf4",\r
+                "e3a00d61.16ee98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5624f1d.dbf4b8",\r
+        "id": "ee95a91b.c63f6",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -7054,643 +6933,646 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 716.3333740234375,\r
-        "y": 5359.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5378.802337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "16338b46.5dad65",\r
-                "de535c52.af9d48",\r
-                "78064cf.4874bb4",\r
-                "b5448cca.f23df8"\r
+                "a4300755.b44ad8",\r
+                "4319a166.6767b",\r
+                "c1e6d7e.1a91aa8",\r
+                "7dc09fd4.2514c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "16338b46.5dad65",\r
+        "id": "a4300755.b44ad8",\r
          "type": "call",\r
          "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",\r
          "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1067.7166748046875,\r
-        "y": 5290.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1077.7166748046875,\r
+        "y": 5141.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "de535c52.af9d48",\r
+        "id": "4319a166.6767b",\r
          "type": "save",\r
          "name": "delete LEAF connectivity resource in AAI",\r
          "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 978.7166748046875,\r
-        "y": 5359.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 988.7166748046875,\r
+        "y": 5210.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "78064cf.4874bb4",\r
+        "id": "c1e6d7e.1a91aa8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 869.88330078125,\r
-        "y": 5594.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 879.88330078125,\r
+        "y": 5445.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "69415165.a30268",\r
-                "38b5cafd.d5079e",\r
-                "6a408110.2a2dc"\r
+                "6bef4230.e722e4",\r
+                "41351f51.03e8b",\r
+                "71820932.ce34a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f703a5f3.1124f8",\r
+        "id": "2a329201.baab2e",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2585.882568359375,\r
-        "y": 5481.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 2588.882568359375,\r
+        "y": 5370.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "2bcfefd4.8f246",\r
-                "6262f33a.13ed54",\r
-                "5f5183a2.3dd5bc"\r
+                "65fc47.6ca7abb8",\r
+                "955b1af3.e7d3b8",\r
+                "72151671.442258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "17938acf.263b45",\r
+        "id": "daaffadf.b0d788",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 2535.882568359375,\r
-        "y": 5545.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 2538.882568359375,\r
+        "y": 5434.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "434194f6.d45944",\r
+        "id": "ae76296d.4aa7d8",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domain id",\r
          "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 2615.882568359375,\r
-        "y": 5429.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 2618.882568359375,\r
+        "y": 5318.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2bcfefd4.8f246",\r
+        "id": "65fc47.6ca7abb8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2795.882568359375,\r
-        "y": 5472.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 2906.8826904296875,\r
+        "y": 5301.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f6e068a.7d61a18"\r
+                "6f1e5821.6bfab8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6262f33a.13ed54",\r
+        "id": "955b1af3.e7d3b8",\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": 5527.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 2898.8826904296875,\r
+        "y": 5356.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "2a0eede1.27db52"\r
+                "5731f70c.9d6e58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f5183a2.3dd5bc",\r
+        "id": "72151671.442258",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2792.882568359375,\r
-        "y": 5584.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 2903.8826904296875,\r
+        "y": 5413.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "612a7284.deceac"\r
+                "531fbc69.7d6ca4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "612a7284.deceac",\r
+        "id": "531fbc69.7d6ca4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2944.882568359375,\r
-        "y": 5585.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3055.8826904296875,\r
+        "y": 5414.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2a0eede1.27db52",\r
+        "id": "5731f70c.9d6e58",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2955.882568359375,\r
-        "y": 5530.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3066.8826904296875,\r
+        "y": 5359.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f6e068a.7d61a18",\r
+        "id": "6f1e5821.6bfab8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2940.264892578125,\r
-        "y": 5470.055572509766,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3051.2650146484375,\r
+        "y": 5299.458038330078,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d3b91b08.9e326"\r
+                "af5a0545.43691"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d3b91b08.9e326",\r
+        "id": "af5a0545.43691",\r
          "type": "set",\r
          "name": "set controller domain data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 3154.882568359375,\r
-        "y": 5466.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 3265.8826904296875,\r
+        "y": 5295.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "69415165.a30268",\r
+        "id": "6bef4230.e722e4",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.the-connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.the-connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.the-connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.the-connectivity.access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 1151.88330078125,\r
-        "y": 5463.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1161.88330078125,\r
+        "y": 5314.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5cd94a05.12a97c",\r
+        "id": "80b0094c.3afc",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1362.3834228515625,\r
-        "y": 5602.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1372.3834228515625,\r
+        "y": 5453.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6b54e983.54f23"\r
+                "8b920100.3048e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7cfb8601.d6c8b8",\r
+        "id": "fd028bda.dc87c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1365.3834228515625,\r
-        "y": 5490.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1375.3834228515625,\r
+        "y": 5341.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "43d9e97c.41e918"\r
+                "b6a8539e.9a283"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c076204a.7c8658",\r
+        "id": "dfe8b9b5.0780c",\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": 5545.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1367.3834228515625,\r
+        "y": 5396.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "697ce13c.463e78"\r
+                "a57ef7af.c3223"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "43d9e97c.41e918",\r
+        "id": "b6a8539e.9a283",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1499.765625,\r
-        "y": 5485.0556640625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1509.765625,\r
+        "y": 5336.4581298828125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9ea73f48.e6dc88"\r
+                "99e24c60.f2ee9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b54e983.54f23",\r
+        "id": "8b920100.3048e",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1514.3834228515625,\r
-        "y": 5603.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1524.3834228515625,\r
+        "y": 5454.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "697ce13c.463e78",\r
+        "id": "a57ef7af.c3223",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1525.3834228515625,\r
-        "y": 5546.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1535.3834228515625,\r
+        "y": 5397.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9ea73f48.e6dc88",\r
+        "id": "99e24c60.f2ee9",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1686.8828125,\r
-        "y": 5486.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1696.8828125,\r
+        "y": 5337.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "8867a67f.02b388"\r
+                "b066cef.3d778b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8867a67f.02b388",\r
+        "id": "b066cef.3d778b",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1914.8828125,\r
-        "y": 5479.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1924.8828125,\r
+        "y": 5330.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "bfd4d2af.8ab0b8"\r
+                "bf0363b8.4e697"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "38b5cafd.d5079e",\r
+        "id": "41351f51.03e8b",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1169.88330078125,\r
-        "y": 5538.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1179.88330078125,\r
+        "y": 5389.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "5cd94a05.12a97c",\r
-                "7cfb8601.d6c8b8",\r
-                "c076204a.7c8658"\r
+                "80b0094c.3afc",\r
+                "fd028bda.dc87c",\r
+                "dfe8b9b5.0780c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfd4d2af.8ab0b8",\r
+        "id": "bf0363b8.4e697",\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": 5476.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 2130.8828125,\r
+        "y": 5327.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b0cdfdee.4e9418"\r
+                "d631d833.b0d378"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b0cdfdee.4e9418",\r
+        "id": "d631d833.b0d378",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2335.8822021484375,\r
-        "y": 5479.39990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 2345.8822021484375,\r
+        "y": 5330.8023681640625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "434194f6.d45944",\r
-                "f703a5f3.1124f8",\r
-                "17938acf.263b45"\r
+                "ae76296d.4aa7d8",\r
+                "2a329201.baab2e",\r
+                "daaffadf.b0d788"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a408110.2a2dc",\r
+        "id": "71820932.ce34a",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Delete LEAF ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.the-connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1293.6500244140625,\r
-        "y": 5687.7998046875,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1303.6500244140625,\r
+        "y": 5539.2022705078125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "d58ed713.3cd0d",\r
-                "e5f89511.dafe58"\r
+                "813e179b.713d1",\r
+                "76f746e6.c0f1d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d58ed713.3cd0d",\r
+        "id": "813e179b.713d1",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1640.1500244140625,\r
-        "y": 5680.7998046875,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1650.1500244140625,\r
+        "y": 5532.2022705078125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "8ee30019.6f667"\r
+                "455cd4bd.60fbe4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5f89511.dafe58",\r
+        "id": "76f746e6.c0f1d",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1644.1500244140625,\r
-        "y": 5720.7998046875,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1654.1500244140625,\r
+        "y": 5572.2022705078125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3308ecad.5ad59c"\r
+                "627d6bed.c81224"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ee30019.6f667",\r
+        "id": "455cd4bd.60fbe4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 1798.1500244140625,\r
-        "y": 5680.7998046875,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1808.1500244140625,\r
+        "y": 5532.2022705078125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3308ecad.5ad59c",\r
+        "id": "627d6bed.c81224",\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": 5720.7998046875,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1811.6500244140625,\r
+        "y": 5572.2022705078125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
-            []\r
+            [\r
+                "eb743ad2.daea58"\r
+            ]\r
          ]\r
      },\r
      {\r
-        "id": "b5448cca.f23df8",\r
+        "id": "7dc09fd4.2514c",\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": 5849.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5869.002532958984,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "59551d1d.12689c",\r
-                "5a5ae31.cb9b99c"\r
+                "22d45a38.9f5796",\r
+                "bd1f8261.b1a1b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59551d1d.12689c",\r
+        "id": "22d45a38.9f5796",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1105.183349609375,\r
-        "y": 5826.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1107.183349609375,\r
+        "y": 5696.0025634765625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "2e2794d8.3df39c"\r
+                "b4f2b377.ab70a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5a5ae31.cb9b99c",\r
+        "id": "bd1f8261.b1a1b",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1093.3500366210938,\r
-        "y": 5999.2001953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6018.602630615234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6dce893f.c421c"\r
+                "f125dad1.1ae098"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e2794d8.3df39c",\r
+        "id": "b4f2b377.ab70a8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1253.35009765625,\r
-        "y": 5826.2001953125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1255.35009765625,\r
+        "y": 5695.6026611328125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b4e9d461.c3c1a",\r
-                "2f3efa95.41d3ce"\r
+                "2ce9ebc5.9980ac",\r
+                "33e7432a.ad365c",\r
+                "1ed03004.8d6e4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b4e9d461.c3c1a",\r
+        "id": "2ce9ebc5.9980ac",\r
          "type": "call",\r
          "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
          "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1675.199951171875,\r
-        "y": 5797.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1677.199951171875,\r
+        "y": 5667.0025634765625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2f3efa95.41d3ce",\r
+        "id": "33e7432a.ad365c",\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": 5864.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1492.199951171875,\r
+        "y": 5734.0025634765625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "aadc3189.147b98",\r
-                "9801a2d7.df3f98"\r
+                "e7aa98fb.d5331",\r
+                "d055e12e.7731d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aadc3189.147b98",\r
+        "id": "e7aa98fb.d5331",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1755.199951171875,\r
-        "y": 5849.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1757.199951171875,\r
+        "y": 5719.0025634765625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "aaac06aa.f3d728"\r
+                "68adf16f.2488d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9801a2d7.df3f98",\r
+        "id": "d055e12e.7731d8",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1751.199951171875,\r
-        "y": 5897.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1756.199951171875,\r
+        "y": 5767.0025634765625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "7656a3d7.b7266c"\r
+                "f1e6e2bf.7ae47"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aaac06aa.f3d728",\r
+        "id": "68adf16f.2488d8",\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": 5845.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1913.199951171875,\r
+        "y": 5715.0025634765625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "2673ca00.ba724e"\r
+                "b0a90683.d1b168"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7656a3d7.b7266c",\r
+        "id": "f1e6e2bf.7ae47",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
          "comments": "",\r
-        "x": 1899.199951171875,\r
-        "y": 5892.60009765625,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1904.199951171875,\r
+        "y": 5762.0025634765625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2673ca00.ba724e",\r
+        "id": "b0a90683.d1b168",\r
          "type": "save",\r
          "name": "update ROOT connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2219.8826904296875,\r
-        "y": 5839.50048828125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 2221.8826904296875,\r
+        "y": 5708.9029541015625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bfaf6549.13fe88",\r
+        "id": "609277ca.345368",\r
          "type": "comment",\r
          "name": "Update connectivity status to modified",\r
          "info": "",\r
          "comments": "",\r
-        "x": 2194.0994873046875,\r
-        "y": 5797.30029296875,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 2196.0994873046875,\r
+        "y": 5666.7027587890625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6dce893f.c421c",\r
+        "id": "f125dad1.1ae098",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -7698,501 +7580,502 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 1230.916748046875,\r
-        "y": 5998.5,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6017.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "75d82528.4dd5bc",\r
-                "24c2da43.974556"\r
+                "6a84ca09.c3f86c",\r
+                "32b2c890.ef7958"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75d82528.4dd5bc",\r
+        "id": "6a84ca09.c3f86c",\r
          "type": "for",\r
          "name": "for each relationship of middle-man-conn",\r
          "xml": "<for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1544.23291015625,\r
-        "y": 5992.7001953125,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1536.2328491210938,\r
+        "y": 5951.1025390625,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "29eb94d3.70f2dc"\r
+                "f1408389.66d578"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "29eb94d3.70f2dc",\r
+        "id": "f1408389.66d578",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1844.566650390625,\r
-        "y": 5987.700134277344,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6007.102569580078,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "522c88bc.33b518"\r
+                "89925b7f.d67008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "522c88bc.33b518",\r
+        "id": "89925b7f.d67008",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2024.2332763671875,\r
-        "y": 5987.700225830078,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6007.1026611328125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9dde3a26.bf1a48"\r
+                "ea5801a3.bdc318"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9dde3a26.bf1a48",\r
+        "id": "ea5801a3.bdc318",\r
          "type": "save",\r
          "name": "get connectivity from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2224.233154296875,\r
-        "y": 5987.7001953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6007.102630615234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "af210146.805c98",\r
-                "1304e1a7.407dde",\r
-                "83b6e70e.c6339"\r
+                "a1e89c64.ee08",\r
+                "8d6c0f91.a49cb8",\r
+                "4e2495e6.04e044"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "af210146.805c98",\r
+        "id": "a1e89c64.ee08",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2431.23291015625,\r
-        "y": 6037.7001953125,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6057.102630615234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "bfbb5b5d.76ea48"\r
+                "b790569e.977af8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24e402f2.8a6b26",\r
+        "id": "a110091a.c88bd8",\r
          "type": "save",\r
          "name": "get vpn-binding from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2408.466552734375,\r
-        "y": 6221.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6241.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3ff65d5b.44eb62",\r
-                "d09102d1.fb466",\r
-                "3d724c56.f2b6cc"\r
+                "2d065eb8.336f2a",\r
+                "87ee966c.316df8",\r
+                "aec85de6.45d0c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1cd695fe.f2c6f2",\r
+        "id": "4adb06fe.906c3",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1607.466552734375,\r
-        "y": 6136.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1577.4664916992188,\r
+        "y": 6284.30224609375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "74367c85.fa02dc"\r
+                "275bed8a.2109fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74367c85.fa02dc",\r
+        "id": "275bed8a.2109fa",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1804.466552734375,\r
-        "y": 6150.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1774.4664916992188,\r
+        "y": 6298.30224609375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "572f2125.6367b8",\r
-                "5931a81f.41a6"\r
+                "4f9c6be0.2a3c14",\r
+                "a2e8db17.e0dad8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "572f2125.6367b8",\r
+        "id": "4f9c6be0.2a3c14",\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": 6143.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1978.466552734375,\r
+        "y": 6201.30224609375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "22fa9a36.31302e"\r
+                "e20e285e.547a2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "22fa9a36.31302e",\r
+        "id": "e20e285e.547a2",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2135.466552734375,\r
-        "y": 6143.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 2159.466552734375,\r
+        "y": 6217.30224609375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "24e402f2.8a6b26"\r
+                "a110091a.c88bd8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5931a81f.41a6",\r
+        "id": "a2e8db17.e0dad8",\r
          "type": "outcome",\r
          "name": "uni",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 1988.466552734375,\r
-        "y": 6439.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6459.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "510edb34.612754"\r
+                "f74bc39.65f35c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "510edb34.612754",\r
+        "id": "f74bc39.65f35c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 2151.466552734375,\r
-        "y": 6439.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6459.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "4c0113a.98542ec"\r
+                "c00c0bc0.55fe4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4c0113a.98542ec",\r
+        "id": "c00c0bc0.55fe4",\r
          "type": "save",\r
          "name": "delete uni resource in AAI",\r
          "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2394.466552734375,\r
-        "y": 6439.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6459.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2b555ba8.ce83e4",\r
+        "id": "97487c98.0e417",\r
          "type": "save",\r
          "name": "delete connectivity resource in AAI",\r
          "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1648.466552734375,\r
-        "y": 6583.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1362.466552734375,\r
+        "y": 7225.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bfbb5b5d.76ea48",\r
+        "id": "b790569e.977af8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1433.466552734375,\r
-        "y": 6134.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1403.4664916992188,\r
+        "y": 6282.30224609375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "1cd695fe.f2c6f2",\r
-                "2b555ba8.ce83e4"\r
+                "4adb06fe.906c3",\r
+                "97487c98.0e417",\r
+                "d04fa9dd.0ea93"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ff65d5b.44eb62",\r
+        "id": "2d065eb8.336f2a",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2619.466552734375,\r
-        "y": 6223.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6243.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "851525d6.b90c38"\r
+                "b92767c5.7007a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d09102d1.fb466",\r
+        "id": "87ee966c.316df8",\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": 6269.473937988281,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6288.876373291016,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "74e6774b.c7b358"\r
+                "39698a7e.793e46"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3d724c56.f2b6cc",\r
+        "id": "aec85de6.45d0c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2617.466552734375,\r
-        "y": 6312.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6332.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "cbe3afce.930cc"\r
+                "11419a70.f242ee"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "83b6e70e.c6339",\r
+        "id": "4e2495e6.04e044",\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": 5938.5,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5957.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1304e1a7.407dde",\r
+        "id": "8d6c0f91.a49cb8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 2452.7919921875,\r
-        "y": 5981.925964355469,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6001.328399658203,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "24c2da43.974556",\r
+        "id": "32b2c890.ef7958",\r
          "type": "save",\r
          "name": "delete middle-man-conn resource in AAI",\r
          "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1531.400146484375,\r
-        "y": 6067.2998046875,\r
-        "z": "82de8dcf.518d88",\r
+        "x": 1533.4000854492188,\r
+        "y": 6012.7021484375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "851525d6.b90c38",\r
+        "id": "b92767c5.7007a",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 2785.466552734375,\r
-        "y": 6213.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6233.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "811dd566.85ec38",\r
-                "6a877b95.f2661c",\r
-                "66415a60.9e5d9c",\r
-                "a662df33.5b8808",\r
-                "502ecc67.91354c"\r
+                "8147cbd5.b42498",\r
+                "7f8cdbe.2608ca4",\r
+                "991bc3e4.d8b4a8",\r
+                "b286c779.61d138",\r
+                "b9b93ea.866444"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cbe3afce.930cc",\r
+        "id": "11419a70.f242ee",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
          "x": 2784.466552734375,\r
-        "y": 6311.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6331.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "74e6774b.c7b358",\r
+        "id": "39698a7e.793e46",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
          "x": 2782.5289306640625,\r
-        "y": 6269.759674072266,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6289.162109375,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "811dd566.85ec38",\r
+        "id": "8147cbd5.b42498",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",\r
          "comments": "",\r
          "x": 3007.466552734375,\r
-        "y": 5931.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5951.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6a877b95.f2661c",\r
+        "id": "7f8cdbe.2608ca4",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3033.466552734375,\r
-        "y": 6048.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6068.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "3d9fd486.323a64",\r
-                "c6247afb.9c0a",\r
-                "83cc8360.81d358"\r
+                "d327bb6b.4f842",\r
+                "fcec59b5.0b9b4",\r
+                "c483fb97.0216f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "66415a60.9e5d9c",\r
+        "id": "991bc3e4.d8b4a8",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3136.466552734375,\r
-        "y": 6315.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6335.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "9c554475.661fc8",\r
-                "12ed9938.83ebcf"\r
+                "de0f39f6.8546f",\r
+                "d42c9248.43e218"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a662df33.5b8808",\r
+        "id": "b286c779.61d138",\r
          "type": "switchNode",\r
          "name": "switch connectivity has ethernet service",\r
          "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3074.466552734375,\r
-        "y": 6450.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6470.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b26d88bf.bd178",\r
-                "f451c5d.6b3dd38"\r
+                "f81c3e8c.ae8e4",\r
+                "1d01e37a.e82265"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "502ecc67.91354c",\r
+        "id": "b9b93ea.866444",\r
          "type": "save",\r
          "name": "delete vpn-binding resource in AAI",\r
          "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3055.466552734375,\r
-        "y": 6566.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6586.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3d9fd486.323a64",\r
+        "id": "d327bb6b.4f842",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3228.9666748046875,\r
-        "y": 6000.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6020.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "c715af9f.c55108"\r
+                "df7e30e7.7c136"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c6247afb.9c0a",\r
+        "id": "fcec59b5.0b9b4",\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": 6055.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6075.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "f990360c.2a7d88"\r
+                "49204a47.5b32c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c715af9f.c55108",\r
+        "id": "df7e30e7.7c136",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -8200,176 +8083,176 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 3363.348876953125,\r
-        "y": 5995.5556640625,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6014.958099365234,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "cf5a3a9d.68d89"\r
+                "2df8196b.742ffe"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "83cc8360.81d358",\r
+        "id": "c483fb97.0216f8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3225.9666748046875,\r
-        "y": 6112.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6132.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "ee6f1ffb.7dcfe"\r
+                "6350206c.c1b658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ee6f1ffb.7dcfe",\r
+        "id": "6350206c.c1b658",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 3377.9666748046875,\r
-        "y": 6113.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6133.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f990360c.2a7d88",\r
+        "id": "49204a47.5b32c4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 3388.9666748046875,\r
-        "y": 6056.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6076.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f451c5d.6b3dd38",\r
+        "id": "1d01e37a.e82265",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3327.466552734375,\r
-        "y": 6428.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6448.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e38cfd76.3f8a2"\r
+                "6635b3c9.2401f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b26d88bf.bd178",\r
+        "id": "f81c3e8c.ae8e4",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3327.466552734375,\r
-        "y": 6484.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6504.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "cf5a3a9d.68d89",\r
+        "id": "2df8196b.742ffe",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3550.466064453125,\r
-        "y": 5996.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6016.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "fe7eff92.d565e"\r
+                "6df12a4f.4f5be4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe7eff92.d565e",\r
+        "id": "6df12a4f.4f5be4",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3791.466064453125,\r
-        "y": 5987.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6007.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "a5619f8.2b7e86"\r
+                "345bdac9.d7580e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e38cfd76.3f8a2",\r
+        "id": "6635b3c9.2401f4",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Delete ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3677.466064453125,\r
-        "y": 6418.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6438.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "1d52efad.f9e5d",\r
-                "d7169143.c010d8"\r
+                "62245fed.88f7b8",\r
+                "93d26392.9844b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c554475.661fc8",\r
+        "id": "de0f39f6.8546f",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3443.966064453125,\r
-        "y": 6340.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6360.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "238545c1.5c8b2a"\r
+                "efef7a04.122ab"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "12ed9938.83ebcf",\r
+        "id": "d42c9248.43e218",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 3444.966064453125,\r
-        "y": 6285.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6305.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "bb0795de.a47f18"\r
+                "5547b05c.5a7128"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "238545c1.5c8b2a",\r
+        "id": "efef7a04.122ab",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",\r
          "comments": "",\r
          "x": 3615.966064453125,\r
-        "y": 6338.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6358.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bb0795de.a47f18",\r
+        "id": "5547b05c.5a7128",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
@@ -8377,80 +8260,80 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 3612.466064453125,\r
-        "y": 6287.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6307.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "36cf22b4.4935d6",\r
+        "id": "67e0872f.595688",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
          "x": 4148.4658203125,\r
-        "y": 5936.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5956.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b5cbacbc.c392",\r
-                "ea40936a.af6178",\r
-                "6eb0462c.852488"\r
+                "5fd99c9d.a6e514",\r
+                "c5566cea.30bd7",\r
+                "ac42532d.c50238"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a5619f8.2b7e86",\r
+        "id": "345bdac9.d7580e",\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": 5984.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6004.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "36cf22b4.4935d6"\r
+                "67e0872f.595688"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1d52efad.f9e5d",\r
+        "id": "62245fed.88f7b8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4009.966064453125,\r
-        "y": 6392.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6412.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "6bd1cb72.9cf9b4"\r
+                "5832ca1b.e5ff14"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d7169143.c010d8",\r
+        "id": "93d26392.9844b",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4013.966064453125,\r
-        "y": 6432.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6452.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "e4332941.104e"\r
+                "263d2537.eb493a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e4332941.104e",\r
+        "id": "263d2537.eb493a",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
@@ -8458,135 +8341,137 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 4201.466064453125,\r
-        "y": 6436.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6456.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
-            []\r
+            [\r
+                "4ed6624e.3d3df4"\r
+            ]\r
          ]\r
      },\r
      {\r
-        "id": "6bd1cb72.9cf9b4",\r
+        "id": "5832ca1b.e5ff14",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
          "comments": "",\r
          "x": 4197.966064453125,\r
-        "y": 6396.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6416.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ea40936a.af6178",\r
+        "id": "c5566cea.30bd7",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4354.4658203125,\r
-        "y": 5949.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5969.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "914dea7f.0edbe",\r
-                "82561c7b.09ef28",\r
-                "b047cbfd.3b9618"\r
+                "1f8f123b.3b43b6",\r
+                "ad361732.c4c148",\r
+                "b36b591c.d0d57"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b5cbacbc.c392",\r
+        "id": "5fd99c9d.a6e514",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domain id",\r
          "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
          "x": 4384.4658203125,\r
-        "y": 5897.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5917.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "914dea7f.0edbe",\r
+        "id": "1f8f123b.3b43b6",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4564.4658203125,\r
-        "y": 5940.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5960.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "c318baba.3a4cc8"\r
+                "55972070.a10d1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "82561c7b.09ef28",\r
+        "id": "ad361732.c4c148",\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": 5995.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6015.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "b8e7878b.f1ad7"\r
+                "b3ebf2d9.9fcd08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b047cbfd.3b9618",\r
+        "id": "b36b591c.d0d57",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
          "x": 4561.4658203125,\r
-        "y": 6052.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6072.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "c15a7782.9625b"\r
+                "a70cb792.ca4f6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6eb0462c.852488",\r
+        "id": "ac42532d.c50238",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
          "x": 4304.4658203125,\r
-        "y": 6013.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6033.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c15a7782.9625b",\r
+        "id": "a70cb792.ca4f6",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 4713.4658203125,\r
-        "y": 6053.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6073.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b8e7878b.f1ad7",\r
+        "id": "b3ebf2d9.9fcd08",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
          "x": 4724.4658203125,\r
-        "y": 5998.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 6018.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c318baba.3a4cc8",\r
+        "id": "55972070.a10d1",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
@@ -8594,23 +8479,2692 @@
          "comments": "",\r
          "outputs": 1,\r
          "x": 4708.84814453125,\r
-        "y": 5938.555572509766,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5957.9580078125,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": [\r
              [\r
-                "42376e75.44b2d8"\r
+                "4ce9545d.714c5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "42376e75.44b2d8",\r
+        "id": "4ce9545d.714c5c",\r
          "type": "set",\r
          "name": "set controller domain data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
          "x": 4923.4658203125,\r
-        "y": 5934.89990234375,\r
-        "z": "82de8dcf.518d88",\r
+        "y": 5954.302337646484,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "40aef7f6.0b7228",\r
+        "type": "set",\r
+        "name": "set pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",\r
+        "comments": "",\r
+        "x": 1659.2332763671875,\r
+        "y": 6751.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4576702d.22188",\r
+        "type": "get-resource",\r
+        "name": "get-resource src pnf",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1685.2332763671875,\r
+        "y": 6868.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "b905b.3d0c77a6",\r
+                "a913e20f.2cee1",\r
+                "5b499033.3c7be8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b905b.3d0c77a6",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1880.7333984375,\r
+        "y": 6820.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "fda08d88.ca8218"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a913e20f.2cee1",\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": 6875.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "6f461b70.2ad3ec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fda08d88.ca8218",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2015.1156005859375,\r
+        "y": 6815.558197021484,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "c0fafd9c.883f28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5b499033.3c7be8",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1877.7333984375,\r
+        "y": 6932.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "23b6f155.461de6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "23b6f155.461de6",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 2029.7333984375,\r
+        "y": 6933.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6f461b70.2ad3ec",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 2040.7333984375,\r
+        "y": 6876.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c0fafd9c.883f28",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2202.2327880859375,\r
+        "y": 6816.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "810f1bc.7b19d68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "810f1bc.7b19d68",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2443.2327880859375,\r
+        "y": 6807.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "ad7d1fb5.cc1a18"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "56d2a753.e194",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2800.2325439453125,\r
+        "y": 6756.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "1805810f.473127",\r
+                "c086be3e.9f0a58",\r
+                "b6b8383e.7e7b78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ad7d1fb5.cc1a18",\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": 6804.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "56d2a753.e194"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c086be3e.9f0a58",\r
+        "type": "execute",\r
+        "name": "get esr-thirdparty-sdnc",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3006.2325439453125,\r
+        "y": 6769.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "41ba51ef.c8b828",\r
+                "a2407b12.88a828",\r
+                "6a27d837.9d059"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b6b8383e.7e7b78",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 2956.2325439453125,\r
+        "y": 6833.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1805810f.473127",\r
+        "type": "set",\r
+        "name": "set esr-thirdparty-sdnc domain id",\r
+        "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 3036.2325439453125,\r
+        "y": 6717.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "41ba51ef.c8b828",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3216.2325439453125,\r
+        "y": 6760.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "67360da7.aafffc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a2407b12.88a828",\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": 6815.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "aba785db.cff2e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6a27d837.9d059",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3213.2325439453125,\r
+        "y": 6872.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "2e83f42c.ac084c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2e83f42c.ac084c",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 3365.2325439453125,\r
+        "y": 6873.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "aba785db.cff2e",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 3376.2325439453125,\r
+        "y": 6818.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "67360da7.aafffc",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3360.6148681640625,\r
+        "y": 6758.55810546875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "5bfcca0.e84cb38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5bfcca0.e84cb38",\r
+        "type": "set",\r
+        "name": "set controller domain data",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
+        "comments": "",\r
+        "x": 3575.2325439453125,\r
+        "y": 6754.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d04fa9dd.0ea93",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1451.2332763671875,\r
+        "y": 6879.902435302734,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "40aef7f6.0b7228",\r
+                "4576702d.22188",\r
+                "1c9c9766.902671"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1c9c9766.902671",\r
+        "type": "switchNode",\r
+        "name": "switch connectivity has ethernet service",\r
+        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1733.433349609375,\r
+        "y": 7021.102630615234,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "14008b93.c61004",\r
+                "9e2bb4b2.c6532"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9e2bb4b2.c6532",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1986.433349609375,\r
+        "y": 6999.102630615234,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "4241c741.35655"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "14008b93.c61004",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1986.433349609375,\r
+        "y": 7055.102630615234,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4241c741.35655",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Delete ethernet Service without token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2336.432861328125,\r
+        "y": 6989.102630615234,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "ea96feaf.f1788",\r
+                "4822a513.5b5dec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ea96feaf.f1788",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2668.932861328125,\r
+        "y": 6963.102630615234,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "99064a7c.800f78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4822a513.5b5dec",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2672.932861328125,\r
+        "y": 7003.102630615234,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "75af94b2.bd71a4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "75af94b2.bd71a4",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2860.432861328125,\r
+        "y": 7007.102630615234,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "383276dd.aedfd2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "99064a7c.800f78",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
+        "comments": "",\r
+        "x": 2856.932861328125,\r
+        "y": 6967.102630615234,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "787fd0ee.fe0408",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Delete Underlay OTN tunnel from the LEAF ethernet Service",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/underlay/otn-tunnels=' + $tmp.underlayOTN`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1089.25,\r
+        "y": 4706.6856689453125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "9f0cae6f.29b72",\r
+                "ae365d21.2b4fd8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9f0cae6f.29b72",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1517.749755859375,\r
+        "y": 4694.6856689453125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "b4e1628f.b3806"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ae365d21.2b4fd8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1521.749755859375,\r
+        "y": 4734.6856689453125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "f7f8736e.92596"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b4e1628f.b3806",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
+        "comments": "",\r
+        "x": 1675.749755859375,\r
+        "y": 4694.6856689453125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f7f8736e.92596",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1679.249755859375,\r
+        "y": 4734.6856689453125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e95ba342.193f38",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5113,\r
+        "y": 5027.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "6274dc16.d97334",\r
+                "78a742b8.f3e49c",\r
+                "a7f7a97f.231788"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a7f7a97f.231788",\r
+        "type": "set",\r
+        "name": "set vpnNameToSearch",\r
+        "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",\r
+        "comments": "",\r
+        "x": 5340,\r
+        "y": 4972.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6274dc16.d97334",\r
+        "type": "call",\r
+        "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5494,\r
+        "y": 5024.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "78a742b8.f3e49c",\r
+        "type": "switchNode",\r
+        "name": "switch $foundVpnName",\r
+        "xml": "<switch test=\"`$foundVpnName`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5339,\r
+        "y": 5079.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "198065a6.b0f88a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "198065a6.b0f88a",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5518,\r
+        "y": 5078.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "9b07993f.50303"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "da74bb6.e442948",\r
+        "type": "set",\r
+        "name": "unset secondary related variables",\r
+        "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",\r
+        "comments": "",\r
+        "x": 3380.249969482422,\r
+        "y": 433.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "feffc86e.486bc",\r
+        "type": "set",\r
+        "name": "set network-route-three",\r
+        "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 3344.249969482422,\r
+        "y": 683.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "12bfceb8.d75889",\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": 725.5357360839844,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "692e1a2b.3a9c5c",\r
+                "b2412330.9864f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "692e1a2b.3a9c5c",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3586.6663513183594,\r
+        "y": 561.5357666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "cf959ce5.f99248"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b2412330.9864f8",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3595.6663513183594,\r
+        "y": 608.5357666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "5a3f29c4.e69d68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5a3f29c4.e69d68",\r
+        "type": "set",\r
+        "name": "set hasSecondary true",\r
+        "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 3809.6663513183594,\r
+        "y": 602.5357666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cf959ce5.f99248",\r
+        "type": "set",\r
+        "name": "set hasSecondary false",\r
+        "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 3813.6663513183594,\r
+        "y": 558.5357666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "50bdde17.ca9b2",\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": 511.9857177734375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "eb2d50e2.230b88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "eb2d50e2.230b88",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4349.700408935547,\r
+        "y": 506.9857177734375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "7743c0e4.ff58d",\r
+                "fbbd6ec6.676af8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7743c0e4.ff58d",\r
+        "type": "set",\r
+        "name": "set network-route-SECONDARY-ROOT",\r
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 4593.700653076172,\r
+        "y": 498.9857177734375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fbbd6ec6.676af8",\r
+        "type": "set",\r
+        "name": "set network-route-C",\r
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 4539.700653076172,\r
+        "y": 538.9857177734375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f2575655.f8e378",\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": 741.3857421875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "9c041385.58f0a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9c041385.58f0a8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4302.700164794922,\r
+        "y": 784.3855590820312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "d46c9c27.1618a",\r
+                "fae38fd4.0207e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d46c9c27.1618a",\r
+        "type": "set",\r
+        "name": "set network-route-SECONDARY-ROOT",\r
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 4524.700164794922,\r
+        "y": 770.3856811523438,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fae38fd4.0207e8",\r
+        "type": "set",\r
+        "name": "set network-route-C",\r
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 4470.700164794922,\r
+        "y": 810.3856811523438,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3b541994.2db38e",\r
+        "type": "save",\r
+        "name": "get network-route-three from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3356.133270263672,\r
+        "y": 977.6190185546875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "a7d11d5e.62ca",\r
+                "b2aac144.2741f8",\r
+                "fb257074.006628"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a7d11d5e.62ca",\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": 960.6190185546875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b2aac144.2741f8",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3591.642333984375,\r
+        "y": 1003.0450744628906,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "fb257074.006628",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3595.642303466797,\r
+        "y": 1051.0450439453125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "9e133df7.481"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9e133df7.481",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3751.133270263672,\r
+        "y": 1020.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "5d283673.03481"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5d283673.03481",\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": 967.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "bd8b3788.0306c8",\r
+                "a98e1a14.629d2",\r
+                "64a49d41.8a256c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bd8b3788.0306c8",\r
+        "type": "outcome",\r
+        "name": "ROOT",\r
+        "xml": "<outcome value='ROOT'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4109.133270263672,\r
+        "y": 817.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "a81c580d.51216"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a98e1a14.629d2",\r
+        "type": "outcome",\r
+        "name": "LEAF",\r
+        "xml": "<outcome value='LEAF'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4105.133270263672,\r
+        "y": 873.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "589a315.c47ec5"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a81c580d.51216",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4235.133270263672,\r
+        "y": 825.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "22e46140.c55d46",\r
+                "52abbdbb.d37324"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "589a315.c47ec5",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4238.133270263672,\r
+        "y": 878.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "cf0c55ac.b4f5",\r
+                "5defc5f6.f6a484"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "64a49d41.8a256c",\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": 951.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "e6763c4c.a7231"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e6763c4c.a7231",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4254.133270263672,\r
+        "y": 972.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "1756c413.4839cc",\r
+                "782ca4c6.82ca7c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "22e46140.c55d46",\r
+        "type": "set",\r
+        "name": "set network-route-ROOT",\r
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 4482.133270263672,\r
+        "y": 855.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "52abbdbb.d37324",\r
+        "type": "set",\r
+        "name": "set network-route-B",\r
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 4474.133270263672,\r
+        "y": 897.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cf0c55ac.b4f5",\r
+        "type": "set",\r
+        "name": "set network-route-LEAF",\r
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 4475.133270263672,\r
+        "y": 949.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5defc5f6.f6a484",\r
+        "type": "set",\r
+        "name": "set network-route-A",\r
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 4462.133270263672,\r
+        "y": 989.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "782ca4c6.82ca7c",\r
+        "type": "set",\r
+        "name": "set network-route-C",\r
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 4436.133270263672,\r
+        "y": 1083.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1756c413.4839cc",\r
+        "type": "set",\r
+        "name": "set network-route-SECONDARY-ROOT",\r
+        "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
+        "comments": "",\r
+        "x": 4498.133270263672,\r
+        "y": 1039.6189575195312,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "484721d3.79272",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3700.13330078125,\r
+        "y": 2223.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "b5f1ffe9.23b0f8",\r
+                "1ac2c659.fd2752"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3809e292.fa07fe",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3527.466796875,\r
+        "y": 2224.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "484721d3.79272"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9915b355.be7de",\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": 2266.8598022460938,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a933d5e7.aab9f",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3525.466796875,\r
+        "y": 2313.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b5f1ffe9.23b0f8",\r
+        "type": "execute",\r
+        "name": "execute split tp-id to get pnf-name",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3990.466796875,\r
+        "y": 2239.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "5643d89b.9da4c",\r
+                "ff517248.3a648"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ff517248.3a648",\r
+        "type": "failure",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4213.466796875,\r
+        "y": 2194.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "55ae5854.3eda38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5643d89b.9da4c",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4215.466796875,\r
+        "y": 2258.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "b94af8ff.6b0728"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "729e2fc5.81fb",\r
+        "type": "save",\r
+        "name": "get p-interface-dst from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3321.466796875,\r
+        "y": 2245.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "3809e292.fa07fe",\r
+                "9915b355.be7de",\r
+                "a933d5e7.aab9f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c78860d4.be69b",\r
+        "type": "comment",\r
+        "name": "Question?",\r
+        "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
+        "comments": "",\r
+        "x": 3260.466796875,\r
+        "y": 2203.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b3267f6f.ff1998",\r
+        "type": "execute",\r
+        "name": "execute split tp-id to get pnf-name",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3341.466796875,\r
+        "y": 2093.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "95bacf59.0ff4f",\r
+                "1f5368f.a927697"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1f5368f.a927697",\r
+        "type": "failure",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3564.466796875,\r
+        "y": 2079.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "d9fb5654.5b333"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "95bacf59.0ff4f",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3566.466796875,\r
+        "y": 2112.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d9fb5654.5b333",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3712.466796875,\r
+        "y": 2072.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "5dfbdc91.e62934",\r
+                "c6faa1d4.308aa"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5dfbdc91.e62934",\r
+        "type": "set",\r
+        "name": "set pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",\r
+        "comments": "",\r
+        "x": 3904.4666748046875,\r
+        "y": 2009.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1ac2c659.fd2752",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3971.466796875,\r
+        "y": 2370.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "65bc2e8.d7ad75"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "65bc2e8.d7ad75",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4177.466796875,\r
+        "y": 2370.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "1afa33da.5ab90c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c6faa1d4.308aa",\r
+        "type": "get-resource",\r
+        "name": "get-resource src pnf",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3926.4666748046875,\r
+        "y": 2077.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "5532b203.91ac2c",\r
+                "8b9d700b.47a8d",\r
+                "394e6c3a.4b06ac"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5532b203.91ac2c",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4121.966796875,\r
+        "y": 2029.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "6665fa87.172574"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8b9d700b.47a8d",\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": 2084.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "de859847.0ba4f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "394e6c3a.4b06ac",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4118.966796875,\r
+        "y": 2141.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "bb9f9dd0.735df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bb9f9dd0.735df",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 4270.966796875,\r
+        "y": 2142.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6665fa87.172574",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4266.34912109375,\r
+        "y": 2026.9414367675781,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "5de1cc8d.104a64"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "62f42d2.2eff654",\r
+        "type": "set",\r
+        "name": "set SECONDARY-ROOT stuff",\r
+        "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",\r
+        "comments": "",\r
+        "x": 3322.13330078125,\r
+        "y": 2338.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "657d67ff.88d37",\r
+        "type": "comment",\r
+        "name": "NOT NEEDED ANYMORE?",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 4001.133270263672,\r
+        "y": 2314.285614013672,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b94af8ff.6b0728",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
+        "comments": "",\r
+        "x": 4374.466796875,\r
+        "y": 2277.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "55ae5854.3eda38",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4378.466796875,\r
+        "y": 2191.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "98470c66.40aa6",\r
+                "d46d48e0.99162"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1afa33da.5ab90c",\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": 2369.1075439453125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "ab3c9c27.f71ab"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "de859847.0ba4f",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 4281.966796875,\r
+        "y": 2087.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "98470c66.40aa6",\r
+        "type": "set",\r
+        "name": "set ltpId",\r
+        "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",\r
+        "comments": "",\r
+        "x": 4548.466796875,\r
+        "y": 2152.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d46d48e0.99162",\r
+        "type": "set",\r
+        "name": "set pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",\r
+        "comments": "",\r
+        "x": 4549.466796875,\r
+        "y": 2257.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e385276.9cfc7d8",\r
+        "type": "comment",\r
+        "name": "TODO: FIXME",\r
+        "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
+        "comments": "",\r
+        "x": 4544.466796875,\r
+        "y": 2206.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ab3c9c27.f71ab",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4601.583984375,\r
+        "y": 2358.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "55038a5c.3543e4",\r
+                "ba6f27b7.23068",\r
+                "b4e2b396.74f668"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "55038a5c.3543e4",\r
+        "type": "set",\r
+        "name": "set destination ttp-id",\r
+        "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 4816.583984375,\r
+        "y": 2320.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ba6f27b7.23068",\r
+        "type": "get-resource",\r
+        "name": "get-resource src TTP",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4813.583984375,\r
+        "y": 2359.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "1dac26ff.18cf11"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b4e2b396.74f668",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
+        "comments": "",\r
+        "x": 4769.083984375,\r
+        "y": 2401.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1ebc335e.7ecae5",\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": 2111.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "fdce260a.3abd28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5de1cc8d.104a64",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4450.4666748046875,\r
+        "y": 2041.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "ed710853.f63fd"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ed710853.f63fd",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4647.466796875,\r
+        "y": 2107.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "1ebc335e.7ecae5",\r
+                "55d60384.c1aed4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "55d60384.c1aed4",\r
+        "type": "outcome",\r
+        "name": "network-resource",\r
+        "xml": "<outcome value='network-resource'>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4852.466796875,\r
+        "y": 2184.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "dc3c174a.64011"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1dac26ff.18cf11",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4994.083984375,\r
+        "y": 2358.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "84d63541.1d27b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "84d63541.1d27b",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5152.083984375,\r
+        "y": 2358.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "e5032679.d8329"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e5032679.d8329",\r
+        "type": "set",\r
+        "name": "set destination tunnel tp ip",\r
+        "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",\r
+        "comments": "",\r
+        "x": 5359.083984375,\r
+        "y": 2358.626220703125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fdce260a.3abd28",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5027.466796875,\r
+        "y": 2103.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "5e499a66.459cd4",\r
+                "dca5a8c2.a2e2d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dca5a8c2.a2e2d",\r
+        "type": "execute",\r
+        "name": "get esr-thirdparty-sdnc",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5235.466796875,\r
+        "y": 2110.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "5837fed4.78811",\r
+                "3b1607b7.8add2",\r
+                "d23ccac.f36ffb8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dc3c174a.64011",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5029.466796875,\r
+        "y": 2176.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "a2aaab02.f42f78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5e499a66.459cd4",\r
+        "type": "set",\r
+        "name": "set esr-thirdparty-sdnc domainC id",\r
+        "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 5265.466796875,\r
+        "y": 2058.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a2aaab02.f42f78",\r
+        "type": "set",\r
+        "name": "set domainC ethernet layer network-id",\r
+        "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 5264.466796875,\r
+        "y": 2300.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5837fed4.78811",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5445.466796875,\r
+        "y": 2101.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "82649274.8d841"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3b1607b7.8add2",\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": 2156.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "b977b3e4.7f0818"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d23ccac.f36ffb8",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5442.466796875,\r
+        "y": 2213.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "cc6cd97.f9dc7a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cc6cd97.f9dc7a8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 5594.466796875,\r
+        "y": 2214.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b977b3e4.7f0818",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 5605.466796875,\r
+        "y": 2159.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "82649274.8d841",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5589.84912109375,\r
+        "y": 2098.9415588378906,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "d86ccfd2.8a362"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d86ccfd2.8a362",\r
+        "type": "set",\r
+        "name": "set controller domainC data",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
+        "comments": "",\r
+        "x": 5804.466796875,\r
+        "y": 2095.285888671875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "70f331ff.6983c8",\r
+        "type": "switchNode",\r
+        "name": "switch $hasSecondary",\r
+        "xml": "<switch test='`$hasSecondary`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3836.13330078125,\r
+        "y": 2707.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "b09a105f.8c6438"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b09a105f.8c6438",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4027.13330078125,\r
+        "y": 2711.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "3fb841a7.fe1d76"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3fb841a7.fe1d76",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4154.13330078125,\r
+        "y": 2710.2857666015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "5fa41047.5ae908"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5fa41047.5ae908",\r
+        "type": "save",\r
+        "name": "get secondary root uni from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4380.467041015625,\r
+        "y": 2703.619384765625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "494cb062.3b09d",\r
+                "8f274cf6.78b4a",\r
+                "75ad380b.fe1e68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "494cb062.3b09d",\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": 2597.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "e1748800.9b50a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8f274cf6.78b4a",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4742.975830078125,\r
+        "y": 2642.0452270507812,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "94646798.3ff8c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "75ad380b.fe1e68",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4738.975830078125,\r
+        "y": 2692.0452880859375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "b33dba75.a7d33"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5fbe7a1c.d00084",\r
+        "type": "save",\r
+        "name": "update SECONDARY-ROOT UNI in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5186.976318359375,\r
+        "y": 2687.04541015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e1748800.9b50a8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 4910.038330078125,\r
+        "y": 2596.9049682617188,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "94646798.3ff8c",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 4910.975830078125,\r
+        "y": 2642.0452270507812,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b33dba75.a7d33",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4907.975830078125,\r
+        "y": 2692.0452880859375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "d2b432cc.1ba93",\r
+                "5fbe7a1c.d00084"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d2b432cc.1ba93",\r
+        "type": "set",\r
+        "name": "set new bw",\r
+        "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source - $bwToBeDecreased`' />\n",\r
+        "comments": "",\r
+        "x": 5089.9765625,\r
+        "y": 2634.0452880859375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c59416d6.8ba4c8",\r
+        "type": "switchNode",\r
+        "name": "switch tmp.mmUNI-id-long != SECONDARY-ROOT UNI",\r
+        "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.SECONDARY-ROOT.uni-p-interface-long`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4624.467041015625,\r
+        "y": 3547.6190185546875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "5928f063.6a717"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5928f063.6a717",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4914.467041015625,\r
+        "y": 3549.6190185546875,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "3416f94d.d55766"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dc36b830.307698",\r
+        "type": "switchNode",\r
+        "name": "switch $hasSecondary",\r
+        "xml": "<switch test='`$hasSecondary`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4277,\r
+        "y": 5777.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "124e668b.8a0c71"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "124e668b.8a0c71",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4468,\r
+        "y": 5781.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "3f950141.3b094e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3f950141.3b094e",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4595,\r
+        "y": 5780.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "6756d23f.fb95d4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6756d23f.fb95d4",\r
+        "type": "switchNode",\r
+        "name": "switch 2-ROOTS in same domain?",\r
+        "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4820.3330078125,\r
+        "y": 5782.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "c6ced4f8.328df",\r
+                "bfbd9ba5.66b2f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c6ced4f8.328df",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5030.3330078125,\r
+        "y": 5759.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "7a2bf212.dfea8c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bfbd9ba5.66b2f8",\r
+        "type": "outcomeTrue",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5035.3330078125,\r
+        "y": 5808.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "cebc5e3b.0e3a98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a2bf212.dfea8c",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5156.3330078125,\r
+        "y": 5759.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "cebc5e3b.0e3a98",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5153.3330078125,\r
+        "y": 5815.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "65ef26ee.10a09",\r
+                "893a526e.ec5e18"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "65ef26ee.10a09",\r
+        "type": "save",\r
+        "name": "update SECONDARY-ROOT connectivity resource in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5467.3330078125,\r
+        "y": 5874.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "7678c022.e9095",\r
+        "type": "comment",\r
+        "name": "Update connectivity status to modified",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 5399.550048828125,\r
+        "y": 5826.4190673828125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "893a526e.ec5e18",\r
+        "type": "call",\r
+        "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5598,\r
+        "y": 5784.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e0d5d04e.46068",\r
+        "type": "switchNode",\r
+        "name": "switch $hasSecondary",\r
+        "xml": "<switch test='`$hasSecondary`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 868,\r
+        "y": 4974.6187744140625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "a56cc6d9.68657"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a56cc6d9.68657",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1059,\r
+        "y": 4978.6187744140625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "e90b308b.e1e54"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e90b308b.e1e54",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1186,\r
+        "y": 4977.6187744140625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "a8eda34d.bea12"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a8eda34d.bea12",\r
+        "type": "switchNode",\r
+        "name": "switch 2-ROOTS in same domain?",\r
+        "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1411.3330078125,\r
+        "y": 4979.6187744140625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "8a22e9e3.103c4",\r
+                "489f9bfc.0598fc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8a22e9e3.103c4",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1621.3330078125,\r
+        "y": 4956.6187744140625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "d0fe931e.edcfb"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "489f9bfc.0598fc",\r
+        "type": "outcomeTrue",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1626.3330078125,\r
+        "y": 5005.6187744140625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "8c7de2ba.22e088"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d0fe931e.edcfb",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1747.3330078125,\r
+        "y": 4956.6187744140625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "8c7de2ba.22e088",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1744.3330078125,\r
+        "y": 5012.6187744140625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "65c8b788.d0e558",\r
+                "4c911e6c.738418"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4c911e6c.738418",\r
+        "type": "call",\r
+        "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2189,\r
+        "y": 4981.6187744140625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "dd48d8e6.216f08",\r
+        "type": "comment",\r
+        "name": "Update connectivity status to modified",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1990.550048828125,\r
+        "y": 5023.4185791015625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "65c8b788.d0e558",\r
+        "type": "save",\r
+        "name": "update SECONDARY-ROOT connectivity resource in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2058.3330078125,\r
+        "y": 5071.6187744140625,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "1ed03004.8d6e4",\r
+        "type": "switchNode",\r
+        "name": "switch $hasSecondary",\r
+        "xml": "<switch test='`$hasSecondary`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1470.3333740234375,\r
+        "y": 5815.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "fb5466ce.3f1ab"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fb5466ce.3f1ab",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1661.3333740234375,\r
+        "y": 5819.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "dfa5085f.0e0158"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dfa5085f.0e0158",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1788.3333740234375,\r
+        "y": 5818.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "7e51bd6c.d2742c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7e51bd6c.d2742c",\r
+        "type": "switchNode",\r
+        "name": "switch 2-ROOTS in same domain?",\r
+        "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2013.6663818359375,\r
+        "y": 5820.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "6b07f1cb.4afc3",\r
+                "110d7be3.9bb1f4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6b07f1cb.4afc3",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2223.6663818359375,\r
+        "y": 5797.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "8b99f6ab.569ed"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "110d7be3.9bb1f4",\r
+        "type": "outcomeTrue",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2228.6663818359375,\r
+        "y": 5846.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "675a78e3.b9924"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8b99f6ab.569ed",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2349.6663818359375,\r
+        "y": 5797.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "675a78e3.b9924",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2346.6663818359375,\r
+        "y": 5853.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            [\r
+                "4f39f0f0.b363c8",\r
+                "87158cb0.5a00c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "87158cb0.5a00c8",\r
+        "type": "call",\r
+        "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2791.3333740234375,\r
+        "y": 5822.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b15d8a43.4b5da8",\r
+        "type": "comment",\r
+        "name": "Update connectivity status to modified",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 2592.8834228515625,\r
+        "y": 5864.4190673828125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4f39f0f0.b363c8",\r
+        "type": "save",\r
+        "name": "update SECONDARY-ROOT connectivity resource in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2660.6663818359375,\r
+        "y": 5912.6192626953125,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "bc0be831.bf6158",\r
+        "type": "execute",\r
+        "name": "execute Terminate SSE Connection",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1520.7666625976562,\r
+        "y": 6121,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "75a2fd5c.c75aac",\r
+        "type": "set",\r
+        "name": "set parameters",\r
+        "xml": "<set>\n<parameter name='subscriptionId' value='`$rcvd-bandwidth-value`' />\n",\r
+        "comments": "",\r
+        "x": 1452.800048828125,\r
+        "y": 6062.39990234375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b1b75307.3fe99",\r
+        "type": "execute",\r
+        "name": "execute Terminate SSE Connection",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2081.433349609375,\r
+        "y": 5541.2333984375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "eb743ad2.daea58",\r
+        "type": "execute",\r
+        "name": "execute delete service-pm",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $tmp.the-connectivity.etht-svc-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"delete\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"responsePrefix\" value=\"ethdelete-result\"/>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2045.333251953125,\r
+        "y": 5586.33349609375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4ed6624e.3d3df4",\r
+        "type": "execute",\r
+        "name": "execute delete service-pm",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"delete\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"responsePrefix\" value=\"ethdelete-result\"/>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4443.6669921875,\r
+        "y": 6460.33349609375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "383276dd.aedfd2",\r
+        "type": "execute",\r
+        "name": "execute delete service-pm",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"delete\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"responsePrefix\" value=\"ethdelete-result\"/>\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3103.666748046875,\r
+        "y": 7008.33349609375,\r
+        "z": "df66c4ba.dc49d",\r
+        "wires": [\r
+            []\r
+        ]\r
      }\r
  ]
 \ No newline at end of file