A few bug fixes for CLL closed-loop operation.

[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 1a4c840..5fb058b 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": "d6c73c0b.0d5f48",\r
+        "id": "b3c61f0e.0e195",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 157.88330078125,\r
-        "y": 156.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 183.56666564941406,\r
+        "y": 161.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d49f5b5f.8b9338"\r
+                "a48494fd.8b7d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d49f5b5f.8b9338",\r
+        "id": "a48494fd.8b7d",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -22,11102 +22,11102 @@
          "comments": "",\r
          "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
          "outputs": 1,\r
-        "x": 456.1690216064453,\r
-        "y": 212.52387523651123,\r
-        "z": "1806503a.76a7a",\r
+        "x": 481.8523864746094,\r
+        "y": 217.8047742843628,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "3720330.25593ce"\r
+                "6868eec5.8eff3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3720330.25593ce",\r
+        "id": "6868eec5.8eff3",\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": 297.2857971191406,\r
-        "z": "1806503a.76a7a",\r
+        "x": 487.99530029296875,\r
+        "y": 302.5666961669922,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7f694928.267bb8"\r
+                "42b0c518.6297dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7f694928.267bb8",\r
+        "id": "42b0c518.6297dc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 811.8833312988281,\r
-        "y": 356.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 837.5666961669922,\r
+        "y": 361.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "14360151.1c2e2f",\r
-                "2b05d42f.ff48b4",\r
-                "b833ca08.643e2"\r
+                "fec7e153.ea24b",\r
+                "30575656.398222",\r
+                "189baf2e.d72529"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "14360151.1c2e2f",\r
+        "id": "fec7e153.ea24b",\r
          "type": "returnSuccess",\r
          "name": "return success",\r
          "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
          "comments": "",\r
-        "x": 1113.2168273925781,\r
-        "y": 627.216064453125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1138.9001922607422,\r
+        "y": 632.4969635009766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2b05d42f.ff48b4",\r
+        "id": "30575656.398222",\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": 329.61907958984375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1160.3286590576172,\r
+        "y": 334.8999786376953,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "41fb5683.e713a",\r
-                "80e71c24.60d2d",\r
-                "fe4111b5.f2228"\r
+                "27345488.79731c",\r
+                "7e08d842.a4058",\r
+                "14b3e2f5.681565"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41fb5683.e713a",\r
+        "id": "27345488.79731c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1359.6452941894531,\r
-        "y": 187.61907958984375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1385.3286590576172,\r
+        "y": 192.8999786376953,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "41abc238.ea1884"\r
+                "a8487fba.2cb09"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80e71c24.60d2d",\r
+        "id": "7e08d842.a4058",\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": 257.193115234375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1380.8196258544922,\r
+        "y": 262.47401428222656,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "844c0ad5.c095b"\r
+                "26698778.b41f38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe4111b5.f2228",\r
+        "id": "14b3e2f5.681565",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1343.6452941894531,\r
-        "y": 303.61907958984375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1369.3286590576172,\r
+        "y": 308.8999786376953,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1e9cd9f4.55835e"\r
+                "e03cea3a.82881"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "692bc437.51a034",\r
+        "id": "b94ba14f.99f16",\r
          "type": "comment",\r
          "name": "new for TransportSlicing",\r
          "info": "",\r
          "comments": "",\r
-        "x": 1113.6452941894531,\r
-        "y": 217.61907958984375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1139.3286590576172,\r
+        "y": 222.8999786376953,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b833ca08.643e2",\r
+        "id": "189baf2e.d72529",\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": 269.61907958984375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1127.3286590576172,\r
+        "y": 274.8999786376953,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "41abc238.ea1884",\r
+        "id": "a8487fba.2cb09",\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": 184.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1625.5666961669922,\r
+        "y": 189.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "edbcfce1.4d552",\r
-                "d741e3bd.0b6788"\r
+                "7bdf94e9.87c2bc",\r
+                "770405a0.0ddc6c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "844c0ad5.c095b",\r
+        "id": "26698778.b41f38",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1509.9457092285156,\r
-        "y": 260.1455383300781,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1535.6290740966797,\r
+        "y": 265.4264373779297,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1e9cd9f4.55835e",\r
+        "id": "e03cea3a.82881",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 1513.8833312988281,\r
-        "y": 304.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1539.5666961669922,\r
+        "y": 309.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "edbcfce1.4d552",\r
+        "id": "7bdf94e9.87c2bc",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1804.8833312988281,\r
-        "y": 221.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1830.5666961669922,\r
+        "y": 226.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "589ae77f.807888"\r
+                "79eb131c.176e44"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d741e3bd.0b6788",\r
+        "id": "770405a0.0ddc6c",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1814.8833312988281,\r
-        "y": 148.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1840.5666961669922,\r
+        "y": 153.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "589ae77f.807888",\r
+        "id": "79eb131c.176e44",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1797.8833312988281,\r
-        "y": 296.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1823.5666961669922,\r
+        "y": 301.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "10bd96f7.8fa059",\r
-                "cb92da4c.da1bb",\r
-                "cbe49015.ae0dd",\r
-                "6c495f2.f763aa",\r
-                "4304e2aa.cc073c"\r
+                "9d4673ee.891e5",\r
+                "1a86601d.154a48",\r
+                "d6a895b8.ea711",\r
+                "3f0be5e9.f7ecd2",\r
+                "eca8d05b.38fb78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f06cb70.adae8c",\r
+        "id": "fd1dcea.f15be3",\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": 347.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2309.566696166992,\r
+        "y": 352.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c68fbf4e.5d82c",\r
-                "2146d17e.d0a56e",\r
-                "f04a7ec7.eb68d"\r
+                "2555bbc5.26f19c",\r
+                "93423d46.b14978",\r
+                "4c790d06.05e3ec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c68fbf4e.5d82c",\r
+        "id": "2555bbc5.26f19c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2499.883331298828,\r
-        "y": 414.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2525.566696166992,\r
+        "y": 419.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "cbd25b41.5a644"\r
+                "cc8af145.1212b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2146d17e.d0a56e",\r
+        "id": "93423d46.b14978",\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": 313.8597412109375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2526.057662963867,\r
+        "y": 319.14064025878906,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d020f647.b48948"\r
+                "fbfefea4.a2d338"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f04a7ec7.eb68d",\r
+        "id": "4c790d06.05e3ec",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2495.883331298828,\r
-        "y": 363.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2521.566696166992,\r
+        "y": 368.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "bf60182e.46d6e"\r
+                "d962a49c.c504b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "10bd96f7.8fa059",\r
+        "id": "9d4673ee.891e5",\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": 328.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2026.5666961669922,\r
+        "y": 333.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9d7e7b42.ef2a18",\r
-                "5f06cb70.adae8c",\r
-                "b4f5dada.48378",\r
-                "5db562b1.71111c"\r
+                "d3206ca7.c31d1",\r
+                "fd1dcea.f15be3",\r
+                "426ddfc0.c628b",\r
+                "d0874bda.7e1ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d7e7b42.ef2a18",\r
+        "id": "d3206ca7.c31d1",\r
          "type": "set",\r
          "name": "set the current allotted-resource-id",\r
          "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 2280.883331298828,\r
-        "y": 266.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2306.566696166992,\r
+        "y": 271.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6c495f2.f763aa",\r
+        "id": "3f0be5e9.f7ecd2",\r
          "type": "set",\r
          "name": "set tmp.arr",\r
          "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",\r
          "comments": "",\r
-        "x": 1974.8833312988281,\r
-        "y": 278.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2000.5666961669922,\r
+        "y": 283.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cb92da4c.da1bb",\r
+        "id": "1a86601d.154a48",\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": 137.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2043.5666961669922,\r
+        "y": 142.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "cbe49015.ae0dd",\r
+        "id": "d6a895b8.ea711",\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": 178.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2055.566696166992,\r
+        "y": 183.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f6d3e50c.b329e8",\r
+        "id": "c8d3ec04.e3f8a8",\r
          "type": "comment",\r
          "name": "The following two nodes are for PCE",\r
          "info": "",\r
          "comments": "",\r
-        "x": 2054.883331298828,\r
-        "y": 90.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2080.566696166992,\r
+        "y": 95.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "300ce0be.29882",\r
+        "id": "d7434469.de441",\r
          "type": "set",\r
          "name": "set tmp.arr",\r
          "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",\r
          "comments": "",\r
-        "x": 1974.8833312988281,\r
-        "y": 224.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2000.5666961669922,\r
+        "y": 229.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d020f647.b48948",\r
+        "id": "fbfefea4.a2d338",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2678.883331298828,\r
-        "y": 316.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2704.566696166992,\r
+        "y": 321.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bf60182e.46d6e",\r
+        "id": "d962a49c.c504b8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 2678.820831298828,\r
-        "y": 365.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2704.504196166992,\r
+        "y": 370.70692443847656,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cbd25b41.5a644",\r
+        "id": "cc8af145.1212b8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2680.820831298828,\r
-        "y": 416.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2706.504196166992,\r
+        "y": 421.70692443847656,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "365e9f97.d4a028"\r
+                "30ad22b3.c0b5e6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "365e9f97.d4a028",\r
+        "id": "30ad22b3.c0b5e6",\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": 363.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2999.504196166992,\r
+        "y": 368.70692443847656,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6e92372c.3a07f8",\r
-                "c96fb012.9bb888",\r
-                "95b7cbb5.ac06c8"\r
+                "5234d98d.9f94d",\r
+                "83314642.8bc358",\r
+                "55523c43.af8514"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c96fb012.9bb888",\r
+        "id": "83314642.8bc358",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3277.311767578125,\r
-        "y": 20,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3302.995132446289,\r
+        "y": 25.280899047851562,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "58ab1443.358994"\r
+                "f9033318.3a82e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "58ab1443.358994",\r
+        "id": "f9033318.3a82e",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3454.88330078125,\r
-        "y": 20.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3480.566665649414,\r
+        "y": 25.566665649414062,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "95b7cbb5.ac06c8",\r
+        "id": "55523c43.af8514",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3272.82080078125,\r
-        "y": 69.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3298.504165649414,\r
+        "y": 74.70692443847656,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1f97dde6.30f20a"\r
+                "ed442c0e.cae2b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1f97dde6.30f20a",\r
+        "id": "ed442c0e.cae2b8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3454.82080078125,\r
-        "y": 69.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3480.504165649414,\r
+        "y": 74.70692443847656,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6e92372c.3a07f8",\r
+        "id": "5234d98d.9f94d",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3276.82080078125,\r
-        "y": 120.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3302.504165649414,\r
+        "y": 125.70692443847656,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7a25dc67.63046c"\r
+                "7ab56666.401778"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a25dc67.63046c",\r
+        "id": "7ab56666.401778",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3456.82080078125,\r
-        "y": 120.426025390625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3482.504165649414,\r
+        "y": 125.70692443847656,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "742cdaa9.4808c4"\r
+                "6c101067.0de5e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "742cdaa9.4808c4",\r
+        "id": "6c101067.0de5e8",\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": 491.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3018.566696166992,\r
+        "y": 496.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9afa3e4f.f2f2c8",\r
-                "ce58b166.b2448"\r
+                "646ab584.76e45c",\r
+                "ffe35827.b1255"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ce58b166.b2448",\r
+        "id": "ffe35827.b1255",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3332.88330078125,\r
-        "y": 262.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3358.566665649414,\r
+        "y": 267.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9afa3e4f.f2f2c8",\r
+        "id": "646ab584.76e45c",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3331.88330078125,\r
-        "y": 316.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3357.566665649414,\r
+        "y": 321.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "aba0f7b5.b64ec8"\r
+                "7579f2ad.787884"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "50f7604e.0c4dc8",\r
+        "id": "76ff4ece.4716a",\r
          "type": "outcome",\r
          "name": "network-policy",\r
          "xml": "<outcome value='network-policy'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4076.88330078125,\r
-        "y": 270.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4102.566665649414,\r
+        "y": 275.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e079a6c2.9c941"\r
+                "522d04a5.cf337c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e079a6c2.9c941",\r
+        "id": "522d04a5.cf337c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4253.8831787109375,\r
-        "y": 263.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4279.566543579102,\r
+        "y": 268.56654357910156,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "83280d27.4bae7",\r
-                "92c6fb1f.05a328"\r
+                "ff700b35.f88fd",\r
+                "a95b674a.f71a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aba0f7b5.b64ec8",\r
+        "id": "7579f2ad.787884",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3495.88330078125,\r
-        "y": 242.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3521.566665649414,\r
+        "y": 247.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a8c08369.0aef78",\r
-                "98755b5f.40e4a"\r
+                "687e4dd8.df6004",\r
+                "7a6c4648.75b9a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8c08369.0aef78",\r
+        "id": "687e4dd8.df6004",\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": 3776.88330078125,\r
-        "y": 198.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3802.566665649414,\r
+        "y": 203.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "64ebbb1e.14821c"\r
+                "498ba81e.b961f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "64ebbb1e.14821c",\r
+        "id": "498ba81e.b961f8",\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": 4038.88330078125,\r
-        "y": 198.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4064.566665649414,\r
+        "y": 203.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "50f7604e.0c4dc8"\r
+                "76ff4ece.4716a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "83280d27.4bae7",\r
+        "id": "ff700b35.f88fd",\r
          "type": "set",\r
          "name": "set the 1st network-policy-id",\r
          "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4496.8831787109375,\r
-        "y": 220.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4522.566543579102,\r
+        "y": 225.56654357910156,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "92c6fb1f.05a328",\r
+        "id": "a95b674a.f71a",\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": 4485.8831787109375,\r
-        "y": 275.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4511.566543579102,\r
+        "y": 280.56654357910156,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "26a63936.d2dcb6",\r
-                "935c2a76.01522",\r
-                "61809f6c.f102a"\r
+                "4864ccac.4c9fb4",\r
+                "b78f5441.c1bfd",\r
+                "4088ff64.ba745"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "61809f6c.f102a",\r
+        "id": "4088ff64.ba745",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4738.88330078125,\r
-        "y": 161.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4764.566665649414,\r
+        "y": 166.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "8483d549.4ff1d8"\r
+                "745cd258.155a8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8483d549.4ff1d8",\r
+        "id": "745cd258.155a8c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4887.454833984375,\r
-        "y": 161.571533203125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4913.138198852539,\r
+        "y": 166.85243225097656,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "79f73429.37a0f4",\r
+        "id": "d814f814.02812",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 4886.392333984375,\r
-        "y": 205.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4912.075698852539,\r
+        "y": 210.99269104003906,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "935c2a76.01522",\r
+        "id": "b78f5441.c1bfd",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4727.392333984375,\r
-        "y": 205.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4753.075698852539,\r
+        "y": 210.99269104003906,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "79f73429.37a0f4"\r
+                "d814f814.02812"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26a63936.d2dcb6",\r
+        "id": "4864ccac.4c9fb4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4734.392333984375,\r
-        "y": 284.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4760.075698852539,\r
+        "y": 289.99269104003906,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "4efa868e.4aaf8"\r
+                "efd9fdb1.0f83a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4efa868e.4aaf8",\r
+        "id": "efd9fdb1.0f83a",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4873.392333984375,\r
-        "y": 284.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4899.075698852539,\r
+        "y": 289.99269104003906,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ac693539.f50e98",\r
-                "9a31854c.efaef8"\r
+                "f2ffc2c8.9c3d6",\r
+                "ca4f06f7.bf7198"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ac693539.f50e98",\r
+        "id": "f2ffc2c8.9c3d6",\r
          "type": "set",\r
          "name": "set the max bandwidth",\r
          "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
          "comments": "",\r
-        "x": 5078.88330078125,\r
-        "y": 282.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5104.566665649414,\r
+        "y": 287.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9a31854c.efaef8",\r
+        "id": "ca4f06f7.bf7198",\r
          "type": "set",\r
          "name": "set the max bandwidth",\r
          "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
          "comments": "",\r
-        "x": 5077.88330078125,\r
-        "y": 328.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5103.566665649414,\r
+        "y": 333.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "98755b5f.40e4a",\r
+        "id": "7a6c4648.75b9a",\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": 3593.88330078125,\r
-        "y": 314.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3619.566665649414,\r
+        "y": 319.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a599949c.47c2"\r
+                "2b038d01.8bcf5a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a599949c.47c2",\r
+        "id": "2b038d01.8bcf5a",\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": 3873.88330078125,\r
-        "y": 314.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3899.566665649414,\r
+        "y": 319.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9f30fb79.9864f8"\r
+                "924692b1.dbe118"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9f30fb79.9864f8",\r
+        "id": "924692b1.dbe118",\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": 803.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2282.5668182373047,\r
+        "y": 808.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "4497a7be.db159"\r
+                "e627a5b7.666348"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4497a7be.db159",\r
+        "id": "e627a5b7.666348",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2433.883331298828,\r
-        "y": 796.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2459.566696166992,\r
+        "y": 801.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "748da704.3dc228",\r
-                "132fdd9a.6a584a"\r
+                "abe018e3.2ab958",\r
+                "b299dbd0.7106d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "748da704.3dc228",\r
+        "id": "abe018e3.2ab958",\r
          "type": "set",\r
          "name": "set the current logical-link-name",\r
          "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 2676.883331298828,\r
-        "y": 753.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2702.566696166992,\r
+        "y": 758.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "132fdd9a.6a584a",\r
+        "id": "b299dbd0.7106d8",\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": 808.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2691.566696166992,\r
+        "y": 813.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1d5c52ad.8a4fcd",\r
-                "c6fd8eb5.369a58",\r
-                "b0ba9e98.5ef29"\r
+                "73425fcf.6d608",\r
+                "9a2fb745.49c558",\r
+                "c8c584c4.60469"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1d5c52ad.8a4fcd",\r
+        "id": "73425fcf.6d608",\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": 786.8597412109375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2983.057662963867,\r
+        "y": 792.1406402587891,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "81786826.f1adc"\r
+                "11a6918b.0ed79e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c6fd8eb5.369a58",\r
+        "id": "9a2fb745.49c558",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2945.883331298828,\r
-        "y": 831.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2971.566696166992,\r
+        "y": 836.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "568abbfd.c78f14"\r
+                "147fb75c.cecad1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81786826.f1adc",\r
+        "id": "11a6918b.0ed79e",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3105.945831298828,\r
-        "y": 787.1455078125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3131.629196166992,\r
+        "y": 792.4264068603516,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "568abbfd.c78f14",\r
+        "id": "147fb75c.cecad1",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3104.883331298828,\r
-        "y": 831.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3130.566696166992,\r
+        "y": 836.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b0ba9e98.5ef29",\r
+        "id": "c8c584c4.60469",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2952.883331298828,\r
-        "y": 910.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2978.566696166992,\r
+        "y": 915.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "56d4032d.446f0c"\r
+                "18430aa7.b0cd65"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "56d4032d.446f0c",\r
+        "id": "18430aa7.b0cd65",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3091.883331298828,\r
-        "y": 910.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3117.566696166992,\r
+        "y": 915.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a588efb1.b17fd",\r
-                "9c7e31dc.43bc2",\r
-                "64cc49aa.338118",\r
-                "a266d487.c02dd",\r
-                "f1099f4d.7efe5",\r
-                "6aa3951e.157a4c",\r
-                "4618e1c0.461d88",\r
-                "d38e0865.514348",\r
-                "eef6ad07.9c7d5",\r
-                "78d4922e.8ebe04",\r
-                "c220ecdf.76a978",\r
-                "940f9aa.5464fe8",\r
-                "14f1d608.fff342",\r
-                "5e5dd175.2ee1b",\r
-                "95f11825.f517d8",\r
-                "79dba259.2612cc",\r
-                "11c024cf.1cb7db",\r
-                "8bfce836.dcd148",\r
-                "ec6aad53.7d628",\r
-                "c02bc34.16c814",\r
-                "ad2e0fde.b44de8",\r
-                "d87e7a94.9bda08"\r
+                "a56438ce.7b3648",\r
+                "cd9c4fe8.e67498",\r
+                "b8cad49c.dd7ca",\r
+                "768c9bf8.5beb74",\r
+                "6f1a328d.ae400c",\r
+                "b16688a0.4defc",\r
+                "2c1d8b21.e96e8c",\r
+                "63cddf09.26d868",\r
+                "9d9de9db.5c38b8",\r
+                "e5f9b3dc.c2f9f",\r
+                "169ca3b9.4d31a4",\r
+                "1c28fc30.faaf74",\r
+                "19822907.e2052f",\r
+                "e8ad32eb.9df94",\r
+                "cf9533e5.c2371",\r
+                "22a945f9.085212",\r
+                "94938481.855978",\r
+                "7edb995a.421908",\r
+                "f054f8f8.d1b3a",\r
+                "dab7847.8f75af8",\r
+                "71a7eba7.ddb6fc",\r
+                "a71111e6.40602"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6986f9e3.b25bc8",\r
+        "id": "ece3c8dc.fca8e",\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": 3435.883270263672,\r
-        "y": 384.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3461.566635131836,\r
+        "y": 389.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a588efb1.b17fd",\r
+        "id": "a56438ce.7b3648",\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": 3416.883270263672,\r
-        "y": 484.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3442.566635131836,\r
+        "y": 489.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "940f9aa.5464fe8",\r
+        "id": "1c28fc30.faaf74",\r
          "type": "set",\r
          "name": "set new ethernet-service-name",\r
          "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 3370.883270263672,\r
-        "y": 535.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3396.566635131836,\r
+        "y": 540.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9c7e31dc.43bc2",\r
+        "id": "cd9c4fe8.e67498",\r
          "type": "set",\r
          "name": "set network-route-one",\r
          "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 3344.883270263672,\r
-        "y": 584.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3370.566635131836,\r
+        "y": 589.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "64cc49aa.338118",\r
+        "id": "b8cad49c.dd7ca",\r
          "type": "set",\r
          "name": "set network-route-two",\r
          "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 3343.883270263672,\r
-        "y": 633.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3369.566635131836,\r
+        "y": 638.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a266d487.c02dd",\r
+        "id": "768c9bf8.5beb74",\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": 3352.883270263672,\r
-        "y": 771.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3378.566635131836,\r
+        "y": 776.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1276721a.95abce",\r
-                "59c480c0.a5bb2",\r
-                "56433b78.3dde04"\r
+                "fe7f9a9e.cf1db8",\r
+                "156916f6.f1ec61",\r
+                "66ef43c6.2e3d64"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f1099f4d.7efe5",\r
+        "id": "6f1a328d.ae400c",\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": 3345.883270263672,\r
-        "y": 832.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3371.566635131836,\r
+        "y": 837.5665435791016,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "194bfca3.59d3d3",\r
-                "f16b27ad.e4a0d",\r
-                "a3a5e961.07f0a"\r
+                "6dadc494.d9aa04",\r
+                "672f337a.746964",\r
+                "bcaed2fe.1f9ae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1276721a.95abce",\r
+        "id": "fe7f9a9e.cf1db8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3601.883026123047,\r
-        "y": 666.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3627.566390991211,\r
+        "y": 671.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5d3d475c.e8e038"\r
+                "cc05b9e7.0fc9a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59c480c0.a5bb2",\r
+        "id": "156916f6.f1ec61",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3595.392059326172,\r
-        "y": 707.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3621.075424194336,\r
+        "y": 712.9926910400391,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c3e2bb46.01e6a"\r
+                "4587637b.94db5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "56433b78.3dde04",\r
+        "id": "66ef43c6.2e3d64",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3590.392059326172,\r
-        "y": 757.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3616.075424194336,\r
+        "y": 762.9926910400391,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1b66d741.6f4631"\r
+                "1eb5ad40.d06413"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5d3d475c.e8e038",\r
+        "id": "cc05b9e7.0fc9a",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3750.454559326172,\r
-        "y": 665.571533203125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3776.137924194336,\r
+        "y": 670.8524322509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c3e2bb46.01e6a",\r
+        "id": "4587637b.94db5c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3740.392059326172,\r
-        "y": 715.7117919921875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3766.075424194336,\r
+        "y": 720.9926910400391,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "194bfca3.59d3d3",\r
+        "id": "6dadc494.d9aa04",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3566.883270263672,\r
-        "y": 818.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3592.566635131836,\r
+        "y": 823.5665435791016,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "8a4c46dd.2c996"\r
+                "1b1304b9.a5e66b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f16b27ad.e4a0d",\r
+        "id": "672f337a.746964",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3562.392303466797,\r
-        "y": 867.711669921875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3588.075668334961,\r
+        "y": 872.9925689697266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "171f1743.fcb899"\r
+                "e774fced.6104a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a3a5e961.07f0a",\r
+        "id": "bcaed2fe.1f9ae",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3563.392303466797,\r
-        "y": 920.711669921875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3589.075668334961,\r
+        "y": 925.9925689697266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c731b8e7.238d38"\r
+                "c076d47b.eaded"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8a4c46dd.2c996",\r
+        "id": "1b1304b9.a5e66b",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3719.4546508789062,\r
-        "y": 823.5714111328125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3745.1380157470703,\r
+        "y": 828.8523101806641,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "171f1743.fcb899",\r
+        "id": "e774fced.6104a8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3705.392303466797,\r
-        "y": 867.711669921875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3731.075668334961,\r
+        "y": 872.9925689697266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1b66d741.6f4631",\r
+        "id": "1eb5ad40.d06413",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3762.883026123047,\r
-        "y": 768.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3788.566390991211,\r
+        "y": 773.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "cecd018.605a88"\r
+                "7f2b8c9b.099c14"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c731b8e7.238d38",\r
+        "id": "c076d47b.eaded",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3716.883270263672,\r
-        "y": 920.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3742.566635131836,\r
+        "y": 925.5665435791016,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f9f52da3.b95878"\r
+                "8445401a.e44628"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cecd018.605a88",\r
+        "id": "7f2b8c9b.099c14",\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": 3923.883270263672,\r
-        "y": 655.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3949.566635131836,\r
+        "y": 660.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f0539c95.2ea1d",\r
-                "44b1b904.08834",\r
-                "41d8ce05.5caae"\r
+                "b0a8e75a.0829b8",\r
+                "40b074e3.b8cf9c",\r
+                "9b9082d.d33238"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f9f52da3.b95878",\r
+        "id": "8445401a.e44628",\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": 3915.883270263672,\r
-        "y": 840.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3941.566635131836,\r
+        "y": 845.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "abd0f375.c30ff",\r
-                "eba9832a.ffee4",\r
-                "4bc67983.47c6f"\r
+                "65174d4b.beb5c4",\r
+                "b443365d.1a3bf",\r
+                "a01fe37.2547ea"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f0539c95.2ea1d",\r
+        "id": "b0a8e75a.0829b8",\r
          "type": "outcome",\r
          "name": "ROOT",\r
          "xml": "<outcome value='ROOT'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4147.883758544922,\r
-        "y": 359.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4173.567123413086,\r
+        "y": 364.5666046142578,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "653aef18.035f68"\r
+                "9aca5d50.3d0028"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "44b1b904.08834",\r
+        "id": "40b074e3.b8cf9c",\r
          "type": "outcome",\r
          "name": "LEAF",\r
          "xml": "<outcome value='LEAF'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4149.883758544922,\r
-        "y": 413.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4175.567123413086,\r
+        "y": 418.5666046142578,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "4456e14a.c61538"\r
+                "d411ea2f.0fea6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "abd0f375.c30ff",\r
+        "id": "65174d4b.beb5c4",\r
          "type": "outcome",\r
          "name": "ROOT",\r
          "xml": "<outcome value='ROOT'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4113.883758544922,\r
-        "y": 619.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4139.567123413086,\r
+        "y": 624.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "dc25cb2f.e0da48"\r
+                "b1818ac5.01eff"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eba9832a.ffee4",\r
+        "id": "b443365d.1a3bf",\r
          "type": "outcome",\r
          "name": "LEAF",\r
          "xml": "<outcome value='LEAF'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4115.883758544922,\r
-        "y": 673.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4141.567123413086,\r
+        "y": 678.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7b200b08.d1724c"\r
+                "7efc1cf.1fed664"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a11ab8.c3c2f548",\r
+        "id": "f6cae941.406738",\r
          "type": "set",\r
          "name": "set network-route-ROOT",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4457.883758544922,\r
-        "y": 311.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4483.567123413086,\r
+        "y": 316.5666046142578,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7e53eaf1.53c434",\r
+        "id": "71276df1.c00474",\r
          "type": "set",\r
          "name": "set network-route-LEAF",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4450.883758544922,\r
-        "y": 409.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4476.567123413086,\r
+        "y": 414.5666046142578,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "231b0ffb.372688",\r
+        "id": "18b30ce8.3b3b9b",\r
          "type": "set",\r
          "name": "set network-route-ROOT",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4429.883758544922,\r
-        "y": 592.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4455.567123413086,\r
+        "y": 597.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1b4ef1ae.221bae",\r
+        "id": "bdb5a388.dc57d",\r
          "type": "set",\r
          "name": "set network-route-LEAF",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4433.883758544922,\r
-        "y": 685.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4459.567123413086,\r
+        "y": 690.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f61c43e6.4dbe28",\r
+        "id": "365f833d.25b8d4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3609.88330078125,\r
-        "y": 1345.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3635.566665649414,\r
+        "y": 1350.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "58e01c76.2a233c"\r
+                "9fbce841.2e2e5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f239d755.e3888",\r
+        "id": "374e0e92.acb9ca",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3619.374267578125,\r
-        "y": 1387.8598022460938,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3645.057632446289,\r
+        "y": 1393.1407012939453,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ffe24b12.95af4"\r
+                "544f9b1.6ea9ce4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7fecb9.d188bb48",\r
+        "id": "a1cbd1ad.ad2c18",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3607.88330078125,\r
-        "y": 1434.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3633.566665649414,\r
+        "y": 1439.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6af9609c.4c1ea"\r
+                "875bb611.eebb3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6132f0e6.1cd1a8",\r
+        "id": "def43ac8.216f6",\r
          "type": "comment",\r
          "name": "Question?",\r
          "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
          "comments": "",\r
-        "x": 3309.88330078125,\r
-        "y": 1307.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3335.566665649414,\r
+        "y": 1312.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4618e1c0.461d88",\r
+        "id": "2c1d8b21.e96e8c",\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": 3352.88330078125,\r
-        "y": 1372.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3378.566665649414,\r
+        "y": 1377.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f61c43e6.4dbe28",\r
-                "f239d755.e3888",\r
-                "7fecb9.d188bb48"\r
+                "365f833d.25b8d4",\r
+                "374e0e92.acb9ca",\r
+                "a1cbd1ad.ad2c18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6aa3951e.157a4c",\r
+        "id": "b16688a0.4defc",\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": 3353.883270263672,\r
-        "y": 1124.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3379.566635131836,\r
+        "y": 1129.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "273ca4a1.1ba064",\r
-                "4a30eba.076bb14"\r
+                "34aa1b4f.ba281c",\r
+                "141fecfc.2b9053"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a30eba.076bb14",\r
+        "id": "141fecfc.2b9053",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3576.883270263672,\r
-        "y": 1110.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3602.566635131836,\r
+        "y": 1115.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "3b0c1a6c.5d807e"\r
+                "6c70ba9f.edd1f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "273ca4a1.1ba064",\r
+        "id": "34aa1b4f.ba281c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3578.883270263672,\r
-        "y": 1143.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3604.566635131836,\r
+        "y": 1148.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1277d9f.69171a6"\r
+                "809a76b0.69bfb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "58e01c76.2a233c",\r
+        "id": "9fbce841.2e2e5",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3782.5498046875,\r
-        "y": 1344.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3808.233169555664,\r
+        "y": 1349.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f718a065.a6f86",\r
-                "66055190.fb6538"\r
+                "d947a96b.ec0e98",\r
+                "78e35528.26de5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ffe24b12.95af4",\r
+        "id": "544f9b1.6ea9ce4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3772.9456787109375,\r
-        "y": 1391.1455383300781,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3798.6290435791016,\r
+        "y": 1396.4264373779297,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6af9609c.4c1ea",\r
+        "id": "875bb611.eebb3",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3776.88330078125,\r
-        "y": 1435.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3802.566665649414,\r
+        "y": 1440.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f718a065.a6f86",\r
+        "id": "d947a96b.ec0e98",\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": 4046.88330078125,\r
-        "y": 1328.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4072.566665649414,\r
+        "y": 1333.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "97c35025.9a9a9",\r
-                "3a478d5e.f8179a"\r
+                "15bba4b9.d2a05b",\r
+                "3ad9867a.e42d4a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3a478d5e.f8179a",\r
+        "id": "3ad9867a.e42d4a",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4269.88330078125,\r
-        "y": 1283.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4295.566665649414,\r
+        "y": 1288.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e66b8dbe.739f2"\r
+                "6b929f53.c8f4f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "97c35025.9a9a9",\r
+        "id": "15bba4b9.d2a05b",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4271.88330078125,\r
-        "y": 1347.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4297.566665649414,\r
+        "y": 1352.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "8b5a4d36.3a2bb8"\r
+                "1ee9816c.cbffbf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8b5a4d36.3a2bb8",\r
+        "id": "1ee9816c.cbffbf",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 4433.88330078125,\r
-        "y": 1343.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4459.566665649414,\r
+        "y": 1348.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e66b8dbe.739f2",\r
+        "id": "6b929f53.c8f4f8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4434.88330078125,\r
-        "y": 1280.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4460.566665649414,\r
+        "y": 1285.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9ab6076f.b64fb",\r
-                "39801818.ba2ad"\r
+                "2ecc2d46.f12c7a",\r
+                "9183827d.0d9718"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1277d9f.69171a6",\r
+        "id": "809a76b0.69bfb",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 3721.883270263672,\r
-        "y": 1140.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3747.566635131836,\r
+        "y": 1145.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3b0c1a6c.5d807e",\r
+        "id": "6c70ba9f.edd1f4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3724.883270263672,\r
-        "y": 1103.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3750.566635131836,\r
+        "y": 1108.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "67f68b93.dc06f4",\r
-                "41f439c7.6c07f8"\r
+                "920604a0.fd0cf",\r
+                "ad826b52.8e9fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "67f68b93.dc06f4",\r
+        "id": "920604a0.fd0cf",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",\r
          "comments": "",\r
-        "x": 3916.883270263672,\r
-        "y": 1105.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3942.566635131836,\r
+        "y": 1110.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "66055190.fb6538",\r
+        "id": "78e35528.26de5c",\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": 4006.88330078125,\r
-        "y": 1460.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4032.566665649414,\r
+        "y": 1465.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c328fdc0.a05af"\r
+                "75c2427c.8c10cc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c328fdc0.a05af",\r
+        "id": "75c2427c.8c10cc",\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": 4212.88330078125,\r
-        "y": 1460.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4238.566665649414,\r
+        "y": 1465.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "23ec2727.c8e7f"\r
+                "5fbadc48.b9fad4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23ec2727.c8e7f",\r
+        "id": "5fbadc48.b9fad4",\r
          "type": "outcome",\r
          "name": "tunnel-termination-point",\r
          "xml": "<outcome value='tunnel-termination-point'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4428.1689453125,\r
-        "y": 1460.1075439453125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4453.852310180664,\r
+        "y": 1465.388442993164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e1b77e00.282c4"\r
+                "4d8b1a53.4482f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41f439c7.6c07f8",\r
+        "id": "ad826b52.8e9fa",\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": 3913.883270263672,\r
-        "y": 1170.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3939.566635131836,\r
+        "y": 1175.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "89a8d2d0.88f3",\r
-                "6334a351.696854",\r
-                "c542e0e0.bf42b"\r
+                "70c21f01.ccf8c",\r
+                "fd021df7.11e338",\r
+                "df54403.64867c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89a8d2d0.88f3",\r
+        "id": "70c21f01.ccf8c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4109.383392333984,\r
-        "y": 1122.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4135.066757202148,\r
+        "y": 1127.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c62cbf2d.6fa458"\r
+                "37006658.3814c2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6334a351.696854",\r
+        "id": "fd021df7.11e338",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4101.383392333984,\r
-        "y": 1177.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4127.066757202148,\r
+        "y": 1182.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "143c4bf3.014b4c"\r
+                "24c12ef7.012c52"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c542e0e0.bf42b",\r
+        "id": "df54403.64867c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4106.383392333984,\r
-        "y": 1234.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4132.066757202148,\r
+        "y": 1239.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ca788cf9.3c8038"\r
+                "2b777797.09f0b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ca788cf9.3c8038",\r
+        "id": "2b777797.09f0b8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4258.383392333984,\r
-        "y": 1235.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4284.066757202148,\r
+        "y": 1240.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "143c4bf3.014b4c",\r
+        "id": "24c12ef7.012c52",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4269.383392333984,\r
-        "y": 1180.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4295.066757202148,\r
+        "y": 1185.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c62cbf2d.6fa458",\r
+        "id": "37006658.3814c2",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4253.765716552734,\r
-        "y": 1119.9414367675781,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4279.449081420898,\r
+        "y": 1125.2223358154297,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "aab3feab.bcb5b"\r
+                "9c96e054.d5da8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aab3feab.bcb5b",\r
+        "id": "9c96e054.d5da8",\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": 4447.883270263672,\r
-        "y": 1164.2857055664062,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4473.566635131836,\r
+        "y": 1169.5666046142578,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ac9dba33.9ee3a8"\r
+                "efaf74dd.57cd28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "39801818.ba2ad",\r
+        "id": "9183827d.0d9718",\r
          "type": "set",\r
          "name": "set ltpId",\r
          "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",\r
          "comments": "",\r
-        "x": 4604.88330078125,\r
-        "y": 1238.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4630.566665649414,\r
+        "y": 1243.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9ab6076f.b64fb",\r
+        "id": "2ecc2d46.f12c7a",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",\r
          "comments": "",\r
-        "x": 4605.88330078125,\r
-        "y": 1346.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4631.566665649414,\r
+        "y": 1351.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6381354a.11146c",\r
+        "id": "e06b7ada.eb82e8",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
          "comments": "",\r
-        "x": 4606.88330078125,\r
-        "y": 1295.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4632.566665649414,\r
+        "y": 1300.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e1b77e00.282c4",\r
+        "id": "4d8b1a53.4482f4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4635.00048828125,\r
-        "y": 1460.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4660.683853149414,\r
+        "y": 1465.906997680664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a1ad6a91.cdad1",\r
-                "bef51671.772a1",\r
-                "55e08f7a.b87978"\r
+                "dced3e1c.40e48",\r
+                "5a4be8c3.e9f088",\r
+                "301c508b.710a5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1ad6a91.cdad1",\r
+        "id": "dced3e1c.40e48",\r
          "type": "set",\r
          "name": "set source ttp-id",\r
          "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 4850.00048828125,\r
-        "y": 1422.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4875.683853149414,\r
+        "y": 1427.906997680664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bef51671.772a1",\r
+        "id": "5a4be8c3.e9f088",\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": 4847.00048828125,\r
-        "y": 1461.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4872.683853149414,\r
+        "y": 1466.906997680664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "db81e8e0.68e13"\r
+                "34a88173.395bbe"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "55e08f7a.b87978",\r
+        "id": "301c508b.710a5",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 4802.50048828125,\r
-        "y": 1503.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4828.183853149414,\r
+        "y": 1508.906997680664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "db81e8e0.68e13",\r
+        "id": "34a88173.395bbe",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5027.50048828125,\r
-        "y": 1460.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5053.183853149414,\r
+        "y": 1465.906997680664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "52661a57.fe0a3c"\r
+                "91aa780.576ce08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "409a042d.2fadac",\r
+        "id": "46f94459.4a6e34",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4835.88330078125,\r
-        "y": 1056.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4861.566665649414,\r
+        "y": 1061.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f76f51b8.a98b3"\r
+                "eb72bb20.19559"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f76f51b8.a98b3",\r
+        "id": "eb72bb20.19559",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5012.88330078125,\r
-        "y": 1048.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5038.566665649414,\r
+        "y": 1053.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f1cd5bd3.ddbdb8",\r
-                "b8b89faf.7ac19"\r
+                "32b5afac.4ae738",\r
+                "92ed0f08.6c0c2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ac9dba33.9ee3a8",\r
+        "id": "efaf74dd.57cd28",\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": 4638.883270263672,\r
-        "y": 1154.2857055664062,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4664.566635131836,\r
+        "y": 1159.5666046142578,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "409a042d.2fadac",\r
-                "80f5aaec.b0ffc8"\r
+                "46f94459.4a6e34",\r
+                "95ea5c2d.7d46e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80f5aaec.b0ffc8",\r
+        "id": "95ea5c2d.7d46e8",\r
          "type": "outcome",\r
          "name": "network-resource",\r
          "xml": "<outcome value='network-resource'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4838.88330078125,\r
-        "y": 1130.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4864.566665649414,\r
+        "y": 1135.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "bf72647d.49f538"\r
+                "93430c1b.104ce"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bf72647d.49f538",\r
+        "id": "93430c1b.104ce",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5015.88330078125,\r
-        "y": 1122.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5041.566665649414,\r
+        "y": 1127.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "97239b14.6f12c8"\r
+                "78b310b8.dd74"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "52661a57.fe0a3c",\r
+        "id": "91aa780.576ce08",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5185.50048828125,\r
-        "y": 1460.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5211.183853149414,\r
+        "y": 1465.906997680664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5700a19e.1dbeb8"\r
+                "5b4e25f5.7b14e4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5700a19e.1dbeb8",\r
+        "id": "5b4e25f5.7b14e4",\r
          "type": "set",\r
          "name": "set source tunnel tp ip",\r
          "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",\r
          "comments": "",\r
-        "x": 5392.50048828125,\r
-        "y": 1460.6260986328125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5418.183853149414,\r
+        "y": 1465.906997680664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b8b89faf.7ac19",\r
+        "id": "92ed0f08.6c0c2",\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": 5220.88330078125,\r
-        "y": 1055.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5246.566665649414,\r
+        "y": 1060.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5d74c4c9.fd207c",\r
-                "bdb7d238.f96a08",\r
-                "7cf71a83.19030c"\r
+                "322d8e2.13d36f2",\r
+                "a2041883.aae29",\r
+                "fe986e1.586ed1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f1cd5bd3.ddbdb8",\r
+        "id": "32b5afac.4ae738",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainA id",\r
          "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5250.88330078125,\r
-        "y": 1003.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5276.566665649414,\r
+        "y": 1008.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5d74c4c9.fd207c",\r
+        "id": "322d8e2.13d36f2",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5430.88330078125,\r
-        "y": 1046.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5456.566665649414,\r
+        "y": 1051.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e430f4b5.90b5d"\r
+                "9ca79008.c70bf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bdb7d238.f96a08",\r
+        "id": "a2041883.aae29",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5422.88330078125,\r
-        "y": 1101.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5448.566665649414,\r
+        "y": 1106.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "46b0e213.0f69d4"\r
+                "ec84ed8c.59c368"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7cf71a83.19030c",\r
+        "id": "fe986e1.586ed1",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5427.88330078125,\r
-        "y": 1158.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5453.566665649414,\r
+        "y": 1163.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "99bfc958.cc2928"\r
+                "ae200af1.d5e5c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "99bfc958.cc2928",\r
+        "id": "ae200af1.d5e5c8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5579.88330078125,\r
-        "y": 1159.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5605.566665649414,\r
+        "y": 1164.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "46b0e213.0f69d4",\r
+        "id": "ec84ed8c.59c368",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5590.88330078125,\r
-        "y": 1104.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5616.566665649414,\r
+        "y": 1109.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e430f4b5.90b5d",\r
+        "id": "9ca79008.c70bf8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5575.265625,\r
-        "y": 1043.9414367675781,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5600.948989868164,\r
+        "y": 1049.2223358154297,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "3d0751e6.cf382e"\r
+                "e75f84ea.1b627"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "97239b14.6f12c8",\r
+        "id": "78b310b8.dd74",\r
          "type": "set",\r
          "name": "set domainA ethernet layer network-id",\r
          "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5250.88330078125,\r
-        "y": 1246.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5276.566665649414,\r
+        "y": 1251.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3d0751e6.cf382e",\r
+        "id": "e75f84ea.1b627",\r
          "type": "set",\r
          "name": "set controller domainA data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5789.88330078125,\r
-        "y": 1040.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5815.566665649414,\r
+        "y": 1045.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "33b11d1b.98a69a",\r
+        "id": "d425ccce.04f6a",\r
          "type": "set",\r
          "name": "set network-route-B",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4445.883758544922,\r
-        "y": 347.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4471.567123413086,\r
+        "y": 352.5666046142578,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2dc9cffb.3878b8",\r
+        "id": "72647ac9.fcc034",\r
          "type": "set",\r
          "name": "set network-route-A",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4446.883728027344,\r
-        "y": 451.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4472.567092895508,\r
+        "y": 456.5666046142578,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "653aef18.035f68",\r
+        "id": "9aca5d50.3d0028",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4270.883758544922,\r
-        "y": 353.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4296.567123413086,\r
+        "y": 358.5666046142578,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a11ab8.c3c2f548",\r
-                "33b11d1b.98a69a"\r
+                "f6cae941.406738",\r
+                "d425ccce.04f6a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4456e14a.c61538",\r
+        "id": "d411ea2f.0fea6",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4276.883758544922,\r
-        "y": 417.28570556640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4302.567123413086,\r
+        "y": 422.5666046142578,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7e53eaf1.53c434",\r
-                "2dc9cffb.3878b8"\r
+                "71276df1.c00474",\r
+                "72647ac9.fcc034"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dc25cb2f.e0da48",\r
+        "id": "b1818ac5.01eff",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4241.883758544922,\r
-        "y": 619.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4267.567123413086,\r
+        "y": 624.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "231b0ffb.372688",\r
-                "3979d153.538ee6"\r
+                "18b30ce8.3b3b9b",\r
+                "e0b34ba1.74f538"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7b200b08.d1724c",\r
+        "id": "7efc1cf.1fed664",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4244.883758544922,\r
-        "y": 672.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4270.567123413086,\r
+        "y": 677.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1b4ef1ae.221bae",\r
-                "49dc9fac.676fe"\r
+                "bdb5a388.dc57d",\r
+                "f08a6dfd.10adf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3979d153.538ee6",\r
+        "id": "e0b34ba1.74f538",\r
          "type": "set",\r
          "name": "set network-route-B",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4415.883758544922,\r
-        "y": 632.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4441.567123413086,\r
+        "y": 637.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "49dc9fac.676fe",\r
+        "id": "f08a6dfd.10adf",\r
          "type": "set",\r
          "name": "set network-route-A",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4418.883758544922,\r
-        "y": 723.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4444.567123413086,\r
+        "y": 728.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f7cb7391.6f67a",\r
+        "id": "e27939d4.dc1f9",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3741.88330078125,\r
-        "y": 1802.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3767.566665649414,\r
+        "y": 1807.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9a5ca37c.910178",\r
-                "2a8d98c8.2c78a"\r
+                "e945ebed.eb7548",\r
+                "77e0d458.7dce6c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd44019f.688f6",\r
+        "id": "f47a2634.b211d8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3569.216796875,\r
-        "y": 1803.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3594.900161743164,\r
+        "y": 1808.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f7cb7391.6f67a"\r
+                "e27939d4.dc1f9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3eb019bb.1ee706",\r
+        "id": "4a8297d6.2a928",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3578.707763671875,\r
-        "y": 1845.8599243164062,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3604.391128540039,\r
+        "y": 1851.1408233642578,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f4d10bee.1b32c"\r
+                "5c13cfc7.d7d798"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ef74e13b.116b3",\r
+        "id": "aeb5511b.98c418",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3567.216796875,\r
-        "y": 1892.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3592.900161743164,\r
+        "y": 1897.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7a977b6c.124a74"\r
+                "6967c0f4.670908"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f4d10bee.1b32c",\r
+        "id": "5c13cfc7.d7d798",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3732.2791748046875,\r
-        "y": 1849.1456604003906,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3757.9625396728516,\r
+        "y": 1854.4265594482422,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7a977b6c.124a74",\r
+        "id": "6967c0f4.670908",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3736.216796875,\r
-        "y": 1893.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3761.900161743164,\r
+        "y": 1898.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9a5ca37c.910178",\r
+        "id": "e945ebed.eb7548",\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": 4028.216796875,\r
-        "y": 1806.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4053.900161743164,\r
+        "y": 1811.566909790039,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "efd0a9b7.e547a8",\r
-                "caaf5e66.b1cb"\r
+                "e55a817f.49527",\r
+                "d5120a58.c5add"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "caaf5e66.b1cb",\r
+        "id": "d5120a58.c5add",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4251.216796875,\r
-        "y": 1761.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4276.900161743164,\r
+        "y": 1766.566909790039,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5ec876cd.f1dea8"\r
+                "754abe34.cc3b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "efd0a9b7.e547a8",\r
+        "id": "e55a817f.49527",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4253.216796875,\r
-        "y": 1825.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4278.900161743164,\r
+        "y": 1830.566909790039,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "72d34df6.13ce64"\r
+                "1b1e2d9b.600bda"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "72d34df6.13ce64",\r
+        "id": "1b1e2d9b.600bda",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 4412.216796875,\r
-        "y": 1844.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4437.900161743164,\r
+        "y": 1849.566909790039,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5ec876cd.f1dea8",\r
+        "id": "754abe34.cc3b8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4416.216796875,\r
-        "y": 1758.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4441.900161743164,\r
+        "y": 1763.566909790039,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2854b6e2.b50402",\r
-                "1fbd987b.e2c578"\r
+                "e1fca79d.bcc158",\r
+                "d062e564.f9cc3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eef6ad07.9c7d5",\r
+        "id": "9d9de9db.5c38b8",\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": 3341.216796875,\r
-        "y": 1838.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3366.900161743164,\r
+        "y": 1843.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "fd44019f.688f6",\r
-                "3eb019bb.1ee706",\r
-                "ef74e13b.116b3"\r
+                "f47a2634.b211d8",\r
+                "4a8297d6.2a928",\r
+                "aeb5511b.98c418"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "46101f8f.1fb8b8",\r
+        "id": "dcd55e2.3f6482",\r
          "type": "comment",\r
          "name": "Question?",\r
          "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
          "comments": "",\r
-        "x": 3302.216796875,\r
-        "y": 1782.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3327.900161743164,\r
+        "y": 1787.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d38e0865.514348",\r
+        "id": "63cddf09.26d868",\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": 3353.216796875,\r
-        "y": 1577.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3378.900161743164,\r
+        "y": 1582.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f536d783.2e1028",\r
-                "54ea75a9.fca1c4"\r
+                "43aff4f9.b6b3e4",\r
+                "25e76471.03af04"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "54ea75a9.fca1c4",\r
+        "id": "25e76471.03af04",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3576.216796875,\r
-        "y": 1563.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3601.900161743164,\r
+        "y": 1568.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "3ffa66c6.048e62"\r
+                "a96745eb.fd51a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f536d783.2e1028",\r
+        "id": "43aff4f9.b6b3e4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3578.216796875,\r
-        "y": 1596.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3603.900161743164,\r
+        "y": 1601.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "73c7be78.48771"\r
+                "65d2388d.31966"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "73c7be78.48771",\r
+        "id": "65d2388d.31966",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 3721.216796875,\r
-        "y": 1593.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3746.900161743164,\r
+        "y": 1598.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3ffa66c6.048e62",\r
+        "id": "a96745eb.fd51a8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3724.216796875,\r
-        "y": 1556.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3749.900161743164,\r
+        "y": 1561.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "116bcef1.41b689",\r
-                "bd9fbc09.ccb15"\r
+                "e299d57.a910ca8",\r
+                "f2c7502b.08699"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "116bcef1.41b689",\r
+        "id": "e299d57.a910ca8",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",\r
          "comments": "",\r
-        "x": 3918.216796875,\r
-        "y": 1559.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3943.900161743164,\r
+        "y": 1564.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2a8d98c8.2c78a",\r
+        "id": "77e0d458.7dce6c",\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": 3969.216766357422,\r
-        "y": 1939.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3994.900131225586,\r
+        "y": 1944.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "821e2eef.7d9ce8"\r
+                "e086896d.a84a3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "821e2eef.7d9ce8",\r
+        "id": "e086896d.a84a3",\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": 4175.216766357422,\r
-        "y": 1939.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4200.900131225586,\r
+        "y": 1944.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b9228d23.f35b1"\r
+                "7b35902c.38cf98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9228d23.f35b1",\r
+        "id": "7b35902c.38cf98",\r
          "type": "outcome",\r
          "name": "tunnel-termination-point",\r
          "xml": "<outcome value='tunnel-termination-point'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4392.502410888672,\r
-        "y": 1938.1075439453125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4418.185775756836,\r
+        "y": 1943.388442993164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1db12922.ce9147"\r
+                "3adb3c4.e1dbc44"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd9fbc09.ccb15",\r
+        "id": "f2c7502b.08699",\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": 3940.216796875,\r
-        "y": 1627.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3965.900161743164,\r
+        "y": 1632.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "71a75cfd.cb2324",\r
-                "c5a92d1c.748898",\r
-                "d4c41231.0d38f"\r
+                "816c398a.a95008",\r
+                "793de235.310dbc",\r
+                "438956b5.03e5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "71a75cfd.cb2324",\r
+        "id": "816c398a.a95008",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4135.7169189453125,\r
-        "y": 1579.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4161.400283813477,\r
+        "y": 1584.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "55c143a3.bf5e9c"\r
+                "c1f38920.d25ea"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c5a92d1c.748898",\r
+        "id": "793de235.310dbc",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4127.7169189453125,\r
-        "y": 1634.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4153.400283813477,\r
+        "y": 1639.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a19a5afd.bfc2c"\r
+                "cab6de35.b52228"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d4c41231.0d38f",\r
+        "id": "438956b5.03e5",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4132.7169189453125,\r
-        "y": 1691.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4158.400283813477,\r
+        "y": 1696.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5c56b620.c82d88"\r
+                "a8484dc0.47884"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c56b620.c82d88",\r
+        "id": "a8484dc0.47884",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4284.7169189453125,\r
-        "y": 1692.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4310.400283813477,\r
+        "y": 1697.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a19a5afd.bfc2c",\r
+        "id": "cab6de35.b52228",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4295.7169189453125,\r
-        "y": 1637.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4321.400283813477,\r
+        "y": 1642.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "55c143a3.bf5e9c",\r
+        "id": "c1f38920.d25ea",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4280.0992431640625,\r
-        "y": 1576.9415588378906,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4305.782608032227,\r
+        "y": 1582.2224578857422,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "79a34acd.c9a0bc"\r
+                "afe15cf0.f36818"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2854b6e2.b50402",\r
+        "id": "e1fca79d.bcc158",\r
          "type": "set",\r
          "name": "set ltpId",\r
          "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",\r
          "comments": "",\r
-        "x": 4586.216796875,\r
-        "y": 1719.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4611.900161743164,\r
+        "y": 1724.566909790039,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1fbd987b.e2c578",\r
+        "id": "d062e564.f9cc3",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",\r
          "comments": "",\r
-        "x": 4587.216796875,\r
-        "y": 1824.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4612.900161743164,\r
+        "y": 1829.566909790039,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8823cb9b.b21f5",\r
+        "id": "808f1d51.43ea1",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
          "comments": "",\r
-        "x": 4582.216796875,\r
-        "y": 1773.2860107421875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4607.900161743164,\r
+        "y": 1778.566909790039,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1db12922.ce9147",\r
+        "id": "3adb3c4.e1dbc44",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4599.333953857422,\r
-        "y": 1927.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4625.017318725586,\r
+        "y": 1932.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "4fe8713d.4f503",\r
-                "c4b73dd8.f86748",\r
-                "cf5e37a1.834b48"\r
+                "d9f1d004.ab36e8",\r
+                "c34231fa.58e828",\r
+                "e0d690d7.a8c998"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4fe8713d.4f503",\r
+        "id": "d9f1d004.ab36e8",\r
          "type": "set",\r
          "name": "set destination ttp-id",\r
          "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 4814.333953857422,\r
-        "y": 1889.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4840.017318725586,\r
+        "y": 1894.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c4b73dd8.f86748",\r
+        "id": "c34231fa.58e828",\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": 4811.333953857422,\r
-        "y": 1928.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4837.017318725586,\r
+        "y": 1933.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "fd454717.5864e8"\r
+                "1c725cd0.b941cb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf5e37a1.834b48",\r
+        "id": "e0d690d7.a8c998",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 4766.833953857422,\r
-        "y": 1970.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4792.517318725586,\r
+        "y": 1975.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fd454717.5864e8",\r
+        "id": "1c725cd0.b941cb",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4991.833953857422,\r
-        "y": 1927.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5017.517318725586,\r
+        "y": 1932.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6021f32a.54d8fc"\r
+                "d4ead200.f358d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6021f32a.54d8fc",\r
+        "id": "d4ead200.f358d",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5149.833953857422,\r
-        "y": 1927.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5175.517318725586,\r
+        "y": 1932.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1a613df3.ff444a"\r
+                "21d1a6b2.01b042"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1a613df3.ff444a",\r
+        "id": "21d1a6b2.01b042",\r
          "type": "set",\r
          "name": "set destination tunnel tp ip",\r
          "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",\r
          "comments": "",\r
-        "x": 5356.833953857422,\r
-        "y": 1927.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5382.517318725586,\r
+        "y": 1932.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1465bad2.a0d805",\r
+        "id": "4c098907.41a99",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4862.216796875,\r
-        "y": 1595.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4887.900161743164,\r
+        "y": 1600.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f75a0195.2a4c5"\r
+                "801eca00.935f68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f75a0195.2a4c5",\r
+        "id": "801eca00.935f68",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5039.216796875,\r
-        "y": 1587.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5064.900161743164,\r
+        "y": 1592.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1de23279.e8bad6",\r
-                "95237093.1f1c18"\r
+                "387f801c.205ae8",\r
+                "9175f1b.049129"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "79a34acd.c9a0bc",\r
+        "id": "afe15cf0.f36818",\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": 4464.216796875,\r
-        "y": 1591.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4489.900161743164,\r
+        "y": 1596.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b5cddb2a.47fb5"\r
+                "311e9242.e1d87e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b5cddb2a.47fb5",\r
+        "id": "311e9242.e1d87e",\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": 4659.216796875,\r
-        "y": 1591.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4684.900161743164,\r
+        "y": 1596.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1465bad2.a0d805",\r
-                "a6e303e4.3eb668"\r
+                "4c098907.41a99",\r
+                "349df30f.7cba04"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "95237093.1f1c18",\r
+        "id": "9175f1b.049129",\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": 5247.216796875,\r
-        "y": 1594.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5272.900161743164,\r
+        "y": 1599.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2d3d2acb.c107b6",\r
-                "fb5337e0.94ced8",\r
-                "752448e6.ec72a8"\r
+                "42985b25.52fcec",\r
+                "e5b701e3.8392b",\r
+                "3efd20ec.3f4778"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6879e9be.d7aee",\r
+        "id": "b70a777b.22a5f8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5041.216796875,\r
-        "y": 1660.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5066.900161743164,\r
+        "y": 1665.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "8691b2ec.22b9d8"\r
+                "8a34b29e.6de5e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6e303e4.3eb668",\r
+        "id": "349df30f.7cba04",\r
          "type": "outcome",\r
          "name": "network-resource",\r
          "xml": "<outcome value='network-resource'>",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4864.216796875,\r
-        "y": 1668.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4889.900161743164,\r
+        "y": 1673.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6879e9be.d7aee"\r
+                "b70a777b.22a5f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1de23279.e8bad6",\r
+        "id": "387f801c.205ae8",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainB id",\r
          "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5277.216796875,\r
-        "y": 1542.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5302.900161743164,\r
+        "y": 1547.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8691b2ec.22b9d8",\r
+        "id": "8a34b29e.6de5e8",\r
          "type": "set",\r
          "name": "set domainB ethernet layer network-id",\r
          "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5254.216796875,\r
-        "y": 1726.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5279.900161743164,\r
+        "y": 1731.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2d3d2acb.c107b6",\r
+        "id": "42985b25.52fcec",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5457.216796875,\r
-        "y": 1585.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5482.900161743164,\r
+        "y": 1590.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a3e7410.2b3c44"\r
+                "16d18a71.6daf16"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fb5337e0.94ced8",\r
+        "id": "e5b701e3.8392b",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5449.216796875,\r
-        "y": 1640.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5474.900161743164,\r
+        "y": 1645.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "656cbbf6.41438c"\r
+                "6ba1c131.2a9348"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "752448e6.ec72a8",\r
+        "id": "3efd20ec.3f4778",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5454.216796875,\r
-        "y": 1697.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5479.900161743164,\r
+        "y": 1702.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6bb525a1.9cb52c"\r
+                "e5aceb1d.a2ff7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6bb525a1.9cb52c",\r
+        "id": "e5aceb1d.a2ff7",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5606.216796875,\r
-        "y": 1698.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5631.900161743164,\r
+        "y": 1703.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "656cbbf6.41438c",\r
+        "id": "6ba1c131.2a9348",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5617.216796875,\r
-        "y": 1643.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5642.900161743164,\r
+        "y": 1648.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3e7410.2b3c44",\r
+        "id": "16d18a71.6daf16",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5601.59912109375,\r
-        "y": 1582.9415588378906,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5627.282485961914,\r
+        "y": 1588.2224578857422,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "99742e42.2fdbd8"\r
+                "c4efa7e8.819f98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "99742e42.2fdbd8",\r
+        "id": "c4efa7e8.819f98",\r
          "type": "set",\r
          "name": "set controller domainB data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5816.216796875,\r
-        "y": 1579.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5841.900161743164,\r
+        "y": 1584.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "78d4922e.8ebe04",\r
+        "id": "e5f9b3dc.c2f9f",\r
          "type": "set",\r
          "name": "set LEAF stuff",\r
          "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",\r
          "comments": "",\r
-        "x": 3314.88330078125,\r
-        "y": 1449.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3340.566665649414,\r
+        "y": 1454.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c220ecdf.76a978",\r
+        "id": "169ca3b9.4d31a4",\r
          "type": "set",\r
          "name": "set ROOT stuff",\r
          "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",\r
          "comments": "",\r
-        "x": 3301.88330078125,\r
-        "y": 1969.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3327.566665649414,\r
+        "y": 1974.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b4f5dada.48378",\r
+        "id": "426ddfc0.c628b",\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": 162.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2452.566696166992,\r
+        "y": 167.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5db562b1.71111c",\r
+        "id": "d0874bda.7e1ac",\r
          "type": "set",\r
          "name": "set new ethernet-service-name",\r
          "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 2360.883331298828,\r
-        "y": 198.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2386.566696166992,\r
+        "y": 203.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3f2dec8d.5c3844",\r
+        "id": "2daf88d4.4069b",\r
          "type": "comment",\r
          "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",\r
          "info": "",\r
          "comments": "",\r
-        "x": 2545.883331298828,\r
-        "y": 125.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2571.566696166992,\r
+        "y": 130.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8ae1ae92.9d4708",\r
+        "id": "4d0caa12.a83adc",\r
          "type": "comment",\r
          "name": "NOT NEEDED ANYMORE?",\r
          "info": "",\r
          "comments": "",\r
-        "x": 4072.88330078125,\r
-        "y": 1427.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4098.566665649414,\r
+        "y": 1432.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f4b4f4b0.73db2",\r
+        "id": "325da1a4.661aa6",\r
          "type": "comment",\r
          "name": "NOT NEEDED ANYMORE?",\r
          "info": "",\r
          "comments": "",\r
-        "x": 4028.883270263672,\r
-        "y": 1891.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4054.566635131836,\r
+        "y": 1896.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4304e2aa.cc073c",\r
+        "id": "eca8d05b.38fb78",\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": 2737.8836669921875,\r
-        "y": 7259.28564453125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2763.5670318603516,\r
+        "y": 7264.566543579102,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f849984b.dddac",\r
+        "id": "9a99585.3b52728",\r
          "type": "comment",\r
          "name": "START OF DELETE OPERATION",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3296.88330078125,\r
-        "y": 2451.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3322.566665649414,\r
+        "y": 2456.566635131836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff6310d.2048a7",\r
+        "id": "e1bb190b.e249c8",\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": 3880.566650390625,\r
-        "y": 2552.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3906.250015258789,\r
+        "y": 2557.966751098633,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "14f1d608.fff342",\r
+        "id": "19822907.e2052f",\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": 3251.566650390625,\r
-        "y": 2532.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3277.250015258789,\r
+        "y": 2537.966751098633,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "30a4f59e.3fde12",\r
-                "98adc704.004778",\r
-                "91611e7f.d3eaa8"\r
+                "3e98cd57.b05732",\r
+                "c601135d.8ebcb8",\r
+                "224a5da0.cc93c2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "98adc704.004778",\r
+        "id": "c601135d.8ebcb8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3479.0576171875,\r
-        "y": 2505.2598266601562,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3504.740982055664,\r
+        "y": 2510.540725708008,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "94257401.34831"\r
+                "ad084de2.e988e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "91611e7f.d3eaa8",\r
+        "id": "224a5da0.cc93c2",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3474.566650390625,\r
-        "y": 2549.685791015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3500.250015258789,\r
+        "y": 2554.9666900634766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c2c26a41.57e9c"\r
+                "dcac28ad.d4a36"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "94257401.34831",\r
+        "id": "ad084de2.e988e8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3641.629150390625,\r
-        "y": 2504.5455322265625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3667.312515258789,\r
+        "y": 2509.826431274414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c2c26a41.57e9c",\r
+        "id": "dcac28ad.d4a36",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3642.566650390625,\r
-        "y": 2549.685791015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3668.250015258789,\r
+        "y": 2554.9666900634766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "30a4f59e.3fde12",\r
+        "id": "3e98cd57.b05732",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3486.566650390625,\r
-        "y": 2599.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3512.250015258789,\r
+        "y": 2604.966751098633,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "4d0f2575.137edc"\r
+                "eb73cd4.3d8393"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d0f2575.137edc",\r
+        "id": "eb73cd4.3d8393",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3638.88330078125,\r
-        "y": 2603.2857055664062,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3664.566665649414,\r
+        "y": 2608.566604614258,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "589d867c.eeacb",\r
-                "ff6310d.2048a7",\r
-                "84152b78.a442c8",\r
-                "1e88543b.84a814"\r
+                "24f11631.71c6d2",\r
+                "e1bb190b.e249c8",\r
+                "5066cd38.1c6414",\r
+                "5dc3af5e.92a278"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "589d867c.eeacb",\r
+        "id": "24f11631.71c6d2",\r
          "type": "set",\r
          "name": "set bwToBeDecreased tpid cvlan",\r
          "xml": "<set>\n<parameter name='bwToBeDecreased' value=\"`$tmp.aai.leafuni.data-source`\" />\n<parameter name='tpid' value='`$tmp.aai.leafuni.tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.leafuni.cvlan`' />\n\n\n",\r
          "comments": "",\r
-        "x": 3883.566650390625,\r
-        "y": 2495.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3909.250015258789,\r
+        "y": 2500.966751098633,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "243640c4.1190f8",\r
+        "id": "80dbb6de.b49838",\r
          "type": "comment",\r
          "name": "Update ROOT UNI's bw",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3845.566650390625,\r
-        "y": 2606.4857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3871.250015258789,\r
+        "y": 2611.766616821289,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "83d2a0c.fbf83e",\r
+        "id": "45c0e5f4.f4ad34",\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": 4523.566650390625,\r
-        "y": 2649.4857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4549.250015258789,\r
+        "y": 2654.766616821289,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "84152b78.a442c8",\r
+        "id": "5066cd38.1c6414",\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": 3837.56640625,\r
-        "y": 2652.4857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3863.249771118164,\r
+        "y": 2657.766616821289,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ee63dcff.30bad",\r
-                "80208a9d.4e9bb",\r
-                "3e7ba9dc.c77e76"\r
+                "a6e50ef0.8e2c5",\r
+                "13029608.69349a",\r
+                "208dd481.7b2554"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80208a9d.4e9bb",\r
+        "id": "13029608.69349a",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4141.057373046875,\r
-        "y": 2563.0596923828125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4166.740737915039,\r
+        "y": 2568.340591430664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ee49c3d8.4041d8"\r
+                "a4cd8e0.5d99ef"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3e7ba9dc.c77e76",\r
+        "id": "208dd481.7b2554",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4136.56640625,\r
-        "y": 2607.4856567382812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4162.249771118164,\r
+        "y": 2612.766555786133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e34757d5.3f1ff8"\r
+                "a8fd408a.63278"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ee49c3d8.4041d8",\r
+        "id": "a4cd8e0.5d99ef",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4303.62890625,\r
-        "y": 2562.3453979492188,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4329.312271118164,\r
+        "y": 2567.6262969970703,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e34757d5.3f1ff8",\r
+        "id": "a8fd408a.63278",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 4304.56640625,\r
-        "y": 2607.4856567382812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4330.249771118164,\r
+        "y": 2612.766555786133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "be9d3338.5121d",\r
+        "id": "108d95bc.e243b2",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4301.56640625,\r
-        "y": 2657.4857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4327.249771118164,\r
+        "y": 2662.766616821289,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "933a8e8f.7ef918",\r
-                "83d2a0c.fbf83e"\r
+                "6fb618e0.320358",\r
+                "45c0e5f4.f4ad34"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ee63dcff.30bad",\r
+        "id": "a6e50ef0.8e2c5",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4132.56640625,\r
-        "y": 2657.4857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4158.249771118164,\r
+        "y": 2662.766616821289,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "be9d3338.5121d"\r
+                "108d95bc.e243b2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "933a8e8f.7ef918",\r
+        "id": "6fb618e0.320358",\r
          "type": "set",\r
          "name": "set new bw",\r
          "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",\r
          "comments": "",\r
-        "x": 4483.567138671875,\r
-        "y": 2599.4857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4509.250503540039,\r
+        "y": 2604.766616821289,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "21e69316.d31a3c",\r
+        "id": "501ef6fe.de27d8",\r
          "type": "comment",\r
          "name": "Delete LEAF UNI",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3831.88330078125,\r
-        "y": 2437.2857055664062,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3857.566665649414,\r
+        "y": 2442.566604614258,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "45cb1d93.9cef0c",\r
+        "id": "13751b77.2d6a35",\r
          "type": "set",\r
          "name": "set current-provider-id and current-cvlan-id",\r
          "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",\r
          "comments": "",\r
-        "x": 3311.749969482422,\r
-        "y": 3769.8858032226562,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3337.433334350586,\r
+        "y": 3775.166702270508,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "95cc6144.fb6bd8",\r
+        "id": "42ae91e0.cfd958",\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": 3817.8858032226562,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3470.433334350586,\r
+        "y": 3823.166702270508,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "21aeddc1.06f77a",\r
+        "id": "f0c980e9.4c97f",\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": 3869.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3292.433334350586,\r
+        "y": 3874.966751098633,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "218077ad.f30d3",\r
-                "a4239ce5.8829c"\r
+                "ddd00137.0625f8",\r
+                "49bc5de5.143edc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "218077ad.f30d3",\r
+        "id": "ddd00137.0625f8",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3459.749969482422,\r
-        "y": 3870.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3485.433334350586,\r
+        "y": 3875.966751098633,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "dcbbe6d2.fa9028"\r
+                "baae6201.7fdf3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dcbbe6d2.fa9028",\r
+        "id": "baae6201.7fdf3",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",\r
          "comments": "",\r
-        "x": 3603.749969482422,\r
-        "y": 3866.8858032226562,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3629.433334350586,\r
+        "y": 3872.166702270508,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a4239ce5.8829c",\r
+        "id": "49bc5de5.143edc",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3463.749969482422,\r
-        "y": 3914.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3489.433334350586,\r
+        "y": 3919.966751098633,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "338c28da.4908c8"\r
+                "8955d942.ba6bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "338c28da.4908c8",\r
+        "id": "8955d942.ba6bc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3602.749969482422,\r
-        "y": 3909.6858520507812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3628.433334350586,\r
+        "y": 3914.966751098633,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "40a81b6.e879ce4",\r
-                "fe7c3ff6.ce34b8",\r
-                "af03ee84.d16068"\r
+                "2c8b9b3a.156d1c",\r
+                "942c3741.17e638",\r
+                "ea29b2fb.fa9b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40a81b6.e879ce4",\r
+        "id": "2c8b9b3a.156d1c",\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": 3918.2024536132812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3878.832992553711,\r
+        "y": 3923.483352661133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "3fc00cbe.f344f4"\r
+                "829ce491.bb75d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3fc00cbe.f344f4",\r
+        "id": "829ce491.bb75d8",\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": 3896.2024536132812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4100.832992553711,\r
+        "y": 3901.483352661133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "57d9d04a.beb888"\r
+                "b35a1aab.3a595"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "57d9d04a.beb888",\r
+        "id": "b35a1aab.3a595",\r
          "type": "outcome",\r
          "name": "uni",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4235.149139404297,\r
-        "y": 3876.2024536132812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4260.832504272461,\r
+        "y": 3881.483352661133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5fa67fdd.e511b8"\r
+                "335ed745.f60fb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9bbd69a.136aa8",\r
+        "id": "f8921006.06e1a",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4388.149658203125,\r
-        "y": 3857.2024841308594,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4413.833023071289,\r
+        "y": 3862.483383178711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "17e2ea6.f8df196",\r
-                "947c4850.aa8df"\r
+                "8d9ae5c3.a9c288",\r
+                "b59230eb.4dd598"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "17e2ea6.f8df196",\r
+        "id": "8d9ae5c3.a9c288",\r
          "type": "set",\r
          "name": "set tmp.stillHasUni to TRUE",\r
          "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",\r
          "comments": "",\r
-        "x": 4584.649871826172,\r
-        "y": 3825.2857055664062,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4610.333236694336,\r
+        "y": 3830.566604614258,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fe7c3ff6.ce34b8",\r
+        "id": "942c3741.17e638",\r
          "type": "set",\r
          "name": "set tmp.stillHasUn tmp.keepVPNBs to FALSE",\r
          "xml": "<set>\n<parameter name='tmp.stillHasUni' value='false' />\n<parameter name='tmp.keepVPNBs' value='false' />\n",\r
          "comments": "",\r
-        "x": 3959.64990234375,\r
-        "y": 3837.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3985.333267211914,\r
+        "y": 3842.566635131836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "af03ee84.d16068",\r
+        "id": "ea29b2fb.fa9b",\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": 4258.285980224609,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3793.333267211914,\r
+        "y": 4263.566879272461,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "77a80484.fb13cc",\r
-                "a722846c.585ad"\r
+                "1074f3a1.e40104",\r
+                "49cd5621.2fb45"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "947c4850.aa8df",\r
+        "id": "b59230eb.4dd598",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 4552.88330078125,\r
-        "y": 3893.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4578.566665649414,\r
+        "y": 3898.566635131836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a722846c.585ad",\r
+        "id": "49cd5621.2fb45",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 154.65066528320312,\r
-        "y": 5322.286224365234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 180.3340301513672,\r
+        "y": 5327.567123413086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c0a1014a.3ea75"\r
+                "94db503d.b50288"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "77a80484.fb13cc",\r
+        "id": "1074f3a1.e40104",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3988.650634765625,\r
-        "y": 4360.285980224609,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4014.333999633789,\r
+        "y": 4365.566879272461,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "8774c38d.ee5b7"\r
+                "98bce2a7.eae0e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8774c38d.ee5b7",\r
+        "id": "98bce2a7.eae0e8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4131.650634765625,\r
-        "y": 4356.285980224609,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4157.333999633789,\r
+        "y": 4361.566879272461,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f67d6e8d.c4ab",\r
-                "1d885097.bf6b2f",\r
-                "bd8e5c03.dfc108",\r
-                "19328269.e896be",\r
-                "93e60704.65dbd",\r
-                "8b3d1eff.18e008",\r
-                "ffd8a757.b8a3f",\r
-                "b33560b0.1278c",\r
-                "fc616200.2baf58"\r
+                "700868f.6d62d18",\r
+                "9e6ef63b.470c28",\r
+                "98c15798.fc2c28",\r
+                "a474eb09.bdcea",\r
+                "4e75594e.323fe8",\r
+                "8985192.1ed6868",\r
+                "bbed6bed.031a08",\r
+                "9b06d9ac.c2c2b",\r
+                "35800841.c29e7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c91ac5e.705b8",\r
+        "id": "7a0c4e0f.7452f",\r
          "type": "comment",\r
          "name": "keepVPNBs == false, then check tmp.stillHasUni",\r
          "info": "(2) keepVPNBs == false, means there are no other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\ncheck if tmp.stillHasUni is True or False?\n\nif TRUE --> means this domain (connectivity) still has other UNIs\n- delete VPNBs\n- delete LEAF UNI in AAI -- DONE\n- upadte bw in ROOT UNI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC\n- change ROOT conn status to Modified\n--- mark LEAF connectivity as Modified because the underlay OTN tunnel list of this connectivity is now different\n\nif FALSE --> means this domain (connectivity) has no other UNIs\n\nif MMstillHasUni == TRUE, means scenario (3), else, means scenario (4)\n\n(3) & (4) both:\n- delete VPNBs\n- delete LEAF connectivity\n- delete LEAF Ethernet Service from PNC\n\n(3) only:\n- change ROOT conn status to Modified\n- Keep the middle-man-conn and DON'T delete\n\n(4) only:\n- delete ROOT UNI\n- delete ROOT conn from AAI\n- delete ROOT Ethernet Service from PNC\n- delete middle-man-conn from AAI\n\n",\r
          "comments": "",\r
-        "x": 181,\r
-        "y": 5278.286224365234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 206.68336486816406,\r
+        "y": 5283.567123413086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fa1b93d9.936e7",\r
+        "id": "7ce224df.f32d34",\r
          "type": "comment",\r
          "name": "There are still other UNIs in this connectivity that share same OLT node. Only update bw of the vpn-bindings involved",\r
          "info": "(1) keepVPNBs == true, means there are still other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\n- Only update bw of the vpn-bindings involved -- DONE\n- upadte bw in ROOT UNI -- DONE\n- change ROOT conn status to Modified -- DONE\n- delete LEAF UNI in AAI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC -- DONE\n- DON'T delete the connectivities of LEAF and ROOT -- DONE\nAlso update the ethernet services",\r
          "comments": "",\r
-        "x": 4007.884033203125,\r
-        "y": 4323.285980224609,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4033.567398071289,\r
+        "y": 4328.566879272461,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "30095233.787426",\r
+        "id": "eb1e9e05.cb15c8",\r
          "type": "set",\r
          "name": "set srcTtp OTN layer",\r
          "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4820.667724609375,\r
-        "y": 4514.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4846.351089477539,\r
+        "y": 4519.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "298f2b5b.0aab2c",\r
+        "id": "1fff7e41.5e97da",\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": 4376.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5191.351089477539,\r
+        "y": 4381.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1597a82b.d6bf2"\r
+                "384897a.b5a9568"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1126bc47.b4d98c",\r
+        "id": "3095386e.cc8938",\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": 4370.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4898.351089477539,\r
+        "y": 4375.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "298f2b5b.0aab2c"\r
+                "1fff7e41.5e97da"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9ba49429.2785d",\r
+        "id": "31c473ae.f4e764",\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": 4327.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5153.351089477539,\r
+        "y": 4332.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ace3cbea.15731",\r
+        "id": "ca81f202.b30418",\r
          "type": "set",\r
          "name": "unset parameters",\r
          "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
          "comments": "",\r
-        "x": 4816.667724609375,\r
-        "y": 4422.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4842.351089477539,\r
+        "y": 4427.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1d3af694.aab3a1",\r
+        "id": "b2478692.ea1d6",\r
          "type": "set",\r
          "name": "set tmp.pce-src-node",\r
          "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",\r
          "comments": "",\r
-        "x": 4824.667724609375,\r
-        "y": 4467.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4850.351089477539,\r
+        "y": 4472.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7a0d3acc.4e0354",\r
+        "id": "eb2b76ee.d20fa8",\r
          "type": "set",\r
          "name": "unset otnTopoIdSrc",\r
          "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
          "comments": "",\r
-        "x": 4821.667724609375,\r
-        "y": 4320.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4847.351089477539,\r
+        "y": 4325.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1597a82b.d6bf2",\r
+        "id": "384897a.b5a9568",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5074.667724609375,\r
-        "y": 4444.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5100.351089477539,\r
+        "y": 4449.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "247fb61.2b27f4a"\r
+                "a1cf1e6d.96424"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "247fb61.2b27f4a",\r
+        "id": "a1cf1e6d.96424",\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": 4443.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5285.351089477539,\r
+        "y": 4448.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d2d679f0.fa9e7"\r
+                "e54e7c9a.d7146"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2d679f0.fa9e7",\r
+        "id": "e54e7c9a.d7146",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5451.667724609375,\r
-        "y": 4446.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5477.351089477539,\r
+        "y": 4451.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7d11177c.7fa498"\r
+                "88338270.bbe028"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7d11177c.7fa498",\r
+        "id": "88338270.bbe028",\r
          "type": "set",\r
          "name": "set otnTopoIdSrc",\r
          "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
          "comments": "",\r
-        "x": 5623.667724609375,\r
-        "y": 4442.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5649.351089477539,\r
+        "y": 4447.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b338f208.2e8e8",\r
+        "id": "5518c3fe.6c8f7c",\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": 4557.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5025.351089477539,\r
+        "y": 4562.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f67d6e8d.c4ab",\r
+        "id": "700868f.6d62d18",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4516.667724609375,\r
-        "y": 4342.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4542.351089477539,\r
+        "y": 4347.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6c238e2f.cfa52",\r
-                "97e28bb1.9f6bb8",\r
-                "ace3cbea.15731",\r
-                "1d3af694.aab3a1",\r
-                "30095233.787426",\r
-                "1126bc47.b4d98c",\r
-                "b338f208.2e8e8"\r
+                "7996b8d7.d892b8",\r
+                "fc1f2ae1.cce1f",\r
+                "ca81f202.b30418",\r
+                "b2478692.ea1d6",\r
+                "eb1e9e05.cb15c8",\r
+                "3095386e.cc8938",\r
+                "5518c3fe.6c8f7c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "44415c7f.4f5f24",\r
+        "id": "aec75daf.8805f",\r
          "type": "comment",\r
          "name": "The following section is to find srcTtp OTN layer (its long name)",\r
          "info": "The following section is to find srcTtp OTN layer (its long name)",\r
          "comments": "",\r
-        "x": 4501.667724609375,\r
-        "y": 4276.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4527.351089477539,\r
+        "y": 4281.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "97e28bb1.9f6bb8",\r
+        "id": "fc1f2ae1.cce1f",\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": 4263.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4906.351089477539,\r
+        "y": 4268.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "153999c3.0eb42e",\r
-                "a208bb99.66b2e8",\r
-                "9ba49429.2785d"\r
+                "74fcf491.6cb18c",\r
+                "27200085.4f11f",\r
+                "31c473ae.f4e764"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "153999c3.0eb42e",\r
+        "id": "74fcf491.6cb18c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5116.667724609375,\r
-        "y": 4246.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5142.351089477539,\r
+        "y": 4251.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a208bb99.66b2e8",\r
+        "id": "27200085.4f11f",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5113.667724609375,\r
-        "y": 4287.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5139.351089477539,\r
+        "y": 4292.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6c238e2f.cfa52",\r
+        "id": "7996b8d7.d892b8",\r
          "type": "set",\r
          "name": "unset parameters",\r
          "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
          "comments": "",\r
-        "x": 4829.667724609375,\r
-        "y": 4220.069427490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4855.351089477539,\r
+        "y": 4225.350326538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1d885097.bf6b2f",\r
+        "id": "9e6ef63b.470c28",\r
          "type": "set",\r
          "name": "unset tmp.aai.all-vpn-bindings",\r
          "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",\r
          "comments": "",\r
-        "x": 4336.667724609375,\r
-        "y": 4674.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4362.351089477539,\r
+        "y": 4679.750228881836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "582ea235.e6de1c",\r
+        "id": "d0de5ca9.0d9ed8",\r
          "type": "comment",\r
          "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",\r
          "info": "",\r
          "comments": "",\r
-        "x": 4459.968017578125,\r
-        "y": 4713.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4485.651382446289,\r
+        "y": 4718.750228881836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bd8e5c03.dfc108",\r
+        "id": "98c15798.fc2c28",\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": 4748.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4383.651382446289,\r
+        "y": 4753.750228881836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d0e71616.8c817",\r
-                "148e0bed.377164",\r
-                "3b175283.95d6be"\r
+                "435ca159.b40ef",\r
+                "d725cba9.49bb",\r
+                "47bda61e.d52e08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d0e71616.8c817",\r
+        "id": "435ca159.b40ef",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4562.968017578125,\r
-        "y": 4745.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4588.651382446289,\r
+        "y": 4750.750228881836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "39c739fc.a6fe6e"\r
+                "293c4671.01eaaa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "148e0bed.377164",\r
+        "id": "d725cba9.49bb",\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": 4807.043365478516,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4572.142349243164,\r
+        "y": 4812.324264526367,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "3e1fb649.3101ea"\r
+                "107ae3d6.bea87c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3b175283.95d6be",\r
+        "id": "47bda61e.d52e08",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4543.968017578125,\r
-        "y": 4850.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4569.651382446289,\r
+        "y": 4855.750228881836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "681b836.365687c"\r
+                "b006b7ef.442db8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "39c739fc.a6fe6e",\r
+        "id": "293c4671.01eaaa",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4730.96826171875,\r
-        "y": 4740.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4756.651626586914,\r
+        "y": 4745.750228881836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "93e92e1a.778be8"\r
+                "94070507.2dec4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3e1fb649.3101ea",\r
+        "id": "107ae3d6.bea87c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4709.0303955078125,\r
-        "y": 4807.3291015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4734.713760375977,\r
+        "y": 4812.610000610352,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "681b836.365687c",\r
+        "id": "b006b7ef.442db8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 4710.968017578125,\r
-        "y": 4849.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4736.651382446289,\r
+        "y": 4854.750228881836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "93e92e1a.778be8",\r
+        "id": "94070507.2dec4",\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": 4745.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4994.651626586914,\r
+        "y": 4750.750228881836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "27f30922.4e6a66"\r
+                "db3073d6.6320c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "27f30922.4e6a66",\r
+        "id": "db3073d6.6320c8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5202.968017578125,\r
-        "y": 4752.469329833984,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5228.651382446289,\r
+        "y": 4757.750228881836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e449a33.b8b696"\r
+                "37f340bd.0a3438"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e77a7161.49d068",\r
+        "id": "fcec711e.ca4568",\r
          "type": "comment",\r
          "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
          "info": "",\r
          "comments": "",\r
-        "x": 5119.783935546875,\r
-        "y": 4823.635650634766,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5145.467300415039,\r
+        "y": 4828.916549682617,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e449a33.b8b696",\r
+        "id": "37f340bd.0a3438",\r
          "type": "switchNode",\r
          "name": "switch ops-note is srcTtpOtnLayer",\r
          "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5063.783935546875,\r
-        "y": 4872.635650634766,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5089.467300415039,\r
+        "y": 4877.916549682617,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "62a1336b.ab309c",\r
-                "57ed2482.36942c"\r
+                "ab022fe7.308e68",\r
+                "3eb6abc9.a7b9b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "57ed2482.36942c",\r
+        "id": "3eb6abc9.a7b9b4",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5306.784423828125,\r
-        "y": 4913.635162353516,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5332.467788696289,\r
+        "y": 4918.916061401367,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "62a1336b.ab309c",\r
+        "id": "ab022fe7.308e68",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5317.7841796875,\r
-        "y": 4870.6353759765625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5343.467544555664,\r
+        "y": 4875.916275024414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6f96293b.020fc"\r
+                "82036bd3.d2b678"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "48fa24ff.a12f6c",\r
+        "id": "8f49a5ce.76f168",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5544.767578125,\r
-        "y": 4878.0518798828125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5570.450942993164,\r
+        "y": 4883.332778930664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d949e407.7d96c8",\r
-                "ba00ef86.599998",\r
-                "e04480f3.8af1b"\r
+                "c997366c.5a655",\r
+                "3dbdc2ab.0fbd3e",\r
+                "bd51e31d.644ad8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a4fcb041.b0aaf8",\r
+        "id": "cd343233.3d4178",\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": 4763.052337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5735.500747680664,\r
+        "y": 4768.333236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "dc33bc78.b33dc"\r
+                "355f9f95.f927e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dc33bc78.b33dc",\r
+        "id": "355f9f95.f927e8",\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": 4752.052581787109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5927.500747680664,\r
+        "y": 4757.333480834961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "88251130.694fa8"\r
+                "d2bb482a.6b0258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d949e407.7d96c8",\r
+        "id": "c997366c.5a655",\r
          "type": "set",\r
          "name": "unset tmp.aai.the-vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",\r
          "comments": "",\r
-        "x": 5658.334228515625,\r
-        "y": 4653.269378662109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5684.017593383789,\r
+        "y": 4658.550277709961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ba00ef86.599998",\r
+        "id": "3dbdc2ab.0fbd3e",\r
          "type": "set",\r
          "name": "set tmp.aai.the-vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
          "comments": "",\r
-        "x": 5650.334228515625,\r
-        "y": 4702.269378662109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5676.017593383789,\r
+        "y": 4707.550277709961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e04480f3.8af1b",\r
+        "id": "bd51e31d.644ad8",\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": 4883.435394287109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5907.434585571289,\r
+        "y": 4888.716293334961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e369ae1d.045348",\r
+        "id": "284b8a46.878cde",\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": 4930.752288818359,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5859.084487915039,\r
+        "y": 4936.033187866211,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7bcaed73.c4335c",\r
+        "id": "d8829575.9f3a28",\r
          "type": "comment",\r
          "name": "decrease the bw of the-vpn-binding and change status to modified",\r
          "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",\r
          "comments": "",\r
-        "x": 5905.751220703125,\r
-        "y": 4844.435394287109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5931.434585571289,\r
+        "y": 4849.716293334961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "88251130.694fa8",\r
+        "id": "d2bb482a.6b0258",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 6083.8173828125,\r
-        "y": 4731.052581787109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6109.500747680664,\r
+        "y": 4736.333480834961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "3faa0ed9.e49512"\r
+                "c2a155f5.9faa88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3faa0ed9.e49512",\r
+        "id": "c2a155f5.9faa88",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 6245.8173828125,\r
-        "y": 4720.052581787109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6271.500747680664,\r
+        "y": 4725.333480834961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1f4e4f1d.0faeb9",\r
-                "71f57a2d.ed1434"\r
+                "560d06d2.09f708",\r
+                "97054905.242338"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1f4e4f1d.0faeb9",\r
+        "id": "560d06d2.09f708",\r
          "type": "set",\r
          "name": "unset tmp.the-connectivity",\r
          "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",\r
          "comments": "",\r
-        "x": 6442.8173828125,\r
-        "y": 4649.052581787109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6468.500747680664,\r
+        "y": 4654.333480834961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "71f57a2d.ed1434",\r
+        "id": "97054905.242338",\r
          "type": "set",\r
          "name": "set tmp.the-connectivity",\r
          "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",\r
          "comments": "",\r
-        "x": 6440.2841796875,\r
-        "y": 4748.269378662109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6465.967544555664,\r
+        "y": 4753.550277709961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5e5dd175.2ee1b",\r
+        "id": "e8ad32eb.9df94",\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": 3207.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3123.483413696289,\r
+        "y": 3212.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "95f11825.f517d8",\r
+        "id": "cf9533e5.c2371",\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": 3317.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3000.483413696289,\r
+        "y": 3322.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "eda02ee3.547818",\r
-                "24ae5a23.6efcde"\r
+                "6d545915.394bc",\r
+                "8fea5bf9.a101b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eda02ee3.547818",\r
+        "id": "6d545915.394bc",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3158.800048828125,\r
-        "y": 3296.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3184.483413696289,\r
+        "y": 3301.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "25d89b5b.fea624"\r
+                "a2317561.56953"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "25d89b5b.fea624",\r
+        "id": "a2317561.56953",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3301.800048828125,\r
-        "y": 3296.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3327.483413696289,\r
+        "y": 3301.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a5e21959.30c488"\r
+                "a264af99.117e28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a5e21959.30c488",\r
+        "id": "a264af99.117e28",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",\r
          "comments": "",\r
-        "x": 3477.800048828125,\r
-        "y": 3294.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3503.483413696289,\r
+        "y": 3299.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24ae5a23.6efcde",\r
+        "id": "8fea5bf9.a101b8",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3156.800048828125,\r
-        "y": 3351.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3182.483413696289,\r
+        "y": 3356.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2aa846fb.1fdfe2"\r
+                "3fcc1946.2227c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2aa846fb.1fdfe2",\r
+        "id": "3fcc1946.2227c6",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3003.800048828125,\r
-        "y": 3484.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3029.483413696289,\r
+        "y": 3489.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "45cb1d93.9cef0c",\r
-                "95cc6144.fb6bd8",\r
-                "21aeddc1.06f77a",\r
-                "ab0940a1.911a68",\r
-                "6d6cc518.e0ec9c",\r
-                "3c679d7f.fbbb22"\r
+                "13751b77.2d6a35",\r
+                "42ae91e0.cfd958",\r
+                "f0c980e9.4c97f",\r
+                "15cfd0d2.c7223f",\r
+                "566cdb6f.69a6a4",\r
+                "130e3d11.8bda33"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "522b1854.031bc",\r
+        "id": "b391ba6b.5d625",\r
          "type": "comment",\r
          "name": "Find LEAF connectivity",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3225.88330078125,\r
-        "y": 3724.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3251.566665649414,\r
+        "y": 3729.566635131836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ab0940a1.911a68",\r
+        "id": "15cfd0d2.c7223f",\r
          "type": "set",\r
          "name": "set tmp.MMstillHasUni to FALSE",\r
          "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='false' />\n",\r
          "comments": "",\r
-        "x": 3308.333251953125,\r
-        "y": 3497.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3334.016616821289,\r
+        "y": 3502.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6d6cc518.e0ec9c",\r
+        "id": "566cdb6f.69a6a4",\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": 3543.0025329589844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3332.516372680664,\r
+        "y": 3548.283432006836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f5f202e7.9ae08"\r
+                "69987cbf.ba882c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f5f202e7.9ae08",\r
+        "id": "69987cbf.ba882c",\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": 3538.0025329589844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3595.516372680664,\r
+        "y": 3543.283432006836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "186eedb6.79ae82"\r
+                "6b4b309c.a784f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "186eedb6.79ae82",\r
+        "id": "6b4b309c.a784f8",\r
          "type": "outcome",\r
          "name": "uni",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3729.83251953125,\r
-        "y": 3518.0025329589844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3755.515884399414,\r
+        "y": 3523.283432006836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e8fee7bd.fc2ef8"\r
+                "537f8032.a139c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "774ecc4a.3ad124",\r
+        "id": "608ff90c.2e5fc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5066.834228515625,\r
-        "y": 3549.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5092.517593383789,\r
+        "y": 3554.283462524414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9464a805.69d21",\r
-                "af3bd9a1.948688",\r
-                "da386631.67d8c8"\r
+                "b2d28e5c.e8fb18",\r
+                "d55c5cbc.26dad8",\r
+                "99b14097.a9c1b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9464a805.69d21",\r
+        "id": "b2d28e5c.e8fb18",\r
          "type": "set",\r
          "name": "set tmp.MMstillHasUni to TRUE",\r
          "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='true' />\n",\r
          "comments": "",\r
-        "x": 5306.334716796875,\r
-        "y": 3498.0858154296875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5332.018081665039,\r
+        "y": 3503.366714477539,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "af3bd9a1.948688",\r
+        "id": "d55c5cbc.26dad8",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 5239.568145751953,\r
-        "y": 3571.0858459472656,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5265.251510620117,\r
+        "y": 3576.366744995117,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "17da0805.f3e8a8",\r
+        "id": "3b35e0ea.5843e8",\r
          "type": "comment",\r
          "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",\r
          "info": "",\r
          "comments": "",\r
-        "x": 4432.88427734375,\r
-        "y": 5105.285980224609,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4458.567642211914,\r
+        "y": 5110.566879272461,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "19328269.e896be",\r
+        "id": "a474eb09.bdcea",\r
          "type": "set",\r
          "name": "set tmp.leafconn.",\r
          "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",\r
          "comments": "",\r
-        "x": 4331.317138671875,\r
-        "y": 5157.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4357.000503540039,\r
+        "y": 5162.483383178711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ffd8a757.b8a3f",\r
+        "id": "bbed6bed.031a08",\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": 5600.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4508.000503540039,\r
+        "y": 5605.483383178711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b33560b0.1278c",\r
+        "id": "9b06d9ac.c2c2b",\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": 5667.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4323.000503540039,\r
+        "y": 5672.483383178711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e0079417.8b765",\r
-                "94134a14.38a09"\r
+                "da6e8509.7a87a8",\r
+                "16a08f38.4e9a49"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e0079417.8b765",\r
+        "id": "da6e8509.7a87a8",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4562.317138671875,\r
-        "y": 5652.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4588.000503540039,\r
+        "y": 5657.483383178711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c191059e.ace948"\r
+                "c2e76143.b6b218"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "94134a14.38a09",\r
+        "id": "16a08f38.4e9a49",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4558.317138671875,\r
-        "y": 5700.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4584.000503540039,\r
+        "y": 5705.483383178711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "21c0ccb3.89b3cc"\r
+                "8fe2e656.247af"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c191059e.ace948",\r
+        "id": "c2e76143.b6b218",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4718.317138671875,\r
-        "y": 5648.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4744.000503540039,\r
+        "y": 5653.483383178711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ea983e85.321ce"\r
+                "9d183ed0.0c624"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "21c0ccb3.89b3cc",\r
+        "id": "8fe2e656.247af",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
          "comments": "",\r
-        "x": 4706.317138671875,\r
-        "y": 5695.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4732.000503540039,\r
+        "y": 5700.483383178711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "11ee9928.b9a3cf",\r
+        "id": "2c1c4698.bb1b8a",\r
          "type": "set",\r
          "name": "set tmp.rootconn.",\r
          "xml": "<set>\n<parameter name='tmp.rootconn.' value=\"`$tmp.aai.ROOT.connectivity.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 5138.3173828125,\r
-        "y": 5590.202484130859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5164.000747680664,\r
+        "y": 5595.483383178711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3a447acf.2b1f0e",\r
+        "id": "39f2eed6.a40982",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 4540.734130859375,\r
-        "y": 5186.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4566.417495727539,\r
+        "y": 5191.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "93e60704.65dbd",\r
+        "id": "4e75594e.323fe8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4311.734130859375,\r
-        "y": 5275.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4337.417495727539,\r
+        "y": 5280.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "3a447acf.2b1f0e",\r
-                "a0d0d144.703df8"\r
+                "39f2eed6.a40982",\r
+                "ec0a5547.230718"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a0d0d144.703df8",\r
+        "id": "ec0a5547.230718",\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": 5268.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4573.417495727539,\r
+        "y": 5273.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "93bdcc8d.eca238",\r
-                "76b31045.74e9",\r
-                "e9dc2865.72e928"\r
+                "f4f0abfb.959d98",\r
+                "6d247b2e.c14f4c",\r
+                "ac6604fb.6b0698"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "93bdcc8d.eca238",\r
+        "id": "f4f0abfb.959d98",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4743.2342529296875,\r
-        "y": 5220.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4768.917617797852,\r
+        "y": 5225.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "87ddaf65.395498"\r
+                "7a4a15ea.cb5f7c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "76b31045.74e9",\r
+        "id": "6d247b2e.c14f4c",\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": 5275.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4760.917617797852,\r
+        "y": 5280.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "fe3d7591.8ed12"\r
+                "9d792ff5.12f1d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "87ddaf65.395498",\r
+        "id": "7a4a15ea.cb5f7c",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4887.6165771484375,\r
-        "y": 5220.141845703125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4913.299942016602,\r
+        "y": 5225.422744750977,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ad455c8f.ae00e8"\r
+                "22a044c0.3de0ec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ad455c8f.ae00e8",\r
+        "id": "22a044c0.3de0ec",\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": 5218.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5097.417495727539,\r
+        "y": 5223.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d25e267a.3e533"\r
+                "afda241e.dc7d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d25e267a.3e533",\r
+        "id": "afda241e.dc7d4",\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": 5218.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5292.417495727539,\r
+        "y": 5223.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "93445f98.6a2b88"\r
+                "7162d2d.84a60ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e9dc2865.72e928",\r
+        "id": "ac6604fb.6b0698",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4740.2342529296875,\r
-        "y": 5332.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4765.917617797852,\r
+        "y": 5337.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d3c476f6.a94bf"\r
+                "cc0a2fe1.d0b358"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d3c476f6.a94bf",\r
+        "id": "cc0a2fe1.d0b358",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4892.2342529296875,\r
-        "y": 5333.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4917.917617797852,\r
+        "y": 5338.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fe3d7591.8ed12",\r
+        "id": "9d792ff5.12f1d8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4903.2342529296875,\r
-        "y": 5276.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4928.917617797852,\r
+        "y": 5281.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a6955939.7a731",\r
+        "id": "9e3505a2.ad7f68",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5648.734130859375,\r
-        "y": 5222.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5674.417495727539,\r
+        "y": 5227.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9484e895.44a448",\r
-                "50aee0a4.445958",\r
-                "f7a12344.c8bde8"\r
+                "ea7ae99e.7714a",\r
+                "97767b77.532b48",\r
+                "bd9bb3b2.0d8698"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "93445f98.6a2b88",\r
+        "id": "7162d2d.84a60ac",\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": 5222.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5495.417495727539,\r
+        "y": 5227.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a6955939.7a731"\r
+                "9e3505a2.ad7f68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "50aee0a4.445958",\r
+        "id": "97767b77.532b48",\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": 5235.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5880.417495727539,\r
+        "y": 5240.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1af8bb44.7d7ad5",\r
-                "48532c3d.63b2f4",\r
-                "af6d67e.1e33f98"\r
+                "8ede340c.5a66c8",\r
+                "74477750.32976",\r
+                "ea5203af.a882c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9484e895.44a448",\r
+        "id": "ea7ae99e.7714a",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domain id",\r
          "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5884.734130859375,\r
-        "y": 5183.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5910.417495727539,\r
+        "y": 5188.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1af8bb44.7d7ad5",\r
+        "id": "8ede340c.5a66c8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 6064.734130859375,\r
-        "y": 5226.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6090.417495727539,\r
+        "y": 5231.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "751438ac.f3ea9"\r
+                "5e0e6cb.070b594"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "48532c3d.63b2f4",\r
+        "id": "74477750.32976",\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": 5281.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6082.417495727539,\r
+        "y": 5286.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1ab525ea.2aee0a"\r
+                "8bfb7c50.692e68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "af6d67e.1e33f98",\r
+        "id": "ea5203af.a882c8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 6061.734130859375,\r
-        "y": 5338.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6087.417495727539,\r
+        "y": 5343.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "658bf37d.2cc724"\r
+                "1d7cc732.18ead1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "658bf37d.2cc724",\r
+        "id": "1d7cc732.18ead1",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 6213.734130859375,\r
-        "y": 5339.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6239.417495727539,\r
+        "y": 5344.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1ab525ea.2aee0a",\r
+        "id": "8bfb7c50.692e68",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 6224.734130859375,\r
-        "y": 5284.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6250.417495727539,\r
+        "y": 5289.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "751438ac.f3ea9",\r
+        "id": "5e0e6cb.070b594",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 6209.116455078125,\r
-        "y": 5224.141845703125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6234.799819946289,\r
+        "y": 5229.422744750977,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "3d7e0062.7d2af"\r
+                "20b06727.e2f538"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3d7e0062.7d2af",\r
+        "id": "20b06727.e2f538",\r
          "type": "set",\r
          "name": "set controller domain data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 6423.734130859375,\r
-        "y": 5220.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6449.417495727539,\r
+        "y": 5225.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f7a12344.c8bde8",\r
+        "id": "bd9bb3b2.0d8698",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 5804.734130859375,\r
-        "y": 5299.486175537109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5830.417495727539,\r
+        "y": 5304.767074584961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8b3d1eff.18e008",\r
+        "id": "8985192.1ed6868",\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": 5380.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4478.917739868164,\r
+        "y": 5385.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ee0f617b.5bd02",\r
-                "8e2d6022.079658"\r
+                "62c705b1.502d1c",\r
+                "1b875464.e01f44"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ee0f617b.5bd02",\r
+        "id": "62c705b1.502d1c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4813.734130859375,\r
-        "y": 5388.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4839.417495727539,\r
+        "y": 5393.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e5f9197d.04b6c"\r
+                "d191549e.030218"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5f9197d.04b6c",\r
+        "id": "d191549e.030218",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 4971.734130859375,\r
-        "y": 5388.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4997.417495727539,\r
+        "y": 5393.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b5f90852.29b69",\r
+        "id": "18bca107.e50237",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4975.234130859375,\r
-        "y": 5428.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5000.917495727539,\r
+        "y": 5433.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8e2d6022.079658",\r
+        "id": "1b875464.e01f44",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4817.734130859375,\r
-        "y": 5428.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4843.417495727539,\r
+        "y": 5433.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b5f90852.29b69"\r
+                "18bca107.e50237"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ffe0ea3.8a4d998",\r
+        "id": "8380c690.faafc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5126.451171875,\r
-        "y": 5642.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5152.134536743164,\r
+        "y": 5647.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6146efb2.cf13d",\r
-                "9351cf54.365048"\r
+                "1f713bf9.1daaec",\r
+                "39b06195.a8d3be"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9351cf54.365048",\r
+        "id": "39b06195.a8d3be",\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": 5592.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5394.134292602539,\r
+        "y": 5597.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d35be3cf.cc2028",\r
-                "74f2b735.4a4b38",\r
-                "4e1edc90.74b29c"\r
+                "fbd8ede5.0e2c68",\r
+                "fe4285c6.cb2308",\r
+                "3fecf8f4.4ce3f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d35be3cf.cc2028",\r
+        "id": "fbd8ede5.0e2c68",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5563.951171875,\r
-        "y": 5526.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5589.634536743164,\r
+        "y": 5531.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "8c6be2ce.3abef8"\r
+                "10a1ac3d.04aa44"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74f2b735.4a4b38",\r
+        "id": "fe4285c6.cb2308",\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": 5582.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5585.634536743164,\r
+        "y": 5587.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "17a91916.50ea6f"\r
+                "f166d116.9a8368"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c6be2ce.3abef8",\r
+        "id": "10a1ac3d.04aa44",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5708.3333740234375,\r
-        "y": 5543.741455078125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5734.016738891602,\r
+        "y": 5549.022354125977,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "41f50adf.154854"\r
+                "2f38d9ab.5bfbbe"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41f50adf.154854",\r
+        "id": "2f38d9ab.5bfbbe",\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": 5542.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5918.134292602539,\r
+        "y": 5547.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "92f6a716.223fa8"\r
+                "e1d73c4d.409db8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4e1edc90.74b29c",\r
+        "id": "3fecf8f4.4ce3f",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5569.951171875,\r
-        "y": 5627.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5595.634536743164,\r
+        "y": 5632.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9e924b4c.b75db"\r
+                "ba50366d.81301"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9e924b4c.b75db",\r
+        "id": "ba50366d.81301",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5748.951171875,\r
-        "y": 5643.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5774.634536743164,\r
+        "y": 5648.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "17a91916.50ea6f",\r
+        "id": "f166d116.9a8368",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5730.951171875,\r
-        "y": 5595.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5756.634536743164,\r
+        "y": 5600.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "21c4fa1a.b93b46",\r
+        "id": "1d5ce61.ba31c9a",\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": 5697.685394287109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5305.634536743164,\r
+        "y": 5702.966293334961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "95033c2a.09c67",\r
-                "f1a877c4.a203d8"\r
+                "8374d45d.c41588",\r
+                "6d72c625.482d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "95033c2a.09c67",\r
+        "id": "8374d45d.c41588",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5628.451171875,\r
-        "y": 5679.685394287109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5654.134536743164,\r
+        "y": 5684.966293334961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "76c41eff.4cfe88"\r
+                "53e0b67e.6fc768"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "76c41eff.4cfe88",\r
+        "id": "53e0b67e.6fc768",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 5884.451171875,\r
-        "y": 5682.685394287109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5910.134536743164,\r
+        "y": 5687.966293334961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb3b6335.123de8",\r
+        "id": "1ee806c.abb34f9",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5836.951171875,\r
-        "y": 5723.685394287109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5862.634536743164,\r
+        "y": 5728.966293334961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f1a877c4.a203d8",\r
+        "id": "6d72c625.482d5",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5638.451171875,\r
-        "y": 5728.685394287109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5664.134536743164,\r
+        "y": 5733.966293334961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "eb3b6335.123de8"\r
+                "1ee806c.abb34f9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6146efb2.cf13d",\r
+        "id": "1f713bf9.1daaec",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.rootconn.access-provider-id + '-clientId-' +\n                                                   $tmp.rootconn.access-client-id + '-topologyId-' +\n                                                   $tmp.rootconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.rootconn.access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 5361.450927734375,\r
-        "y": 5510.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5387.134292602539,\r
+        "y": 5515.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "92f6a716.223fa8",\r
+        "id": "e1d73c4d.409db8",\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": 5542.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6113.134292602539,\r
+        "y": 5547.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "bd55517c.f87f1"\r
+                "b323e9c9.c4083"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8bf8b16.3c18f5",\r
+        "id": "be7ed337.773238",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 6469.450927734375,\r
-        "y": 5546.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6495.134292602539,\r
+        "y": 5551.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1bd48f8a.cba628",\r
-                "1ea10909.ec8b57",\r
-                "ecac1508.b763"\r
+                "1a0db354.43c10d",\r
+                "711b7fd1.39246",\r
+                "1b22d01c.0f5988"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd55517c.f87f1",\r
+        "id": "b323e9c9.c4083",\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": 5546.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6316.134292602539,\r
+        "y": 5551.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "8bf8b16.3c18f5"\r
+                "be7ed337.773238"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1ea10909.ec8b57",\r
+        "id": "711b7fd1.39246",\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": 5559.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6701.134292602539,\r
+        "y": 5564.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "830127bc.8c4c18",\r
-                "adc00906.538428",\r
-                "5c009e0.e4c98e4"\r
+                "d1222469.959ab8",\r
+                "2ce3fcd5.8dd1cc",\r
+                "95dec9e7.124ae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1bd48f8a.cba628",\r
+        "id": "1a0db354.43c10d",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domain id",\r
          "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 6705.450927734375,\r
-        "y": 5507.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6731.134292602539,\r
+        "y": 5512.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "830127bc.8c4c18",\r
+        "id": "d1222469.959ab8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 6885.450927734375,\r
-        "y": 5550.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6911.134292602539,\r
+        "y": 5555.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ea1d97d5.52d0a"\r
+                "15af61ce.93dc56"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "adc00906.538428",\r
+        "id": "2ce3fcd5.8dd1cc",\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": 5605.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6903.134292602539,\r
+        "y": 5610.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "283c974a.c2fc28"\r
+                "85d2a0c5.7b74c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c009e0.e4c98e4",\r
+        "id": "95dec9e7.124ae",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 6882.450927734375,\r
-        "y": 5662.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6908.134292602539,\r
+        "y": 5667.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "dbf169ab.c4c478"\r
+                "6c15ae6.0ebeb5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dbf169ab.c4c478",\r
+        "id": "6c15ae6.0ebeb5",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 7034.450927734375,\r
-        "y": 5663.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 7060.134292602539,\r
+        "y": 5668.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "283c974a.c2fc28",\r
+        "id": "85d2a0c5.7b74c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 7045.450927734375,\r
-        "y": 5608.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 7071.134292602539,\r
+        "y": 5613.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ea1d97d5.52d0a",\r
+        "id": "15af61ce.93dc56",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 7029.833251953125,\r
-        "y": 5547.741455078125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 7055.516616821289,\r
+        "y": 5553.022354125977,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "eea057d1.d2c178"\r
+                "370a475d.301248"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eea057d1.d2c178",\r
+        "id": "370a475d.301248",\r
          "type": "set",\r
          "name": "set controller domain data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 7244.450927734375,\r
-        "y": 5544.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 7270.134292602539,\r
+        "y": 5549.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ecac1508.b763",\r
+        "id": "1b22d01c.0f5988",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 6625.450927734375,\r
-        "y": 5623.085784912109,\r
-        "z": "1806503a.76a7a",\r
+        "x": 6651.134292602539,\r
+        "y": 5628.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e8fee7bd.fc2ef8",\r
+        "id": "537f8032.a139c8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3854.88330078125,\r
-        "y": 3512.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3880.566665649414,\r
+        "y": 3517.566635131836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "4b07eb9e.ad1084",\r
-                "449a6f75.ecc4d"\r
+                "4c0087b1.a54ff",\r
+                "543f9693.a47c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4b07eb9e.ad1084",\r
+        "id": "4c0087b1.a54ff",\r
          "type": "set",\r
          "name": "set tmp.mmUNI-id-long",\r
          "xml": "<set>\n<parameter name='tmp.mmUNI-id-long' value='`$middle-man-conn.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",\r
          "comments": "",\r
-        "x": 4045.466552734375,\r
-        "y": 3455.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4071.149917602539,\r
+        "y": 3460.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "449a6f75.ecc4d",\r
+        "id": "543f9693.a47c",\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": 3526.0857849121094,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4118.149917602539,\r
+        "y": 3531.366683959961,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a5622a5e.b03c68",\r
-                "1b2b72f4.a20bdd"\r
+                "e4164ac6.db6c38",\r
+                "5e838a6b.5e0f0c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a5622a5e.b03c68",\r
+        "id": "e4164ac6.db6c38",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4330.884033203125,\r
-        "y": 3485.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4356.567398071289,\r
+        "y": 3490.566635131836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d22a60e2.fd2778"\r
+                "4d697267.53d1ec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1b2b72f4.a20bdd",\r
+        "id": "5e838a6b.5e0f0c",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4337.884246826172,\r
-        "y": 3542.2857055664062,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4363.567611694336,\r
+        "y": 3547.566604614258,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b7814ecb.1580d"\r
+                "fa76b584.bdbd9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d22a60e2.fd2778",\r
+        "id": "4d697267.53d1ec",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4458.884521484375,\r
-        "y": 3481.2857360839844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4484.567886352539,\r
+        "y": 3486.566635131836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3c679d7f.fbbb22",\r
+        "id": "130e3d11.8bda33",\r
          "type": "set",\r
          "name": "set tmp.MMonlyHasROOT to TRUE",\r
          "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='true' />\n",\r
          "comments": "",\r
-        "x": 3314.083251953125,\r
-        "y": 3439.6858825683594,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3339.766616821289,\r
+        "y": 3444.966781616211,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "da386631.67d8c8",\r
+        "id": "99b14097.a9c1b8",\r
          "type": "set",\r
          "name": "set tmp.MMonlyHasROOT to FALSE",\r
          "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='false' />\n",\r
          "comments": "",\r
-        "x": 5295.91748046875,\r
-        "y": 3441.6859130859375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5321.600845336914,\r
+        "y": 3446.966812133789,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5fa67fdd.e511b8",\r
+        "id": "335ed745.f60fb8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4407.6669921875,\r
-        "y": 3961.9024353027344,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4433.350357055664,\r
+        "y": 3967.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a814439f.bac2e",\r
-                "f8d770ba.37d44"\r
+                "64f170e7.ccc2d",\r
+                "d03c542e.06f138"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a814439f.bac2e",\r
+        "id": "64f170e7.ccc2d",\r
          "type": "set",\r
          "name": "set tmp.uni.id",\r
          "xml": "<set>\n<parameter name='tmp.uni.id' value='`$tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",\r
          "comments": "",\r
-        "x": 4580.5498046875,\r
-        "y": 3957.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4606.233169555664,\r
+        "y": 3962.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f8d770ba.37d44",\r
+        "id": "d03c542e.06f138",\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": 4004.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4609.233169555664,\r
+        "y": 4009.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7fc95f5b.ec381",\r
-                "28603ae9.d6e726",\r
-                "f736ad43.136778"\r
+                "d5d4471e.75f138",\r
+                "fea86c4e.6eb66",\r
+                "9876b951.6d5f9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7fc95f5b.ec381",\r
+        "id": "d5d4471e.75f138",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4755.5498046875,\r
-        "y": 3988.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4781.233169555664,\r
+        "y": 3993.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "47e06d70.96544c"\r
+                "c08f73d3.bbadb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28603ae9.d6e726",\r
+        "id": "fea86c4e.6eb66",\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": 4034.1361389160156,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4781.724136352539,\r
+        "y": 4039.417037963867,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f736ad43.136778",\r
+        "id": "9876b951.6d5f9",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4756.5498046875,\r
-        "y": 4074.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4782.233169555664,\r
+        "y": 4079.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "47e06d70.96544c",\r
+        "id": "c08f73d3.bbadb",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4916.5498046875,\r
-        "y": 3984.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4942.233169555664,\r
+        "y": 3989.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "db3d2916.05167",\r
-                "b1e93bbf.154be8",\r
-                "2727d594.264d9a"\r
+                "71418de6.0d2394",\r
+                "d8794541.6fe0d",\r
+                "69521be3.cd51ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3055c73f.990de",\r
+        "id": "7f40068a.c630c8",\r
          "type": "comment",\r
          "name": "find the node part of the uni.id (uni-tp-id-node-part)",\r
          "info": "",\r
          "comments": "",\r
-        "x": 5249.5498046875,\r
-        "y": 3915.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5275.233169555664,\r
+        "y": 3920.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b1e93bbf.154be8",\r
+        "id": "d8794541.6fe0d",\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": 3972.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5210.233169555664,\r
+        "y": 3977.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "8ed99d07.46ccf",\r
-                "dfad78a0.2e2798"\r
+                "eb66d929.7d0b9",\r
+                "25fd01e0.613c0e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dfad78a0.2e2798",\r
+        "id": "25fd01e0.613c0e",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5407.5498046875,\r
-        "y": 3958.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5433.233169555664,\r
+        "y": 3963.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "40b7643c.aa9b44"\r
+                "b7f38bd8.a0bf3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ed99d07.46ccf",\r
+        "id": "eb66d929.7d0b9",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5409.5498046875,\r
-        "y": 3991.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5435.233169555664,\r
+        "y": 3996.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2c3f5774.427218"\r
+                "23361310.a1a764"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40b7643c.aa9b44",\r
+        "id": "b7f38bd8.a0bf3",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5555.5498046875,\r
-        "y": 3951.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5581.233169555664,\r
+        "y": 3956.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "49b755b0.ff456c"\r
+                "16198ed9.69ab49"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2c3f5774.427218",\r
+        "id": "23361310.a1a764",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 5552.5498046875,\r
-        "y": 3988.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5578.233169555664,\r
+        "y": 3993.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "49b755b0.ff456c",\r
+        "id": "16198ed9.69ab49",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.uni.pnf-name' value=\"`$param-prefix-uni-pnfName[0] + '-' +\n                                                   $param-prefix-uni-pnfName[1] + '-' +\n                                                   $param-prefix-uni-pnfName[2] + '-' +\n                                                   $param-prefix-uni-pnfName[3] + '-' +\n                                                   $param-prefix-uni-pnfName[4] + '-' +\n                                                   $param-prefix-uni-pnfName[5] + '-' +\n                                                   $param-prefix-uni-pnfName[6] + '-' +\n                                                   $param-prefix-uni-pnfName[7] + '-' +\n                                                   $param-prefix-uni-pnfName[8]`\" />\n",\r
          "comments": "",\r
-        "x": 5732.5498046875,\r
-        "y": 3951.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5758.233169555664,\r
+        "y": 3956.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "db3d2916.05167",\r
+        "id": "71418de6.0d2394",\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": 4106.562103271484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5254.233169555664,\r
+        "y": 4111.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "76a8963f.4621b8",\r
-                "22179ab4.cea27e"\r
+                "adaeb862.473368",\r
+                "2ff17e89.b4833a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "76a8963f.4621b8",\r
+        "id": "adaeb862.473368",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5509.5498046875,\r
-        "y": 4083.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5535.233169555664,\r
+        "y": 4088.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "cdc60b24.0ad9a8"\r
+                "b52ce206.918da8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "22179ab4.cea27e",\r
+        "id": "2ff17e89.b4833a",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5502.5498046875,\r
-        "y": 4142.562103271484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5528.233169555664,\r
+        "y": 4147.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5846229.a88c65c"\r
+                "b7c68567.02237"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cdc60b24.0ad9a8",\r
+        "id": "b52ce206.918da8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5639.5498046875,\r
-        "y": 4087.5621032714844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5665.233169555664,\r
+        "y": 4092.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5846229.a88c65c",\r
+        "id": "b7c68567.02237",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5644.5498046875,\r
-        "y": 4141.562103271484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5670.233169555664,\r
+        "y": 4146.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a9c7c427.af4688",\r
-                "fe9fa034.5cb01"\r
+                "e0f7b55.335ff48",\r
+                "cb97a1e2.dfe9f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9c7c427.af4688",\r
+        "id": "e0f7b55.335ff48",\r
          "type": "set",\r
          "name": "set no-pce-call",\r
          "xml": "<set>\n<parameter name='no-pce-call' value=\"true\" />\n",\r
          "comments": "",\r
-        "x": 5836.5498046875,\r
-        "y": 4108.562103271484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5862.233169555664,\r
+        "y": 4113.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "98a16c7e.29ab68",\r
+        "id": "8511bfc9.24e818",\r
          "type": "set",\r
          "name": "set middle-man-conn",\r
          "xml": "<set>\n<parameter name='middle-man-conn.' value='`$tmp.aai.all-connectivities.connectivity[$connidx].`' />\n",\r
          "comments": "",\r
-        "x": 5852.5498046875,\r
-        "y": 4160.562103271484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5878.233169555664,\r
+        "y": 4165.843002319336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fe9fa034.5cb01",\r
+        "id": "cb97a1e2.dfe9f8",\r
          "type": "set",\r
          "name": "set tmp.stillHasUni and tmp.keepVPNBs to TRUE",\r
          "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n<parameter name='tmp.keepVPNBs' value='true' />\n",\r
          "comments": "",\r
-        "x": 5870.83349609375,\r
-        "y": 4230.152435302734,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5896.516860961914,\r
+        "y": 4235.433334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2727d594.264d9a",\r
+        "id": "69521be3.cd51ac",\r
          "type": "set",\r
          "name": "set tmp.stillHasUni to TRUE",\r
          "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",\r
          "comments": "",\r
-        "x": 5147.533203125,\r
-        "y": 4056.0523376464844,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5173.216567993164,\r
+        "y": 4061.333236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c0a1014a.3ea75",\r
+        "id": "94db503d.b50288",\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": 5326.252044677734,\r
-        "z": "1806503a.76a7a",\r
+        "x": 409.4172821044922,\r
+        "y": 5331.532943725586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5bc4629f.a764e4",\r
-                "36ea940e.f6b704"\r
+                "98c37402.345048",\r
+                "44b19987.103118"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "529ae160.378f78",\r
+        "id": "5e023344.61a9f4",\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": 5490.135833740234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4314.199722290039,\r
+        "y": 5495.416732788086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e3e4b7ad.cfce5",\r
-                "2311d61f.89de52",\r
-                "cab68c6b.abd21"\r
+                "76f7324c.5ab6f4",\r
+                "92aa08d0.816178",\r
+                "84add947.e60b78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b4c8a8a.8bc066",\r
+        "id": "26cdc27d.9e4c6e",\r
          "type": "comment",\r
          "name": "Update ROOT UNI's bw -- ALREADY DONE",\r
          "info": "",\r
          "comments": "",\r
-        "x": 4286.516845703125,\r
-        "y": 5442.136077880859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4312.200210571289,\r
+        "y": 5447.416976928711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "89e149ab.f2e7c8",\r
+        "id": "eb8b95c0.79475",\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": 5560.136077880859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4929.199966430664,\r
+        "y": 5565.416976928711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2311d61f.89de52",\r
+        "id": "92aa08d0.816178",\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": 5460.710052490234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4531.690933227539,\r
+        "y": 5465.990951538086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "983c2552.f1f49"\r
+                "8b26daec.dead98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cab68c6b.abd21",\r
+        "id": "84add947.e60b78",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4501.5166015625,\r
-        "y": 5505.136016845703,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4527.199966430664,\r
+        "y": 5510.416915893555,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "62a8aa1.663f1d4"\r
+                "6ddd64cd.a4b574"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "983c2552.f1f49",\r
+        "id": "8b26daec.dead98",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4668.5791015625,\r
-        "y": 5459.995758056641,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4694.262466430664,\r
+        "y": 5465.276657104492,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "62a8aa1.663f1d4",\r
+        "id": "6ddd64cd.a4b574",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 4669.5166015625,\r
-        "y": 5505.136016845703,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4695.199966430664,\r
+        "y": 5510.416915893555,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d78e13a5.01de9",\r
+        "id": "5ac227ed.4c0b7",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4666.5166015625,\r
-        "y": 5555.136077880859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4692.199966430664,\r
+        "y": 5560.416976928711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7bde7792.d9b138",\r
-                "89e149ab.f2e7c8"\r
+                "176f7b0f.04a15d",\r
+                "eb8b95c0.79475"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e3e4b7ad.cfce5",\r
+        "id": "76f7324c.5ab6f4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4497.5166015625,\r
-        "y": 5555.136077880859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4523.199966430664,\r
+        "y": 5560.416976928711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d78e13a5.01de9"\r
+                "5ac227ed.4c0b7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7bde7792.d9b138",\r
+        "id": "176f7b0f.04a15d",\r
          "type": "set",\r
          "name": "set new bw",\r
          "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",\r
          "comments": "",\r
-        "x": 4859.517578125,\r
-        "y": 5480.136077880859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4885.200942993164,\r
+        "y": 5485.416976928711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cf4ce975.93215",\r
+        "id": "2932b285.c1e58e",\r
          "type": "comment",\r
          "name": "Update connectivity status to modified",\r
          "info": "",\r
          "comments": "",\r
-        "x": 5288.216796875,\r
-        "y": 5417.902679443359,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5313.900161743164,\r
+        "y": 5423.183578491211,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ea983e85.321ce",\r
+        "id": "9d183ed0.0c624",\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": 5460.102874755859,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5339.683364868164,\r
+        "y": 5465.383773803711,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5bc4629f.a764e4",\r
+        "id": "98c37402.345048",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 567.8836059570312,\r
-        "y": 5377.285736083984,\r
-        "z": "1806503a.76a7a",\r
+        "x": 593.5669708251953,\r
+        "y": 5382.566635131836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "867bdfac.94705"\r
+                "e53158e8.a8e898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "36ea940e.f6b704",\r
+        "id": "44b19987.103118",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 550.883544921875,\r
-        "y": 5299.285736083984,\r
-        "z": "1806503a.76a7a",\r
+        "x": 576.5669097900391,\r
+        "y": 5304.566635131836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ab9e57cf.8ef448"\r
+                "d82acda1.7d932"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eb7859d4.8fd35",\r
+        "id": "add9e89e.85dcc8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 679.8833923339844,\r
-        "y": 4386.285461425781,\r
-        "z": "1806503a.76a7a",\r
+        "x": 705.5667572021484,\r
+        "y": 4391.566360473633,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "8a11a728.e1b1d8",\r
-                "7438f980.400318",\r
-                "6c2db8ea.27724",\r
-                "a48617f3.9f6e4",\r
-                "5ff63bef.c5afdc",\r
-                "78f62ea.0af84d",\r
-                "d07ac0db.fa9818"\r
+                "1b682749.fdf219",\r
+                "555aecf4.9d0abc",\r
+                "fa8f69fe.c57418",\r
+                "924743a9.bdd1d",\r
+                "eeb2edff.f77838",\r
+                "b3758874.8f232",\r
+                "9c7760f0.090d48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8a11a728.e1b1d8",\r
+        "id": "1b682749.fdf219",\r
          "type": "set",\r
          "name": "set tmp.leafconn.",\r
          "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",\r
          "comments": "",\r
-        "x": 931.5667419433594,\r
-        "y": 4364.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "x": 957.2501068115234,\r
+        "y": 4369.616165161133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8aa064fb.543668",\r
+        "id": "20195ed4.4f043a",\r
          "type": "comment",\r
          "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",\r
          "info": "",\r
          "comments": "",\r
-        "x": 1033.1338806152344,\r
-        "y": 4312.418762207031,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1058.8172454833984,\r
+        "y": 4317.699661254883,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "821af189.946d58",\r
+        "id": "9fa4061c.f2e2c8",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 1140.9837341308594,\r
-        "y": 4393.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1166.6670989990234,\r
+        "y": 4398.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7438f980.400318",\r
+        "id": "555aecf4.9d0abc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 911.9837341308594,\r
-        "y": 4482.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 937.6670989990234,\r
+        "y": 4487.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "821af189.946d58",\r
-                "139cfd47.53e94b"\r
+                "9fa4061c.f2e2c8",\r
+                "a9e7fb46.8bda4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "139cfd47.53e94b",\r
+        "id": "a9e7fb46.8bda4",\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": 4475.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1173.6670989990234,\r
+        "y": 4480.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "df64900d.741c98",\r
-                "681e1ffc.26592",\r
-                "ab39d1b3.416b58"\r
+                "caf23ffe.0efab",\r
+                "c3c6018c.a6e8b8",\r
+                "a18cc13f.db156"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "df64900d.741c98",\r
+        "id": "caf23ffe.0efab",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1343.4838562011719,\r
-        "y": 4427.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1369.167221069336,\r
+        "y": 4432.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6f395e40.dc6b7"\r
+                "f910fabf.7d6ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "681e1ffc.26592",\r
+        "id": "c3c6018c.a6e8b8",\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": 4482.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1361.167221069336,\r
+        "y": 4487.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b25568a6.369d78"\r
+                "7989bd98.acfa84"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6f395e40.dc6b7",\r
+        "id": "f910fabf.7d6ff8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1487.8661804199219,\r
-        "y": 4427.274627685547,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1513.549545288086,\r
+        "y": 4432.555526733398,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "94a27fe.8c889"\r
+                "ffb71773.7c6d48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "94a27fe.8c889",\r
+        "id": "ffb71773.7c6d48",\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": 4425.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1697.6670989990234,\r
+        "y": 4430.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b448ea96.4c3af8"\r
+                "a91274f1.8c8af"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b448ea96.4c3af8",\r
+        "id": "a91274f1.8c8af",\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": 4425.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1892.6670989990234,\r
+        "y": 4430.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "77dc6e4f.3fb428"\r
+                "4cf12171.7f9938"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ab39d1b3.416b58",\r
+        "id": "a18cc13f.db156",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1340.4838562011719,\r
-        "y": 4539.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1366.167221069336,\r
+        "y": 4544.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "42bc5c1d.fe55cc"\r
+                "3d61f539.cfb7aa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "42bc5c1d.fe55cc",\r
+        "id": "3d61f539.cfb7aa",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1492.4838562011719,\r
-        "y": 4540.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1518.167221069336,\r
+        "y": 4545.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b25568a6.369d78",\r
+        "id": "7989bd98.acfa84",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1503.4838562011719,\r
-        "y": 4483.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1529.167221069336,\r
+        "y": 4488.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "80f1bf38.0bc68",\r
+        "id": "a5cb8297.ace3c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2248.9837341308594,\r
-        "y": 4429.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2274.6670989990234,\r
+        "y": 4434.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "cad7009f.f83538",\r
-                "d1a2dd14.715a78",\r
-                "689fc80.c15b238"\r
+                "2680c237.68eca6",\r
+                "fc040fd7.89c84",\r
+                "2a46caf5.5b4116"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "77dc6e4f.3fb428",\r
+        "id": "4cf12171.7f9938",\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": 4429.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2095.6670989990234,\r
+        "y": 4434.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "80f1bf38.0bc68"\r
+                "a5cb8297.ace3c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6c2db8ea.27724",\r
+        "id": "fa8f69fe.c57418",\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": 4587.218566894531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1079.1673431396484,\r
+        "y": 4592.499465942383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c3b5c5e7.57693",\r
-                "cf1b7699.e71658"\r
+                "f60ef44c.acdc6",\r
+                "f2d3c91e.712808"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf1b7699.e71658",\r
+        "id": "f2d3c91e.712808",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1417.9837341308594,\r
-        "y": 4635.218566894531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1443.6670989990234,\r
+        "y": 4640.499465942383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "723bcced.729e54"\r
+                "95261a80.102e28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c3b5c5e7.57693",\r
+        "id": "f60ef44c.acdc6",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1413.9837341308594,\r
-        "y": 4595.218566894531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1439.6670989990234,\r
+        "y": 4600.499465942383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "408278c5.7e5798"\r
+                "93ef3053.4d666"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "408278c5.7e5798",\r
+        "id": "93ef3053.4d666",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 1571.9837341308594,\r
-        "y": 4595.218566894531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1597.6670989990234,\r
+        "y": 4600.499465942383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "723bcced.729e54",\r
+        "id": "95261a80.102e28",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1575.4837341308594,\r
-        "y": 4635.218566894531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1601.1670989990234,\r
+        "y": 4640.499465942383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d1a2dd14.715a78",\r
+        "id": "fc040fd7.89c84",\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": 4442.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2480.6670989990234,\r
+        "y": 4447.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e07edffa.c89278",\r
-                "8645511b.c4b66",\r
-                "a8a5443b.9b8a2"\r
+                "3d8ec7b4.a91e7",\r
+                "f9528a5a.50e1f8",\r
+                "f194c3a5.898d88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cad7009f.f83538",\r
+        "id": "2680c237.68eca6",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domain id",\r
          "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 2484.9837341308594,\r
-        "y": 4390.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2510.6670989990234,\r
+        "y": 4395.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e07edffa.c89278",\r
+        "id": "3d8ec7b4.a91e7",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2664.9837341308594,\r
-        "y": 4433.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2690.6670989990234,\r
+        "y": 4438.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "cb5c9c8e.bb8ed8"\r
+                "e578c39c.344a5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8645511b.c4b66",\r
+        "id": "f9528a5a.50e1f8",\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": 4488.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2682.6670989990234,\r
+        "y": 4493.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "29fe474c.df75c8"\r
+                "b1a83287.5e83a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8a5443b.9b8a2",\r
+        "id": "f194c3a5.898d88",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2661.9837341308594,\r
-        "y": 4545.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2687.6670989990234,\r
+        "y": 4550.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b28b1e53.869fb"\r
+                "d1a6ffed.890f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b28b1e53.869fb",\r
+        "id": "d1a6ffed.890f4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2813.9837341308594,\r
-        "y": 4546.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2839.6670989990234,\r
+        "y": 4551.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "29fe474c.df75c8",\r
+        "id": "b1a83287.5e83a",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2824.9837341308594,\r
-        "y": 4491.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2850.6670989990234,\r
+        "y": 4496.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cb5c9c8e.bb8ed8",\r
+        "id": "e578c39c.344a5",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2809.3660583496094,\r
-        "y": 4431.274627685547,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2835.0494232177734,\r
+        "y": 4436.555526733398,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a908cc9.5d7f7b"\r
+                "dfc70a8a.f85818"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a908cc9.5d7f7b",\r
+        "id": "dfc70a8a.f85818",\r
          "type": "set",\r
          "name": "set controller domain data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 3023.9837341308594,\r
-        "y": 4427.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3049.6670989990234,\r
+        "y": 4432.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "689fc80.c15b238",\r
+        "id": "2a46caf5.5b4116",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 2404.9837341308594,\r
-        "y": 4506.618957519531,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2430.6670989990234,\r
+        "y": 4511.899856567383,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a48617f3.9f6e4",\r
+        "id": "924743a9.bdd1d",\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": 4807.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1108.2501068115234,\r
+        "y": 4812.616165161133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5ff63bef.c5afdc",\r
+        "id": "eeb2edff.f77838",\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": 4874.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "x": 923.2501068115234,\r
+        "y": 4879.616165161133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "bcfca35c.21654",\r
-                "62c7d864.119b88"\r
+                "33b186f1.cd717a",\r
+                "46c96756.fc5c58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bcfca35c.21654",\r
+        "id": "33b186f1.cd717a",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1162.5667419433594,\r
-        "y": 4859.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1188.2501068115234,\r
+        "y": 4864.616165161133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f4258877.5e35f"\r
+                "cdcc95c0.40a4e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "62c7d864.119b88",\r
+        "id": "46c96756.fc5c58",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1158.5667419433594,\r
-        "y": 4907.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1184.2501068115234,\r
+        "y": 4912.616165161133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "3fb79094.abfaa8"\r
+                "5f6a4b73.d387f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f4258877.5e35f",\r
+        "id": "cdcc95c0.40a4e8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1318.5667419433594,\r
-        "y": 4855.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1344.2501068115234,\r
+        "y": 4860.616165161133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2140ac57.1e83f4"\r
+                "5134ba22.f81734"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3fb79094.abfaa8",\r
+        "id": "5f6a4b73.d387f4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
          "comments": "",\r
-        "x": 1306.5667419433594,\r
-        "y": 4902.335266113281,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1332.2501068115234,\r
+        "y": 4907.616165161133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8db3fd20.37f318",\r
+        "id": "73beafc9.2c20a8",\r
          "type": "comment",\r
          "name": "Update connectivity status to modified",\r
          "info": "",\r
          "comments": "",\r
-        "x": 1587.4664001464844,\r
-        "y": 4806.035461425781,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1613.1497650146484,\r
+        "y": 4811.316360473633,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2140ac57.1e83f4",\r
+        "id": "5134ba22.f81734",\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": 4848.235656738281,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1638.9329681396484,\r
+        "y": 4853.516555786133,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "440b33d.dbb8acc",\r
+        "id": "39215cce.b57e94",\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": 4121.602355957031,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1052.5667572021484,\r
+        "y": 4126.883255004883,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ab9e57cf.8ef448",\r
+        "id": "d82acda1.7d932",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 632.8834228515625,\r
-        "y": 4126.285491943359,\r
-        "z": "1806503a.76a7a",\r
+        "x": 658.5667877197266,\r
+        "y": 4131.566390991211,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "440b33d.dbb8acc",\r
-                "eb7859d4.8fd35"\r
+                "39215cce.b57e94",\r
+                "add9e89e.85dcc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "867bdfac.94705",\r
+        "id": "e53158e8.a8e898",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 716.3333740234375,\r
-        "y": 5378.802337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 742.0167388916016,\r
+        "y": 5384.083236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c644609d.44bce",\r
-                "e7413115.aec04",\r
-                "d006cbe4.5a677",\r
-                "c786893c.7012b"\r
+                "5f6a4675.ad6e08",\r
+                "454309b7.55d6d8",\r
+                "1e655667.3c83ca",\r
+                "36ecf6b9.5afb0a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c644609d.44bce",\r
+        "id": "5f6a4675.ad6e08",\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": 1077.7166748046875,\r
-        "y": 5141.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1103.4000396728516,\r
+        "y": 5147.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e7413115.aec04",\r
+        "id": "454309b7.55d6d8",\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": 988.7166748046875,\r
-        "y": 5210.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1014.4000396728516,\r
+        "y": 5216.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d006cbe4.5a677",\r
+        "id": "1e655667.3c83ca",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 879.88330078125,\r
-        "y": 5445.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 905.5666656494141,\r
+        "y": 5451.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "614e61f8.50b5f",\r
-                "96d6a1ec.c795b",\r
-                "90aff610.9959f8"\r
+                "96f2f082.9a3518",\r
+                "4b895364.485e14",\r
+                "2fffa63d.405042"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7ca77be7.05ec8c",\r
+        "id": "bd546556.218588",\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": 2588.882568359375,\r
-        "y": 5370.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2614.565933227539,\r
+        "y": 5376.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a9496568.146b9",\r
-                "c5f96edd.835cb8",\r
-                "e018fe0a.acb8a"\r
+                "d9b04f13.72ba2",\r
+                "6f67d0fd.f943c",\r
+                "d85e2a4.827e658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9815115.2c557",\r
+        "id": "eb3b9787.8ee65",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 2538.882568359375,\r
-        "y": 5434.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2564.565933227539,\r
+        "y": 5440.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d05f3809.7521c8",\r
+        "id": "89310244.45d948",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domain id",\r
          "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 2618.882568359375,\r
-        "y": 5318.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2644.565933227539,\r
+        "y": 5324.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a9496568.146b9",\r
+        "id": "d9b04f13.72ba2",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2906.8826904296875,\r
-        "y": 5301.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2932.5660552978516,\r
+        "y": 5307.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b7511521.12ea3"\r
+                "ca13eb43.a9266"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c5f96edd.835cb8",\r
+        "id": "6f67d0fd.f943c",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2898.8826904296875,\r
-        "y": 5356.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2924.5660552978516,\r
+        "y": 5362.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d009936c.baaf78"\r
+                "7e30219a.74a1a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e018fe0a.acb8a",\r
+        "id": "d85e2a4.827e658",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2903.8826904296875,\r
-        "y": 5413.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2929.5660552978516,\r
+        "y": 5419.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a8c24324.12cd38"\r
+                "1fa2a159.15189f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8c24324.12cd38",\r
+        "id": "1fa2a159.15189f",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3055.8826904296875,\r
-        "y": 5414.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3081.5660552978516,\r
+        "y": 5420.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d009936c.baaf78",\r
+        "id": "7e30219a.74a1a8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3066.8826904296875,\r
-        "y": 5359.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3092.5660552978516,\r
+        "y": 5365.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b7511521.12ea3",\r
+        "id": "ca13eb43.a9266",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3051.2650146484375,\r
-        "y": 5299.458038330078,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3076.9483795166016,\r
+        "y": 5304.73893737793,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "87c431c3.fca34"\r
+                "3ed958.dd670ea8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "87c431c3.fca34",\r
+        "id": "3ed958.dd670ea8",\r
          "type": "set",\r
          "name": "set controller domain data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 3265.8826904296875,\r
-        "y": 5295.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3291.5660552978516,\r
+        "y": 5301.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "614e61f8.50b5f",\r
+        "id": "96f2f082.9a3518",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.the-connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.the-connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.the-connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.the-connectivity.access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 1161.88330078125,\r
-        "y": 5314.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1187.566665649414,\r
+        "y": 5320.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c0a00c52.f1e878",\r
+        "id": "bd5e9405.7c27a8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1372.3834228515625,\r
-        "y": 5453.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1398.0667877197266,\r
+        "y": 5459.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a9f88f76.4444c"\r
+                "de47c705.79a8b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "62d1e19f.b39a2",\r
+        "id": "6b3e7adb.d2bb84",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1375.3834228515625,\r
-        "y": 5341.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1401.0667877197266,\r
+        "y": 5347.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "957f349.e76e4c8"\r
+                "a396ce34.a18e2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9cbc6ac.26846",\r
+        "id": "a85067c1.2cd6d",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1367.3834228515625,\r
-        "y": 5396.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1393.0667877197266,\r
+        "y": 5402.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "48a6f350.0417c4"\r
+                "d6007294.f11f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "957f349.e76e4c8",\r
+        "id": "a396ce34.a18e2",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1509.765625,\r
-        "y": 5336.4581298828125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1535.448989868164,\r
+        "y": 5341.739028930664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d4741dab.7b5f78"\r
+                "7dd1d4e7.a0f1bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9f88f76.4444c",\r
+        "id": "de47c705.79a8b8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1524.3834228515625,\r
-        "y": 5454.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1550.0667877197266,\r
+        "y": 5460.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "48a6f350.0417c4",\r
+        "id": "d6007294.f11f4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1535.3834228515625,\r
-        "y": 5397.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1561.0667877197266,\r
+        "y": 5403.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d4741dab.7b5f78",\r
+        "id": "7dd1d4e7.a0f1bc",\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": 1696.8828125,\r
-        "y": 5337.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1722.566177368164,\r
+        "y": 5343.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "93c0e1e7.1663a8"\r
+                "559db4ec.64792c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "93c0e1e7.1663a8",\r
+        "id": "559db4ec.64792c",\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": 1924.8828125,\r
-        "y": 5330.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1950.566177368164,\r
+        "y": 5336.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "eb0c27f.1616058"\r
+                "799fadac.e2e6ec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "96d6a1ec.c795b",\r
+        "id": "4b895364.485e14",\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": 1179.88330078125,\r
-        "y": 5389.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1205.566665649414,\r
+        "y": 5395.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c0a00c52.f1e878",\r
-                "62d1e19f.b39a2",\r
-                "b9cbc6ac.26846"\r
+                "bd5e9405.7c27a8",\r
+                "6b3e7adb.d2bb84",\r
+                "a85067c1.2cd6d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eb0c27f.1616058",\r
+        "id": "799fadac.e2e6ec",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2130.8828125,\r
-        "y": 5327.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2156.566177368164,\r
+        "y": 5333.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "63e7e6f3.2a24f"\r
+                "7cbbce76.57d9f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63e7e6f3.2a24f",\r
+        "id": "7cbbce76.57d9f",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2345.8822021484375,\r
-        "y": 5330.8023681640625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2371.5655670166016,\r
+        "y": 5336.083267211914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d05f3809.7521c8",\r
-                "7ca77be7.05ec8c",\r
-                "b9815115.2c557"\r
+                "89310244.45d948",\r
+                "bd546556.218588",\r
+                "eb3b9787.8ee65"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90aff610.9959f8",\r
+        "id": "2fffa63d.405042",\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": 1303.6500244140625,\r
-        "y": 5539.2022705078125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1329.3333892822266,\r
+        "y": 5544.483169555664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b38f67ee.531ff",\r
-                "7cc55d59.0067b4"\r
+                "fb4bb7df.e56c5",\r
+                "af1e6659.9dd9c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b38f67ee.531ff",\r
+        "id": "fb4bb7df.e56c5",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1650.1500244140625,\r
-        "y": 5532.2022705078125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1675.8333892822266,\r
+        "y": 5537.483169555664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "bec12c24.0b2378"\r
+                "84518bf4.248028"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7cc55d59.0067b4",\r
+        "id": "af1e6659.9dd9c8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1654.1500244140625,\r
-        "y": 5572.2022705078125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1679.8333892822266,\r
+        "y": 5577.483169555664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9701e6f5.8bd518"\r
+                "b347040e.1f286"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bec12c24.0b2378",\r
+        "id": "84518bf4.248028",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 1808.1500244140625,\r
-        "y": 5532.2022705078125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1833.8333892822266,\r
+        "y": 5537.483169555664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9701e6f5.8bd518",\r
+        "id": "b347040e.1f286",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1811.6500244140625,\r
-        "y": 5572.2022705078125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1837.3333892822266,\r
+        "y": 5577.483169555664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "29311664.f24592"\r
+                "3d1d7271.d95cbe"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c786893c.7012b",\r
+        "id": "36ecf6b9.5afb0a",\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": 5869.002532958984,\r
-        "z": "1806503a.76a7a",\r
+        "x": 938.8667144775391,\r
+        "y": 5874.283432006836,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a3861250.d254d8",\r
-                "3c90d5bf.82245a"\r
+                "4a5bd207.ca776c",\r
+                "b171c0.d456c64"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a3861250.d254d8",\r
+        "id": "4a5bd207.ca776c",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1107.183349609375,\r
-        "y": 5696.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1132.866714477539,\r
+        "y": 5701.283462524414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6ee92ba3.68178c"\r
+                "b00c5aa2.01bbe8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3c90d5bf.82245a",\r
+        "id": "b171c0.d456c64",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1093.3500366210938,\r
-        "y": 6018.602630615234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1119.0334014892578,\r
+        "y": 6023.883529663086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "31cd7353.b764a4"\r
+                "782b8611.563688"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ee92ba3.68178c",\r
+        "id": "b00c5aa2.01bbe8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1255.35009765625,\r
-        "y": 5695.6026611328125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1281.033462524414,\r
+        "y": 5700.883560180664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "94f88b26.f34ce",\r
-                "497fa775.3b5f3",\r
-                "e88fc760.9f3988"\r
+                "8daf379c.cd379",\r
+                "ae051555.1a065",\r
+                "5d9c1c4d.83462c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "94f88b26.f34ce",\r
+        "id": "8daf379c.cd379",\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": 1677.199951171875,\r
-        "y": 5667.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1702.883316040039,\r
+        "y": 5672.283462524414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "497fa775.3b5f3",\r
+        "id": "ae051555.1a065",\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": 1492.199951171875,\r
-        "y": 5734.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1517.883316040039,\r
+        "y": 5739.283462524414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ef60935.82bca7",\r
-                "9065d9f2.54ee4"\r
+                "f1328e61.aaecf8",\r
+                "75cc2f9e.02c51"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ef60935.82bca7",\r
+        "id": "f1328e61.aaecf8",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1757.199951171875,\r
-        "y": 5719.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1782.883316040039,\r
+        "y": 5724.283462524414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2819744b.f6ef4c"\r
+                "320d795a.de0396"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9065d9f2.54ee4",\r
+        "id": "75cc2f9e.02c51",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1756.199951171875,\r
-        "y": 5767.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1781.883316040039,\r
+        "y": 5772.283462524414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "8f406878.70a"\r
+                "9b6d9f14.bbdc1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2819744b.f6ef4c",\r
+        "id": "320d795a.de0396",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1913.199951171875,\r
-        "y": 5715.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1938.883316040039,\r
+        "y": 5720.283462524414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "450da1ad.43b1d"\r
+                "d445fc4a.df5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8f406878.70a",\r
+        "id": "9b6d9f14.bbdc1",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
          "comments": "",\r
-        "x": 1904.199951171875,\r
-        "y": 5762.0025634765625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1929.883316040039,\r
+        "y": 5767.283462524414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "450da1ad.43b1d",\r
+        "id": "d445fc4a.df5c",\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": 2221.8826904296875,\r
-        "y": 5708.9029541015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2247.5660552978516,\r
+        "y": 5714.183853149414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "af8bca67.a28908",\r
+        "id": "d355d862.978bc",\r
          "type": "comment",\r
          "name": "Update connectivity status to modified",\r
          "info": "",\r
          "comments": "",\r
-        "x": 2196.0994873046875,\r
-        "y": 5666.7027587890625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2221.7828521728516,\r
+        "y": 5671.983657836914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "31cd7353.b764a4",\r
+        "id": "782b8611.563688",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1230.916748046875,\r
-        "y": 6017.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1256.600112915039,\r
+        "y": 6023.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a74b089b.225b08",\r
-                "ce915ff5.c8d31",\r
-                "73f93f1a.1715d8"\r
+                "dfb91948.e397a8",\r
+                "a8afb078.60b068",\r
+                "9067b91d.deea4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a74b089b.225b08",\r
+        "id": "dfb91948.e397a8",\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": 1536.2328491210938,\r
-        "y": 5951.1025390625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1561.9162139892578,\r
+        "y": 5956.383438110352,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1bf92ac3.705cd5"\r
+                "9cf25842.080a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1bf92ac3.705cd5",\r
+        "id": "9cf25842.080a8",\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": 6007.102569580078,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1870.250015258789,\r
+        "y": 6012.38346862793,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "adff6291.99a8f8"\r
+                "6539b459.18686c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "adff6291.99a8f8",\r
+        "id": "6539b459.18686c",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2024.2332763671875,\r
-        "y": 6007.1026611328125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2049.9166412353516,\r
+        "y": 6012.383560180664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b1717f1d.d23a28"\r
+                "eb5ca2dd.0acd08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b1717f1d.d23a28",\r
+        "id": "eb5ca2dd.0acd08",\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": 6007.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2249.916519165039,\r
+        "y": 6012.383529663086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1b34e983.202196",\r
-                "d97ea61c.b38298",\r
-                "b46e47b0.7a7bf"\r
+                "d2d794d6.23b038",\r
+                "fd78cb11.7b7858",\r
+                "dc3bf10c.53584"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1b34e983.202196",\r
+        "id": "d2d794d6.23b038",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2431.23291015625,\r
-        "y": 6057.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2456.916275024414,\r
+        "y": 6062.383529663086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "10e803bb.23c354"\r
+                "2ee18ab4.452c46"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f69a3337.dd69",\r
+        "id": "6518db29.e12ccc",\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": 6241.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2434.149917602539,\r
+        "y": 6246.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "8e127971.6de7c",\r
-                "9a64470f.e555c",\r
-                "c5ecce15.749748"\r
+                "1586acc8.b40733",\r
+                "3f4ac64b.7a4a4a",\r
+                "c51a0fc1.cf0b78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1bd5cb93.6127c4",\r
+        "id": "2ead9053.75b73",\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": 1577.4664916992188,\r
-        "y": 6284.30224609375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1603.1498565673828,\r
+        "y": 6289.583145141602,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5280d91a.703f48"\r
+                "606f2389.64cdcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5280d91a.703f48",\r
+        "id": "606f2389.64cdcc",\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": 1774.4664916992188,\r
-        "y": 6298.30224609375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1800.1498565673828,\r
+        "y": 6303.583145141602,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "4a3e493f.526ac",\r
-                "404c9cef.17796c"\r
+                "c7f0bc3b.019c9",\r
+                "c9900403.e4a84"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a3e493f.526ac",\r
+        "id": "c7f0bc3b.019c9",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1978.466552734375,\r
-        "y": 6201.30224609375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2004.149917602539,\r
+        "y": 6206.583145141602,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e7cf2c0a.f8afd8"\r
+                "b4e58d4e.4eaf1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7cf2c0a.f8afd8",\r
+        "id": "b4e58d4e.4eaf1",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2159.466552734375,\r
-        "y": 6217.30224609375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2185.149917602539,\r
+        "y": 6222.583145141602,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f69a3337.dd69"\r
+                "6518db29.e12ccc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "404c9cef.17796c",\r
+        "id": "c9900403.e4a84",\r
          "type": "outcome",\r
          "name": "uni",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1988.466552734375,\r
-        "y": 6459.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2014.149917602539,\r
+        "y": 6464.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "55211637.c2f7e"\r
+                "5c8dbf44.909798"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "55211637.c2f7e",\r
+        "id": "5c8dbf44.909798",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2151.466552734375,\r
-        "y": 6459.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2177.149917602539,\r
+        "y": 6464.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ad51c793.473678"\r
+                "972de022.0ff4c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ad51c793.473678",\r
+        "id": "972de022.0ff4c8",\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": 6459.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2420.149917602539,\r
+        "y": 6464.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "76246a63.c65c94",\r
+        "id": "d7d50183.fdbf5",\r
          "type": "save",\r
          "name": "delete connectivity resource in AAI",\r
          "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1362.466552734375,\r
-        "y": 7225.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1388.149917602539,\r
+        "y": 7230.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "10e803bb.23c354",\r
+        "id": "2ee18ab4.452c46",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1403.4664916992188,\r
-        "y": 6282.30224609375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1429.1498565673828,\r
+        "y": 6287.583145141602,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1bd5cb93.6127c4",\r
-                "76246a63.c65c94",\r
-                "99412df0.04b4f8"\r
+                "2ead9053.75b73",\r
+                "d7d50183.fdbf5",\r
+                "e2860ec7.2879b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8e127971.6de7c",\r
+        "id": "1586acc8.b40733",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2619.466552734375,\r
-        "y": 6243.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2645.149917602539,\r
+        "y": 6248.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e6c2ee89.d3aff"\r
+                "31acc7de.eb35a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a64470f.e555c",\r
+        "id": "3f4ac64b.7a4a4a",\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": 6288.876373291016,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2645.640884399414,\r
+        "y": 6294.157272338867,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "66f32499.9b808c"\r
+                "a537397f.244a6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c5ecce15.749748",\r
+        "id": "c51a0fc1.cf0b78",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2617.466552734375,\r
-        "y": 6332.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2643.149917602539,\r
+        "y": 6337.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "fc5f97c.17990e8"\r
+                "c765f98e.c8b24"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b46e47b0.7a7bf",\r
+        "id": "dc3bf10c.53584",\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": 5957.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2480.966323852539,\r
+        "y": 5963.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d97ea61c.b38298",\r
+        "id": "fd78cb11.7b7858",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2452.7919921875,\r
-        "y": 6001.328399658203,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2478.475357055664,\r
+        "y": 6006.609298706055,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ce915ff5.c8d31",\r
+        "id": "a8afb078.60b068",\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": 1533.4000854492188,\r
-        "y": 6012.7021484375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1559.0834503173828,\r
+        "y": 6017.983047485352,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e6c2ee89.d3aff",\r
+        "id": "31acc7de.eb35a",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2785.466552734375,\r
-        "y": 6233.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2811.149917602539,\r
+        "y": 6238.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "95de1448.b3be38",\r
-                "c13cc07f.32d48",\r
-                "89fea46.2857558",\r
-                "8c5b9c51.4573e8",\r
-                "a58a3e55.44161"\r
+                "d6296a84.0c07b",\r
+                "f2b7ba42.95aca8",\r
+                "d7abab02.efd25",\r
+                "933064b1.3f6b68",\r
+                "31b8d600.38568a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fc5f97c.17990e8",\r
+        "id": "c765f98e.c8b24",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 2784.466552734375,\r
-        "y": 6331.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2810.149917602539,\r
+        "y": 6336.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "66f32499.9b808c",\r
+        "id": "a537397f.244a6",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2782.5289306640625,\r
-        "y": 6289.162109375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2808.2122955322266,\r
+        "y": 6294.443008422852,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "95de1448.b3be38",\r
+        "id": "d6296a84.0c07b",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 3007.466552734375,\r
-        "y": 5951.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3033.149917602539,\r
+        "y": 5956.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c13cc07f.32d48",\r
+        "id": "f2b7ba42.95aca8",\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": 6068.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3059.149917602539,\r
+        "y": 6073.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2f82e357.0b1ab4",\r
-                "be465fa4.6aba18",\r
-                "877ec4f6.c7b7a"\r
+                "c16bbe6e.2f18e8",\r
+                "8e5054c2.6d8be8",\r
+                "8a22e0f4.ac84d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89fea46.2857558",\r
+        "id": "d7abab02.efd25",\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": 6335.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3162.149917602539,\r
+        "y": 6340.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2931cfbe.d3d97",\r
-                "162b2290.6fc605"\r
+                "fc236214.f51f38",\r
+                "6b8cfbc.a2c4d84"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c5b9c51.4573e8",\r
+        "id": "933064b1.3f6b68",\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": 6470.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3100.149917602539,\r
+        "y": 6475.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "df16efa0.bafe28",\r
-                "bc60ff9d.7739e8"\r
+                "2126f3a4.668d54",\r
+                "a948f36a.4c2d08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a58a3e55.44161",\r
+        "id": "31b8d600.38568a",\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": 6586.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3081.149917602539,\r
+        "y": 6591.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2f82e357.0b1ab4",\r
+        "id": "c16bbe6e.2f18e8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3228.9666748046875,\r
-        "y": 6020.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3254.6500396728516,\r
+        "y": 6025.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "640fd481.180004"\r
+                "78bd184e.3e97c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "be465fa4.6aba18",\r
+        "id": "8e5054c2.6d8be8",\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": 6075.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3246.6500396728516,\r
+        "y": 6080.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ecd8a620.92b268"\r
+                "12475557.66bd73"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "640fd481.180004",\r
+        "id": "78bd184e.3e97c8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3363.348876953125,\r
-        "y": 6014.958099365234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3389.032241821289,\r
+        "y": 6020.238998413086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d1896cdb.8141"\r
+                "6ef9af4.3be5bd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "877ec4f6.c7b7a",\r
+        "id": "8a22e0f4.ac84d",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3225.9666748046875,\r
-        "y": 6132.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3251.6500396728516,\r
+        "y": 6137.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f05d5e82.949cd"\r
+                "28978481.66e84c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f05d5e82.949cd",\r
+        "id": "28978481.66e84c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3377.9666748046875,\r
-        "y": 6133.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3403.6500396728516,\r
+        "y": 6138.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ecd8a620.92b268",\r
+        "id": "12475557.66bd73",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3388.9666748046875,\r
-        "y": 6076.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3414.6500396728516,\r
+        "y": 6081.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bc60ff9d.7739e8",\r
+        "id": "a948f36a.4c2d08",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3327.466552734375,\r
-        "y": 6448.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3353.149917602539,\r
+        "y": 6453.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7d696f2d.0f345"\r
+                "a8dc909e.5f43f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "df16efa0.bafe28",\r
+        "id": "2126f3a4.668d54",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3327.466552734375,\r
-        "y": 6504.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3353.149917602539,\r
+        "y": 6509.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d1896cdb.8141",\r
+        "id": "6ef9af4.3be5bd",\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": 6016.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3576.149429321289,\r
+        "y": 6021.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a3649162.b60c9"\r
+                "3b761727.cf2a9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a3649162.b60c9",\r
+        "id": "3b761727.cf2a9",\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": 6007.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3817.149429321289,\r
+        "y": 6012.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "fd0af8f3.25299"\r
+                "68d5173c.b0347"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7d696f2d.0f345",\r
+        "id": "a8dc909e.5f43f8",\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": 6438.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3703.149429321289,\r
+        "y": 6443.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "82ac773c.5adbc",\r
-                "f41b429.87576c"\r
+                "dcfeac9e.5fc9a8",\r
+                "8f5d17cf.8dabd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2931cfbe.d3d97",\r
+        "id": "fc236214.f51f38",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3443.966064453125,\r
-        "y": 6360.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3469.649429321289,\r
+        "y": 6365.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "41ca7b34.32b314"\r
+                "f765e05b.501478"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "162b2290.6fc605",\r
+        "id": "6b8cfbc.a2c4d84",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3444.966064453125,\r
-        "y": 6305.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3470.649429321289,\r
+        "y": 6310.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6e74c50f.6753f4"\r
+                "4d6a8560.f17a1c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41ca7b34.32b314",\r
+        "id": "f765e05b.501478",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 3615.966064453125,\r
-        "y": 6358.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3641.649429321289,\r
+        "y": 6363.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6e74c50f.6753f4",\r
+        "id": "4d6a8560.f17a1c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3612.466064453125,\r
-        "y": 6307.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3638.149429321289,\r
+        "y": 6312.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d394aeb8.1e7718",\r
+        "id": "432d0671.cb443",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4148.4658203125,\r
-        "y": 5956.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4174.149185180664,\r
+        "y": 5961.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5381b334.945d34",\r
-                "5cfd9c1e.9cd7fc",\r
-                "293f88.0669c878"\r
+                "78d865b4.b939ac",\r
+                "5830c911.f22ee",\r
+                "aa227269.131cb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd0af8f3.25299",\r
+        "id": "68d5173c.b0347",\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": 6004.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4023.149429321289,\r
+        "y": 6009.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d394aeb8.1e7718"\r
+                "432d0671.cb443"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "82ac773c.5adbc",\r
+        "id": "dcfeac9e.5fc9a8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4009.966064453125,\r
-        "y": 6412.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4035.649429321289,\r
+        "y": 6417.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ecb5b8cc.eeda88"\r
+                "7c5aa740.2ac998"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f41b429.87576c",\r
+        "id": "8f5d17cf.8dabd",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4013.966064453125,\r
-        "y": 6452.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4039.649429321289,\r
+        "y": 6457.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "308650c2.e2482"\r
+                "61ae232.1605c5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "308650c2.e2482",\r
+        "id": "61ae232.1605c5c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4201.466064453125,\r
-        "y": 6456.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4227.149429321289,\r
+        "y": 6461.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ecb5b8cc.eeda88",\r
+        "id": "7c5aa740.2ac998",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 4197.966064453125,\r
-        "y": 6416.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4223.649429321289,\r
+        "y": 6421.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5cfd9c1e.9cd7fc",\r
+        "id": "5830c911.f22ee",\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": 5969.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4380.149185180664,\r
+        "y": 5974.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c9280772.2e056",\r
-                "da69dce1.3d1cc8",\r
-                "c843a21f.72703"\r
+                "9672ea53.f6fc4",\r
+                "10a5745e.fad27c",\r
+                "4c3d97fc.40ae6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5381b334.945d34",\r
+        "id": "78d865b4.b939ac",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domain id",\r
          "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 4384.4658203125,\r
-        "y": 5917.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4410.149185180664,\r
+        "y": 5922.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c9280772.2e056",\r
+        "id": "9672ea53.f6fc4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4564.4658203125,\r
-        "y": 5960.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4590.149185180664,\r
+        "y": 5965.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1c355cab.e00983"\r
+                "a62535f9.bce6d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "da69dce1.3d1cc8",\r
+        "id": "10a5745e.fad27c",\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": 6015.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4582.149185180664,\r
+        "y": 6020.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e5e939f4.c8003"\r
+                "f6286309.b286"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c843a21f.72703",\r
+        "id": "4c3d97fc.40ae6",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4561.4658203125,\r
-        "y": 6072.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4587.149185180664,\r
+        "y": 6077.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "29282b3d.cdea3c"\r
+                "5b2489d7.40c81"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "293f88.0669c878",\r
+        "id": "aa227269.131cb",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 4304.4658203125,\r
-        "y": 6033.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4330.149185180664,\r
+        "y": 6038.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "29282b3d.cdea3c",\r
+        "id": "5b2489d7.40c81",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4713.4658203125,\r
-        "y": 6073.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4739.149185180664,\r
+        "y": 6078.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e5e939f4.c8003",\r
+        "id": "f6286309.b286",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4724.4658203125,\r
-        "y": 6018.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4750.149185180664,\r
+        "y": 6023.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1c355cab.e00983",\r
+        "id": "a62535f9.bce6d8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4708.84814453125,\r
-        "y": 5957.9580078125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4734.531509399414,\r
+        "y": 5963.238906860352,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "31ead1aa.38700e"\r
+                "34794224.ac9ad6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "31ead1aa.38700e",\r
+        "id": "34794224.ac9ad6",\r
          "type": "set",\r
          "name": "set controller domain data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 4923.4658203125,\r
-        "y": 5954.302337646484,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4949.149185180664,\r
+        "y": 5959.583236694336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6da29c89.3512ec",\r
+        "id": "8d1e7ba3.e7c148",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 1659.2332763671875,\r
-        "y": 6751.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1684.9166412353516,\r
+        "y": 6757.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "23a2345e.db2bfc",\r
+        "id": "6711b1e6.015f5",\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": "1806503a.76a7a",\r
+        "x": 1710.9166412353516,\r
+        "y": 6874.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "287bda60.70f306",\r
-                "564bb39c.806684",\r
-                "f782c941.aa2bd8"\r
+                "89c94611.e7551",\r
+                "372b07e6.2f493",\r
+                "93b4846e.f3d23"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "287bda60.70f306",\r
+        "id": "89c94611.e7551",\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": "1806503a.76a7a",\r
+        "x": 1906.416763305664,\r
+        "y": 6826.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5eea5356.2a418c"\r
+                "bdc72764.d7a65"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "564bb39c.806684",\r
+        "id": "372b07e6.2f493",\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": "1806503a.76a7a",\r
+        "x": 1898.416763305664,\r
+        "y": 6881.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "918bf051.2e35e8"\r
+                "4210f39b.7722f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5eea5356.2a418c",\r
+        "id": "bdc72764.d7a65",\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": "1806503a.76a7a",\r
+        "x": 2040.7989654541016,\r
+        "y": 6820.839096069336,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a66aff1d.02ebd"\r
+                "8221a60d.0a6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f782c941.aa2bd8",\r
+        "id": "93b4846e.f3d23",\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": "1806503a.76a7a",\r
+        "x": 1903.416763305664,\r
+        "y": 6938.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ea358a06.2ba7c"\r
+                "534b689.ea55a98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea358a06.2ba7c",\r
+        "id": "534b689.ea55a98",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2029.7333984375,\r
-        "y": 6933.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2055.416763305664,\r
+        "y": 6939.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "918bf051.2e35e8",\r
+        "id": "4210f39b.7722f4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2040.7333984375,\r
-        "y": 6876.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2066.416763305664,\r
+        "y": 6882.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a66aff1d.02ebd",\r
+        "id": "8221a60d.0a6",\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": "1806503a.76a7a",\r
+        "x": 2227.9161529541016,\r
+        "y": 6822.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "dd540d27.8a572"\r
+                "70fb3446.1294d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dd540d27.8a572",\r
+        "id": "70fb3446.1294d4",\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": "1806503a.76a7a",\r
+        "x": 2468.9161529541016,\r
+        "y": 6813.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9d1b03ac.68f1d"\r
+                "7728eab2.206384"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e61d9898.b700f8",\r
+        "id": "5e0f68b.e6e5b18",\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": "1806503a.76a7a",\r
+        "x": 2825.9159088134766,\r
+        "y": 6762.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1b4a271c.3007c1",\r
-                "a4a420aa.eed92",\r
-                "5a15942c.1c868c"\r
+                "1f9f6b0b.3a7bad",\r
+                "3a372a08.82b95e",\r
+                "20000492.69e4a4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d1b03ac.68f1d",\r
+        "id": "7728eab2.206384",\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": "1806503a.76a7a",\r
+        "x": 2674.9161529541016,\r
+        "y": 6810.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e61d9898.b700f8"\r
+                "5e0f68b.e6e5b18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a4a420aa.eed92",\r
+        "id": "3a372a08.82b95e",\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": "1806503a.76a7a",\r
+        "x": 3031.9159088134766,\r
+        "y": 6775.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e70e66a4.f92e28",\r
-                "3b5db284.72d976",\r
-                "a90d6b8f.8e3a5"\r
+                "78de1b03.bad77c",\r
+                "d65c6861.1c4098",\r
+                "dc64de9d.8956c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5a15942c.1c868c",\r
+        "id": "20000492.69e4a4",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 2956.2325439453125,\r
-        "y": 6833.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2981.9159088134766,\r
+        "y": 6839.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1b4a271c.3007c1",\r
+        "id": "1f9f6b0b.3a7bad",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domain id",\r
          "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 3036.2325439453125,\r
-        "y": 6717.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3061.9159088134766,\r
+        "y": 6723.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e70e66a4.f92e28",\r
+        "id": "78de1b03.bad77c",\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": "1806503a.76a7a",\r
+        "x": 3241.9159088134766,\r
+        "y": 6766.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2205be3e.8c882a"\r
+                "13eb6200.778f26"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3b5db284.72d976",\r
+        "id": "d65c6861.1c4098",\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": "1806503a.76a7a",\r
+        "x": 3233.9159088134766,\r
+        "y": 6821.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d93cd156.9d02f8"\r
+                "bff87948.e35e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a90d6b8f.8e3a5",\r
+        "id": "dc64de9d.8956c8",\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": "1806503a.76a7a",\r
+        "x": 3238.9159088134766,\r
+        "y": 6878.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b772a1ff.e97338"\r
+                "573969ab.842a48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b772a1ff.e97338",\r
+        "id": "573969ab.842a48",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3365.2325439453125,\r
-        "y": 6873.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3390.9159088134766,\r
+        "y": 6879.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d93cd156.9d02f8",\r
+        "id": "bff87948.e35e",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3376.2325439453125,\r
-        "y": 6818.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3401.9159088134766,\r
+        "y": 6824.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2205be3e.8c882a",\r
+        "id": "13eb6200.778f26",\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": "1806503a.76a7a",\r
+        "x": 3386.2982330322266,\r
+        "y": 6763.839004516602,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9b8cbfdb.496af"\r
+                "f7bc1d31.5e03a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9b8cbfdb.496af",\r
+        "id": "f7bc1d31.5e03a",\r
          "type": "set",\r
          "name": "set controller domain data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 3575.2325439453125,\r
-        "y": 6754.902435302734,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3600.9159088134766,\r
+        "y": 6760.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "99412df0.04b4f8",\r
+        "id": "e2860ec7.2879b",\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": "1806503a.76a7a",\r
+        "x": 1476.9166412353516,\r
+        "y": 6885.183334350586,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6da29c89.3512ec",\r
-                "23a2345e.db2bfc",\r
-                "4ea496a3.5a8a68"\r
+                "8d1e7ba3.e7c148",\r
+                "6711b1e6.015f5",\r
+                "91e5ef44.c1379"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4ea496a3.5a8a68",\r
+        "id": "91e5ef44.c1379",\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": "1806503a.76a7a",\r
+        "x": 1759.116714477539,\r
+        "y": 7026.383529663086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "fd259c6c.134fa8",\r
-                "9bf814bd.aca8b8"\r
+                "9d430c54.8affb",\r
+                "4e9e0184.b64f38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9bf814bd.aca8b8",\r
+        "id": "4e9e0184.b64f38",\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": "1806503a.76a7a",\r
+        "x": 2012.116714477539,\r
+        "y": 7004.383529663086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "10bd46c.7fcbe39"\r
+                "8c955553.2a5b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd259c6c.134fa8",\r
+        "id": "9d430c54.8affb",\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": "1806503a.76a7a",\r
+        "x": 2012.116714477539,\r
+        "y": 7060.383529663086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "10bd46c.7fcbe39",\r
+        "id": "8c955553.2a5b4",\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": "1806503a.76a7a",\r
+        "x": 2362.116226196289,\r
+        "y": 6994.383529663086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "cc57d141.f3e88",\r
-                "6b29798.5078f08"\r
+                "7b6e5c2.eee3ea4",\r
+                "23885c26.87d57c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cc57d141.f3e88",\r
+        "id": "7b6e5c2.eee3ea4",\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": "1806503a.76a7a",\r
+        "x": 2694.616226196289,\r
+        "y": 6968.383529663086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e4bf775a.d74c18"\r
+                "6e7264f6.b603bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b29798.5078f08",\r
+        "id": "23885c26.87d57c",\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": "1806503a.76a7a",\r
+        "x": 2698.616226196289,\r
+        "y": 7008.383529663086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9dbbe180.4c39c"\r
+                "7c20df87.4ce228"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9dbbe180.4c39c",\r
+        "id": "7c20df87.4ce228",\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": "1806503a.76a7a",\r
+        "x": 2886.116226196289,\r
+        "y": 7012.383529663086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e4bf775a.d74c18",\r
+        "id": "6e7264f6.b603bc",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 2856.932861328125,\r
-        "y": 6967.102630615234,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2882.616226196289,\r
+        "y": 6972.383529663086,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "78f62ea.0af84d",\r
+        "id": "b3758874.8f232",\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": "1806503a.76a7a",\r
+        "x": 1114.933364868164,\r
+        "y": 4711.966567993164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "51c55595.1dd8cc",\r
-                "c498093d.59e4c8"\r
+                "d41942d3.562958",\r
+                "ebe016f8.97161"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51c55595.1dd8cc",\r
+        "id": "d41942d3.562958",\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": "1806503a.76a7a",\r
+        "x": 1543.433120727539,\r
+        "y": 4699.966567993164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "bc110a38.b317b"\r
+                "5ea52c46.125904"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c498093d.59e4c8",\r
+        "id": "ebe016f8.97161",\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": "1806503a.76a7a",\r
+        "x": 1547.433120727539,\r
+        "y": 4739.966567993164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5805f739.dc8f9"\r
+                "f81bc98a.2445d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bc110a38.b317b",\r
+        "id": "5ea52c46.125904",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 1675.749755859375,\r
-        "y": 4694.6856689453125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1701.433120727539,\r
+        "y": 4699.966567993164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5805f739.dc8f9",\r
+        "id": "f81bc98a.2445d",\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": "1806503a.76a7a",\r
+        "x": 1704.933120727539,\r
+        "y": 4739.966567993164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6f96293b.020fc",\r
+        "id": "82036bd3.d2b678",\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": "1806503a.76a7a",\r
+        "x": 5138.683364868164,\r
+        "y": 5032.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "aad45f58.fbf018",\r
-                "2530767d.abaa5a",\r
-                "b9bc9e8d.66a4b8"\r
+                "54859efe.15c158",\r
+                "fd20f3ef.b5a108",\r
+                "bf190cd2.45b99"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9bc9e8d.66a4b8",\r
+        "id": "bf190cd2.45b99",\r
          "type": "set",\r
          "name": "set vpnNameToSearch",\r
          "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",\r
          "comments": "",\r
-        "x": 5340,\r
-        "y": 4972.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5365.683364868164,\r
+        "y": 4977.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aad45f58.fbf018",\r
+        "id": "54859efe.15c158",\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": "1806503a.76a7a",\r
+        "x": 5519.683364868164,\r
+        "y": 5029.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2530767d.abaa5a",\r
+        "id": "fd20f3ef.b5a108",\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": "1806503a.76a7a",\r
+        "x": 5364.683364868164,\r
+        "y": 5084.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5fd0edea.97a1fc"\r
+                "290514d0.09f59c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5fd0edea.97a1fc",\r
+        "id": "290514d0.09f59c",\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": "1806503a.76a7a",\r
+        "x": 5543.683364868164,\r
+        "y": 5083.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "48fa24ff.a12f6c"\r
+                "8f49a5ce.76f168"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "79dba259.2612cc",\r
+        "id": "22a945f9.085212",\r
          "type": "set",\r
          "name": "unset secondary related variables",\r
          "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",\r
          "comments": "",\r
-        "x": 3380.249969482422,\r
-        "y": 433.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3405.933334350586,\r
+        "y": 438.56666564941406,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "11c024cf.1cb7db",\r
+        "id": "94938481.855978",\r
          "type": "set",\r
          "name": "set network-route-three",\r
          "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 3344.249969482422,\r
-        "y": 683.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3369.933334350586,\r
+        "y": 688.5666656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8bfce836.dcd148",\r
+        "id": "7edb995a.421908",\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": "1806503a.76a7a",\r
+        "x": 3373.349838256836,\r
+        "y": 730.8166351318359,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2011ad7a.50e2d2",\r
-                "3e343af8.ce24be"\r
+                "2aad068d.f37552",\r
+                "160f6f1.9c78f91"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2011ad7a.50e2d2",\r
+        "id": "2aad068d.f37552",\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": "1806503a.76a7a",\r
+        "x": 3612.3497161865234,\r
+        "y": 566.8166656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1f12a88c.b01c37"\r
+                "1be1e31f.1947f5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3e343af8.ce24be",\r
+        "id": "160f6f1.9c78f91",\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": "1806503a.76a7a",\r
+        "x": 3621.3497161865234,\r
+        "y": 613.8166656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d6d1ae0e.a40e7"\r
+                "939cd6fd.61434"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d6d1ae0e.a40e7",\r
+        "id": "939cd6fd.61434",\r
          "type": "set",\r
          "name": "set hasSecondary true",\r
          "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",\r
          "comments": "",\r
-        "x": 3809.6663513183594,\r
-        "y": 602.5357666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3835.3497161865234,\r
+        "y": 607.8166656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1f12a88c.b01c37",\r
+        "id": "1be1e31f.1947f5",\r
          "type": "set",\r
          "name": "set hasSecondary false",\r
          "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",\r
          "comments": "",\r
-        "x": 3813.6663513183594,\r
-        "y": 558.5357666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3839.3497161865234,\r
+        "y": 563.8166656494141,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "41d8ce05.5caae",\r
+        "id": "9b9082d.d33238",\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": "1806503a.76a7a",\r
+        "x": 4201.383773803711,\r
+        "y": 517.2666168212891,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "57b53193.85d2e8"\r
+                "5bb9e60d.7c50c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "57b53193.85d2e8",\r
+        "id": "5bb9e60d.7c50c8",\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": "1806503a.76a7a",\r
+        "x": 4375.383773803711,\r
+        "y": 512.2666168212891,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2292f0ec.6f9e9",\r
-                "f8b394d0.6213f"\r
+                "7a7e54e9.bf28b4",\r
+                "1946febe.bd9461"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2292f0ec.6f9e9",\r
+        "id": "7a7e54e9.bf28b4",\r
          "type": "set",\r
          "name": "set network-route-SECONDARY-ROOT",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4593.700653076172,\r
-        "y": 498.9857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4619.384017944336,\r
+        "y": 504.26661682128906,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f8b394d0.6213f",\r
+        "id": "1946febe.bd9461",\r
          "type": "set",\r
          "name": "set network-route-C",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4539.700653076172,\r
-        "y": 538.9857177734375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4565.384017944336,\r
+        "y": 544.2666168212891,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4bc67983.47c6f",\r
+        "id": "a01fe37.2547ea",\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": "1806503a.76a7a",\r
+        "x": 4170.383773803711,\r
+        "y": 746.6666412353516,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ca96ae7a.f7e118"\r
+                "918e4345.efda7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ca96ae7a.f7e118",\r
+        "id": "918e4345.efda7",\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": "1806503a.76a7a",\r
+        "x": 4328.383529663086,\r
+        "y": 789.6664581298828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "bdef3637.91db48",\r
-                "b84fc7dd.a088f8"\r
+                "6e675e43.dde0d8",\r
+                "80002079.3161b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bdef3637.91db48",\r
+        "id": "6e675e43.dde0d8",\r
          "type": "set",\r
          "name": "set network-route-SECONDARY-ROOT",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4524.700164794922,\r
-        "y": 770.3856811523438,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4550.383529663086,\r
+        "y": 775.6665802001953,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b84fc7dd.a088f8",\r
+        "id": "80002079.3161b8",\r
          "type": "set",\r
          "name": "set network-route-C",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4470.700164794922,\r
-        "y": 810.3856811523438,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4496.383529663086,\r
+        "y": 815.6665802001953,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ec6aad53.7d628",\r
+        "id": "f054f8f8.d1b3a",\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": "1806503a.76a7a",\r
+        "x": 3381.816635131836,\r
+        "y": 982.8999176025391,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "60b6baf9.326c5c",\r
-                "fffcc6ce.01cc38",\r
-                "232b371a.13f76"\r
+                "36902805.8d90e",\r
+                "becbd8eb.e312f8",\r
+                "8659a4ac.581568"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60b6baf9.326c5c",\r
+        "id": "36902805.8d90e",\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": "1806503a.76a7a",\r
+        "x": 3621.816635131836,\r
+        "y": 965.8999176025391,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "fffcc6ce.01cc38",\r
+        "id": "becbd8eb.e312f8",\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": "1806503a.76a7a",\r
+        "x": 3617.325698852539,\r
+        "y": 1008.3259735107422,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "232b371a.13f76",\r
+        "id": "8659a4ac.581568",\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": "1806503a.76a7a",\r
+        "x": 3621.325668334961,\r
+        "y": 1056.325942993164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b996a975.9f4ee8"\r
+                "3e8b9bd4.673dec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b996a975.9f4ee8",\r
+        "id": "3e8b9bd4.673dec",\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": "1806503a.76a7a",\r
+        "x": 3776.816635131836,\r
+        "y": 1025.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2df3eeae.ae260a"\r
+                "dcd7f0d5.69944"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2df3eeae.ae260a",\r
+        "id": "dcd7f0d5.69944",\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": "1806503a.76a7a",\r
+        "x": 3898.816635131836,\r
+        "y": 972.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "30af5545.05a802",\r
-                "294528ca.16e348",\r
-                "fdf4c0e0.5eff08"\r
+                "b21b1a8d.ec399",\r
+                "40a89314.47b21c",\r
+                "f3bd5a06.f854e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30af5545.05a802",\r
+        "id": "b21b1a8d.ec399",\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": "1806503a.76a7a",\r
+        "x": 4134.816635131836,\r
+        "y": 822.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "58899b33.3d8864"\r
+                "c5a6386c.ce6e1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "294528ca.16e348",\r
+        "id": "40a89314.47b21c",\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": "1806503a.76a7a",\r
+        "x": 4130.816635131836,\r
+        "y": 878.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2016713.cf9120e"\r
+                "12081a23.d55f7e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "58899b33.3d8864",\r
+        "id": "c5a6386c.ce6e1",\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": "1806503a.76a7a",\r
+        "x": 4260.816635131836,\r
+        "y": 830.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "23e1076f.823948",\r
-                "e01e107b.4a322"\r
+                "bedffac2.d82048",\r
+                "6105d759.fbeec8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2016713.cf9120e",\r
+        "id": "12081a23.d55f7e",\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": "1806503a.76a7a",\r
+        "x": 4263.816635131836,\r
+        "y": 883.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "42b53bab.59e5ec",\r
-                "9f9141a1.5b5a98"\r
+                "7ef90f2d.cab8",\r
+                "728a110f.c5d4a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fdf4c0e0.5eff08",\r
+        "id": "f3bd5a06.f854e",\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": "1806503a.76a7a",\r
+        "x": 4123.816635131836,\r
+        "y": 956.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7151cb9d.fcc3b4"\r
+                "a50b1577.32615"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7151cb9d.fcc3b4",\r
+        "id": "a50b1577.32615",\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": "1806503a.76a7a",\r
+        "x": 4279.816635131836,\r
+        "y": 977.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "16090c67.366d8c",\r
-                "877ec323.7c8b08"\r
+                "8c375d88.8bcbe",\r
+                "79733ca8.98d714"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23e1076f.823948",\r
+        "id": "bedffac2.d82048",\r
          "type": "set",\r
          "name": "set network-route-ROOT",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4482.133270263672,\r
-        "y": 855.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4507.816635131836,\r
+        "y": 860.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e01e107b.4a322",\r
+        "id": "6105d759.fbeec8",\r
          "type": "set",\r
          "name": "set network-route-B",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4474.133270263672,\r
-        "y": 897.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4499.816635131836,\r
+        "y": 902.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "42b53bab.59e5ec",\r
+        "id": "7ef90f2d.cab8",\r
          "type": "set",\r
          "name": "set network-route-LEAF",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4475.133270263672,\r
-        "y": 949.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4500.816635131836,\r
+        "y": 954.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9f9141a1.5b5a98",\r
+        "id": "728a110f.c5d4a8",\r
          "type": "set",\r
          "name": "set network-route-A",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4462.133270263672,\r
-        "y": 989.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4487.816635131836,\r
+        "y": 994.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "877ec323.7c8b08",\r
+        "id": "79733ca8.98d714",\r
          "type": "set",\r
          "name": "set network-route-C",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4436.133270263672,\r
-        "y": 1083.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4461.816635131836,\r
+        "y": 1088.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "16090c67.366d8c",\r
+        "id": "8c375d88.8bcbe",\r
          "type": "set",\r
          "name": "set network-route-SECONDARY-ROOT",\r
          "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
          "comments": "",\r
-        "x": 4498.133270263672,\r
-        "y": 1039.6189575195312,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4523.816635131836,\r
+        "y": 1044.8998565673828,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2a307068.85126",\r
+        "id": "663710d5.9b6118",\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": "1806503a.76a7a",\r
+        "x": 3725.816665649414,\r
+        "y": 2228.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5e91bdef.ec251c",\r
-                "edfa6b23.11ec28"\r
+                "4284e0ad.37004",\r
+                "54bef6f2.4fc7a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "268e9ec4.4facea",\r
+        "id": "16d496be.188cb9",\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": "1806503a.76a7a",\r
+        "x": 3553.150161743164,\r
+        "y": 2229.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2a307068.85126"\r
+                "663710d5.9b6118"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15820d3a.1e0693",\r
+        "id": "545ddc0c.5d5ecc",\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": "1806503a.76a7a",\r
+        "x": 3562.641128540039,\r
+        "y": 2272.1407012939453,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5a5c2368.a7e5dc",\r
+        "id": "5e1fc0e8.d800d8",\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": "1806503a.76a7a",\r
+        "x": 3551.150161743164,\r
+        "y": 2318.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5e91bdef.ec251c",\r
+        "id": "4284e0ad.37004",\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": "1806503a.76a7a",\r
+        "x": 4016.150161743164,\r
+        "y": 2244.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "fab0baab.63daf",\r
-                "4fbe9a1d.f89b1c"\r
+                "7adfe0fe.0b09c",\r
+                "70e2db35.da559c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4fbe9a1d.f89b1c",\r
+        "id": "70e2db35.da559c",\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": "1806503a.76a7a",\r
+        "x": 4239.150161743164,\r
+        "y": 2199.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e7a6f67c.223ba8"\r
+                "624b6d74.0c220c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fab0baab.63daf",\r
+        "id": "7adfe0fe.0b09c",\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": "1806503a.76a7a",\r
+        "x": 4241.150161743164,\r
+        "y": 2263.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e4fc9765.fde21"\r
+                "44c8e026.3089e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ad2e0fde.b44de8",\r
+        "id": "71a7eba7.ddb6fc",\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": "1806503a.76a7a",\r
+        "x": 3347.150161743164,\r
+        "y": 2250.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "268e9ec4.4facea",\r
-                "15820d3a.1e0693",\r
-                "5a5c2368.a7e5dc"\r
+                "16d496be.188cb9",\r
+                "545ddc0c.5d5ecc",\r
+                "5e1fc0e8.d800d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8876fe3a.88e278",\r
+        "id": "720f0fd3.e06eb",\r
          "type": "comment",\r
          "name": "Question?",\r
          "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
          "comments": "",\r
-        "x": 3260.466796875,\r
-        "y": 2203.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3286.150161743164,\r
+        "y": 2208.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c02bc34.16c814",\r
+        "id": "dab7847.8f75af8",\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": "1806503a.76a7a",\r
+        "x": 3367.150161743164,\r
+        "y": 2098.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "85d9fc70.3a0b8",\r
-                "63a7add0.8255ec"\r
+                "bb6830ab.78043",\r
+                "943e3a24.27d0d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63a7add0.8255ec",\r
+        "id": "943e3a24.27d0d",\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": "1806503a.76a7a",\r
+        "x": 3590.150161743164,\r
+        "y": 2084.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "39d5594f.5d224e"\r
+                "14789ba.27922e4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "85d9fc70.3a0b8",\r
+        "id": "bb6830ab.78043",\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": "1806503a.76a7a",\r
+        "x": 3592.150161743164,\r
+        "y": 2117.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "39d5594f.5d224e",\r
+        "id": "14789ba.27922e4",\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": "1806503a.76a7a",\r
+        "x": 3738.150161743164,\r
+        "y": 2077.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "cf9e5f0.1f2092",\r
-                "6b6736af.eb70a"\r
+                "f084bd9b.374fe",\r
+                "635334a7.ad5104"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf9e5f0.1f2092",\r
+        "id": "f084bd9b.374fe",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",\r
          "comments": "",\r
-        "x": 3904.4666748046875,\r
-        "y": 2009.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3930.1500396728516,\r
+        "y": 2014.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "edfa6b23.11ec28",\r
+        "id": "54bef6f2.4fc7a",\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": "1806503a.76a7a",\r
+        "x": 3997.150161743164,\r
+        "y": 2375.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c80278c9.710488"\r
+                "2fc07773.c6e698"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c80278c9.710488",\r
+        "id": "2fc07773.c6e698",\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": "1806503a.76a7a",\r
+        "x": 4203.150161743164,\r
+        "y": 2375.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7e2cf131.a58a08"\r
+                "eda47f6d.73a9a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b6736af.eb70a",\r
+        "id": "635334a7.ad5104",\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": "1806503a.76a7a",\r
+        "x": 3952.1500396728516,\r
+        "y": 2082.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9d1ec1c.6f0f9c",\r
-                "f4e7e55c.530698",\r
-                "d7c76719.0fc4b"\r
+                "fd3d2e45.ba5c18",\r
+                "6f65faaa.29e51c",\r
+                "979b3e61.62e1e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d1ec1c.6f0f9c",\r
+        "id": "fd3d2e45.ba5c18",\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": "1806503a.76a7a",\r
+        "x": 4147.650161743164,\r
+        "y": 2034.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "13bd6284.e3089d"\r
+                "76cbe983.f31c3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f4e7e55c.530698",\r
+        "id": "6f65faaa.29e51c",\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": "1806503a.76a7a",\r
+        "x": 4139.650161743164,\r
+        "y": 2089.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "56e4b2a7.59d05c"\r
+                "ad429934.3c84f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d7c76719.0fc4b",\r
+        "id": "979b3e61.62e1e8",\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": "1806503a.76a7a",\r
+        "x": 4144.650161743164,\r
+        "y": 2146.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "67615599.b73f0c"\r
+                "bbff5204.a70cf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "67615599.b73f0c",\r
+        "id": "bbff5204.a70cf8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4270.966796875,\r
-        "y": 2142.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4296.650161743164,\r
+        "y": 2147.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "13bd6284.e3089d",\r
+        "id": "76cbe983.f31c3",\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": "1806503a.76a7a",\r
+        "x": 4292.032485961914,\r
+        "y": 2032.2223358154297,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "3bd0a776.cdf68"\r
+                "181d9117.3dc1c7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d87e7a94.9bda08",\r
+        "id": "a71111e6.40602",\r
          "type": "set",\r
          "name": "set SECONDARY-ROOT stuff",\r
          "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",\r
          "comments": "",\r
-        "x": 3322.13330078125,\r
-        "y": 2338.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 3347.816665649414,\r
+        "y": 2343.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3b2ac73.1b40638",\r
+        "id": "f86bd22d.6a796",\r
          "type": "comment",\r
          "name": "NOT NEEDED ANYMORE?",\r
          "info": "",\r
          "comments": "",\r
-        "x": 4001.133270263672,\r
-        "y": 2314.285614013672,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4026.816635131836,\r
+        "y": 2319.5665130615234,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e4fc9765.fde21",\r
+        "id": "44c8e026.3089e",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 4374.466796875,\r
-        "y": 2277.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4400.150161743164,\r
+        "y": 2282.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e7a6f67c.223ba8",\r
+        "id": "624b6d74.0c220c",\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": "1806503a.76a7a",\r
+        "x": 4404.150161743164,\r
+        "y": 2196.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ab9c8c2d.c18e8",\r
-                "2a323f5f.e64b7"\r
+                "6725a861.5cac68",\r
+                "116c17e7.39a43"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7e2cf131.a58a08",\r
+        "id": "eda47f6d.73a9a",\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": "1806503a.76a7a",\r
+        "x": 4420.435806274414,\r
+        "y": 2374.388442993164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "cefe725b.0f41e8"\r
+                "c2e9db6e.5e8918"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "56e4b2a7.59d05c",\r
+        "id": "ad429934.3c84f",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4281.966796875,\r
-        "y": 2087.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4307.650161743164,\r
+        "y": 2092.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ab9c8c2d.c18e8",\r
+        "id": "6725a861.5cac68",\r
          "type": "set",\r
          "name": "set ltpId",\r
          "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",\r
          "comments": "",\r
-        "x": 4548.466796875,\r
-        "y": 2152.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4574.150161743164,\r
+        "y": 2157.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2a323f5f.e64b7",\r
+        "id": "116c17e7.39a43",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",\r
          "comments": "",\r
-        "x": 4549.466796875,\r
-        "y": 2257.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4575.150161743164,\r
+        "y": 2262.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "89cd5649.143b88",\r
+        "id": "d91f7d75.bbcbd8",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
          "comments": "",\r
-        "x": 4544.466796875,\r
-        "y": 2206.2857666015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4570.150161743164,\r
+        "y": 2211.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cefe725b.0f41e8",\r
+        "id": "c2e9db6e.5e8918",\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": "1806503a.76a7a",\r
+        "x": 4627.267349243164,\r
+        "y": 2363.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a03cf587.06cef8",\r
-                "a11cf500.909288",\r
-                "7b4cfab6.8e3e3c"\r
+                "a655b2d0.b12cf8",\r
+                "1b13a85a.c9fe7",\r
+                "4c91f5f3.8ae07c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a03cf587.06cef8",\r
+        "id": "a655b2d0.b12cf8",\r
          "type": "set",\r
          "name": "set destination ttp-id",\r
          "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 4816.583984375,\r
-        "y": 2320.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4842.267349243164,\r
+        "y": 2325.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a11cf500.909288",\r
+        "id": "1b13a85a.c9fe7",\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": "1806503a.76a7a",\r
+        "x": 4839.267349243164,\r
+        "y": 2364.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "1d4bbcf2.4e364b"\r
+                "14ad9c89.4bb913"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7b4cfab6.8e3e3c",\r
+        "id": "4c91f5f3.8ae07c",\r
          "type": "break",\r
          "name": "break",\r
          "xml": "<break>\n",\r
          "comments": "",\r
-        "x": 4769.083984375,\r
-        "y": 2401.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4794.767349243164,\r
+        "y": 2406.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5a11b9ac.0be8e",\r
+        "id": "5e825807.3f1cc",\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": "1806503a.76a7a",\r
+        "x": 4876.150161743164,\r
+        "y": 2116.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9451ac43.685578"\r
+                "fd8902be.b515c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3bd0a776.cdf68",\r
+        "id": "181d9117.3dc1c7",\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": "1806503a.76a7a",\r
+        "x": 4476.150039672852,\r
+        "y": 2046.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "baa608db.a0fe08"\r
+                "b70e554c.645b38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "baa608db.a0fe08",\r
+        "id": "b70e554c.645b38",\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": "1806503a.76a7a",\r
+        "x": 4673.150161743164,\r
+        "y": 2112.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5a11b9ac.0be8e",\r
-                "41776d15.aa3ae4"\r
+                "5e825807.3f1cc",\r
+                "25292003.2c4df"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41776d15.aa3ae4",\r
+        "id": "25292003.2c4df",\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": "1806503a.76a7a",\r
+        "x": 4878.150161743164,\r
+        "y": 2189.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e63bdf76.82117"\r
+                "c08bfda1.3541a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1d4bbcf2.4e364b",\r
+        "id": "14ad9c89.4bb913",\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": "1806503a.76a7a",\r
+        "x": 5019.767349243164,\r
+        "y": 2363.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "65012ff0.bac99"\r
+                "f56384d9.606e1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "65012ff0.bac99",\r
+        "id": "f56384d9.606e1",\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": "1806503a.76a7a",\r
+        "x": 5177.767349243164,\r
+        "y": 2363.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "8f16bdf7.24b18"\r
+                "a47e1ae7.393b38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8f16bdf7.24b18",\r
+        "id": "a47e1ae7.393b38",\r
          "type": "set",\r
          "name": "set destination tunnel tp ip",\r
          "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",\r
          "comments": "",\r
-        "x": 5359.083984375,\r
-        "y": 2358.626220703125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5384.767349243164,\r
+        "y": 2363.9071197509766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9451ac43.685578",\r
+        "id": "fd8902be.b515c8",\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": "1806503a.76a7a",\r
+        "x": 5053.150161743164,\r
+        "y": 2108.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "801b98ce.90edc",\r
-                "5fb93bf0.4b325c"\r
+                "3983145.c01d1ec",\r
+                "ded6bcc1.37b508"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5fb93bf0.4b325c",\r
+        "id": "ded6bcc1.37b508",\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": "1806503a.76a7a",\r
+        "x": 5261.150161743164,\r
+        "y": 2115.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "44bfb2a0.4cab3c",\r
-                "f1164e18.e0f19",\r
-                "7ca3e4f2.88fb4c"\r
+                "15291f10.bfa1d1",\r
+                "4ad88ea0.313028",\r
+                "9de78895.27ba68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e63bdf76.82117",\r
+        "id": "c08bfda1.3541a8",\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": "1806503a.76a7a",\r
+        "x": 5055.150161743164,\r
+        "y": 2181.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "de27c7f7.c9276"\r
+                "757e0ab3.492124"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "801b98ce.90edc",\r
+        "id": "3983145.c01d1ec",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainC id",\r
          "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5265.466796875,\r
-        "y": 2058.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5291.150161743164,\r
+        "y": 2063.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "de27c7f7.c9276",\r
+        "id": "757e0ab3.492124",\r
          "type": "set",\r
          "name": "set domainC ethernet layer network-id",\r
          "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5264.466796875,\r
-        "y": 2300.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5290.150161743164,\r
+        "y": 2305.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "44bfb2a0.4cab3c",\r
+        "id": "15291f10.bfa1d1",\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": "1806503a.76a7a",\r
+        "x": 5471.150161743164,\r
+        "y": 2106.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "e82fded9.073898"\r
+                "f933124d.0d0d48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f1164e18.e0f19",\r
+        "id": "4ad88ea0.313028",\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": "1806503a.76a7a",\r
+        "x": 5463.150161743164,\r
+        "y": 2161.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "85250ba4.806898"\r
+                "708c5d46.721ab4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7ca3e4f2.88fb4c",\r
+        "id": "9de78895.27ba68",\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": "1806503a.76a7a",\r
+        "x": 5468.150161743164,\r
+        "y": 2218.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7d5613c0.f5f4cc"\r
+                "c3cc12ab.3cd488"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7d5613c0.f5f4cc",\r
+        "id": "c3cc12ab.3cd488",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5594.466796875,\r
-        "y": 2214.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5620.150161743164,\r
+        "y": 2219.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "85250ba4.806898",\r
+        "id": "708c5d46.721ab4",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5605.466796875,\r
-        "y": 2159.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5631.150161743164,\r
+        "y": 2164.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e82fded9.073898",\r
+        "id": "f933124d.0d0d48",\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": "1806503a.76a7a",\r
+        "x": 5615.532485961914,\r
+        "y": 2104.222457885742,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "7c8249af.5ed848"\r
+                "2ba1c8df.2a738"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7c8249af.5ed848",\r
+        "id": "2ba1c8df.2a738",\r
          "type": "set",\r
          "name": "set controller domainC data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5804.466796875,\r
-        "y": 2095.285888671875,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5830.150161743164,\r
+        "y": 2100.5667877197266,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1e88543b.84a814",\r
+        "id": "5dc3af5e.92a278",\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": "1806503a.76a7a",\r
+        "x": 3861.816665649414,\r
+        "y": 2712.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "4bbf44dd.c34104"\r
+                "a2e190cc.8d4f1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4bbf44dd.c34104",\r
+        "id": "a2e190cc.8d4f1",\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": "1806503a.76a7a",\r
+        "x": 4052.816665649414,\r
+        "y": 2716.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ca18cabf.134c3"\r
+                "d5cbc45b.cf7e18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ca18cabf.134c3",\r
+        "id": "d5cbc45b.cf7e18",\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": "1806503a.76a7a",\r
+        "x": 4179.816665649414,\r
+        "y": 2715.566665649414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "ef98dd66.570548"\r
+                "9dcfaa3c.2df838"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ef98dd66.570548",\r
+        "id": "9dcfaa3c.2df838",\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": "1806503a.76a7a",\r
+        "x": 4406.150405883789,\r
+        "y": 2708.9002838134766,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c3cc04e3.9995e8",\r
-                "96ef8840.c20b2",\r
-                "50ef7648.d143f"\r
+                "9b50524c.8f5e2",\r
+                "d7d45f06.b90c18",\r
+                "a735aab1.9f93a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c3cc04e3.9995e8",\r
+        "id": "9b50524c.8f5e2",\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": "1806503a.76a7a",\r
+        "x": 4773.150161743164,\r
+        "y": 2602.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "625acc3d.d4dd04"\r
+                "c267b95.509ac48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "96ef8840.c20b2",\r
+        "id": "d7d45f06.b90c18",\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": "1806503a.76a7a",\r
+        "x": 4768.659194946289,\r
+        "y": 2647.326126098633,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b87c29ed.e7a1d8"\r
+                "bfc554f5.bfe79"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "50ef7648.d143f",\r
+        "id": "a735aab1.9f93a8",\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": "1806503a.76a7a",\r
+        "x": 4764.659194946289,\r
+        "y": 2697.326187133789,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2796810b.682956"\r
+                "6ab7706d.b84f78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "96d93656.6958b8",\r
+        "id": "5ae763e6.35d8f4",\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": "1806503a.76a7a",\r
+        "x": 5212.659683227539,\r
+        "y": 2692.3263092041016,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "625acc3d.d4dd04",\r
+        "id": "c267b95.509ac48",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4910.038330078125,\r
-        "y": 2596.9049682617188,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4935.721694946289,\r
+        "y": 2602.1858673095703,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b87c29ed.e7a1d8",\r
+        "id": "bfc554f5.bfe79",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 4910.975830078125,\r
-        "y": 2642.0452270507812,\r
-        "z": "1806503a.76a7a",\r
+        "x": 4936.659194946289,\r
+        "y": 2647.326126098633,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2796810b.682956",\r
+        "id": "6ab7706d.b84f78",\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": "1806503a.76a7a",\r
+        "x": 4933.659194946289,\r
+        "y": 2697.326187133789,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "5a769bdf.551e9c",\r
-                "96d93656.6958b8"\r
+                "3400e5b4.3cd32a",\r
+                "5ae763e6.35d8f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5a769bdf.551e9c",\r
+        "id": "3400e5b4.3cd32a",\r
          "type": "set",\r
          "name": "set new bw",\r
          "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source - $bwToBeDecreased`' />\n",\r
          "comments": "",\r
-        "x": 5089.9765625,\r
-        "y": 2634.0452880859375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5115.659927368164,\r
+        "y": 2639.326187133789,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b7814ecb.1580d",\r
+        "id": "fa76b584.bdbd9",\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": "1806503a.76a7a",\r
+        "x": 4650.150405883789,\r
+        "y": 3552.899917602539,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "cf2467a.3e0e698"\r
+                "ef9b97c4.4f1c68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf2467a.3e0e698",\r
+        "id": "ef9b97c4.4f1c68",\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": "1806503a.76a7a",\r
+        "x": 4940.150405883789,\r
+        "y": 3554.899917602539,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "774ecc4a.3ad124"\r
+                "608ff90c.2e5fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fc616200.2baf58",\r
+        "id": "35800841.c29e7",\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": "1806503a.76a7a",\r
+        "x": 4302.683364868164,\r
+        "y": 5782.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b0c64a0a.29dee8"\r
+                "23246adb.7861de"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b0c64a0a.29dee8",\r
+        "id": "23246adb.7861de",\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": "1806503a.76a7a",\r
+        "x": 4493.683364868164,\r
+        "y": 5786.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b39a4675.08bbf"\r
+                "f3b9dd7.5ea102"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b39a4675.08bbf",\r
+        "id": "f3b9dd7.5ea102",\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": "1806503a.76a7a",\r
+        "x": 4620.683364868164,\r
+        "y": 5785.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6b59d25.075b22c"\r
+                "60b7ba2f.bc3c0c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b59d25.075b22c",\r
+        "id": "60b7ba2f.bc3c0c",\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": "1806503a.76a7a",\r
+        "x": 4846.016372680664,\r
+        "y": 5787.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "84c8a22.08a86e",\r
-                "8ae9054d.68fd08"\r
+                "2443ceec.623df2",\r
+                "ad2ba37e.796088"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "84c8a22.08a86e",\r
+        "id": "2443ceec.623df2",\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": "1806503a.76a7a",\r
+        "x": 5056.016372680664,\r
+        "y": 5764.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "93a0772f.9be09"\r
+                "bd893034.6b25e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ae9054d.68fd08",\r
+        "id": "ad2ba37e.796088",\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": "1806503a.76a7a",\r
+        "x": 5061.016372680664,\r
+        "y": 5813.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "2db83bd3.7a132c"\r
+                "d0993207.1b217"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "93a0772f.9be09",\r
+        "id": "bd893034.6b25e8",\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": "1806503a.76a7a",\r
+        "x": 5182.016372680664,\r
+        "y": 5764.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2db83bd3.7a132c",\r
+        "id": "d0993207.1b217",\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": "1806503a.76a7a",\r
+        "x": 5179.016372680664,\r
+        "y": 5820.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "81928378.5f469",\r
-                "9b2406e3.5e7a08"\r
+                "7824302d.31915",\r
+                "638f8d60.f2970c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81928378.5f469",\r
+        "id": "7824302d.31915",\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": "1806503a.76a7a",\r
+        "x": 5493.016372680664,\r
+        "y": 5879.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6888e6dc.67e04",\r
+        "id": "b539af9b.8e6488",\r
          "type": "comment",\r
          "name": "Update connectivity status to modified",\r
          "info": "",\r
          "comments": "",\r
-        "x": 5399.550048828125,\r
-        "y": 5826.4190673828125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 5425.233413696289,\r
+        "y": 5831.699966430664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9b2406e3.5e7a08",\r
+        "id": "638f8d60.f2970c",\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": "1806503a.76a7a",\r
+        "x": 5623.683364868164,\r
+        "y": 5789.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d07ac0db.fa9818",\r
+        "id": "9c7760f0.090d48",\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": "1806503a.76a7a",\r
+        "x": 893.6833648681641,\r
+        "y": 4979.899673461914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a4f6e106.afc2d"\r
+                "89d9c849.63865"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a4f6e106.afc2d",\r
+        "id": "89d9c849.63865",\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": "1806503a.76a7a",\r
+        "x": 1084.683364868164,\r
+        "y": 4983.899673461914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "617b198c.79c0a"\r
+                "71eabcdb.edbe1c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "617b198c.79c0a",\r
+        "id": "71eabcdb.edbe1c",\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": "1806503a.76a7a",\r
+        "x": 1211.683364868164,\r
+        "y": 4982.899673461914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "f89a9d64.adeb98"\r
+                "b655e9e.17d4118"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f89a9d64.adeb98",\r
+        "id": "b655e9e.17d4118",\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": "1806503a.76a7a",\r
+        "x": 1437.016372680664,\r
+        "y": 4984.899673461914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "6035813d.1e7338",\r
-                "b4705906.43572"\r
+                "451cba7b.55b034",\r
+                "89345bed.8540d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6035813d.1e7338",\r
+        "id": "451cba7b.55b034",\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": "1806503a.76a7a",\r
+        "x": 1647.016372680664,\r
+        "y": 4961.899673461914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "b1155932.92831"\r
+                "6b3712d.199ce6c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b4705906.43572",\r
+        "id": "89345bed.8540d8",\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": "1806503a.76a7a",\r
+        "x": 1652.016372680664,\r
+        "y": 5010.899673461914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "62407b64.a07c9c"\r
+                "84894ba9.2f6d9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b1155932.92831",\r
+        "id": "6b3712d.199ce6c",\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": "1806503a.76a7a",\r
+        "x": 1773.016372680664,\r
+        "y": 4961.899673461914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "62407b64.a07c9c",\r
+        "id": "84894ba9.2f6d9",\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": "1806503a.76a7a",\r
+        "x": 1770.016372680664,\r
+        "y": 5017.899673461914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d0271ecc.53e168",\r
-                "83be22a.f7cdb6"\r
+                "d5552e7d.44cc8",\r
+                "e67d570d.d5f9f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "83be22a.f7cdb6",\r
+        "id": "e67d570d.d5f9f",\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": "1806503a.76a7a",\r
+        "x": 2214.683364868164,\r
+        "y": 4986.899673461914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d29b17e9.2cbf8",\r
+        "id": "41723099.7f44e8",\r
          "type": "comment",\r
          "name": "Update connectivity status to modified",\r
          "info": "",\r
          "comments": "",\r
-        "x": 1990.550048828125,\r
-        "y": 5023.4185791015625,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2016.233413696289,\r
+        "y": 5028.699478149414,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d0271ecc.53e168",\r
+        "id": "d5552e7d.44cc8",\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": "1806503a.76a7a",\r
+        "x": 2084.016372680664,\r
+        "y": 5076.899673461914,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e88fc760.9f3988",\r
+        "id": "5d9c1c4d.83462c",\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": "1806503a.76a7a",\r
+        "x": 1496.0167388916016,\r
+        "y": 5820.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "c0695dac.6b173"\r
+                "4a1beb8f.c1dbac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c0695dac.6b173",\r
+        "id": "4a1beb8f.c1dbac",\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": "1806503a.76a7a",\r
+        "x": 1687.0167388916016,\r
+        "y": 5824.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "a704fbb5.caa0b"\r
+                "c43fef47.9c947"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a704fbb5.caa0b",\r
+        "id": "c43fef47.9c947",\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": "1806503a.76a7a",\r
+        "x": 1814.0167388916016,\r
+        "y": 5823.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "bc272657.983128"\r
+                "40808ad0.742134"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bc272657.983128",\r
+        "id": "40808ad0.742134",\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": "1806503a.76a7a",\r
+        "x": 2039.3497467041016,\r
+        "y": 5825.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "31bdfa25.d18a2e",\r
-                "c242900c.77afd8"\r
+                "5a051931.8c6a5",\r
+                "818560aa.91932"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "31bdfa25.d18a2e",\r
+        "id": "5a051931.8c6a5",\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": "1806503a.76a7a",\r
+        "x": 2249.3497467041016,\r
+        "y": 5802.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "9d78f5ef.5cf228"\r
+                "8edca568.ede98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c242900c.77afd8",\r
+        "id": "818560aa.91932",\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": "1806503a.76a7a",\r
+        "x": 2254.3497467041016,\r
+        "y": 5851.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d542d85e.71ea7"\r
+                "9a80cebb.ff473"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d78f5ef.5cf228",\r
+        "id": "8edca568.ede98",\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": "1806503a.76a7a",\r
+        "x": 2375.3497467041016,\r
+        "y": 5802.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d542d85e.71ea7",\r
+        "id": "9a80cebb.ff473",\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": "1806503a.76a7a",\r
+        "x": 2372.3497467041016,\r
+        "y": 5858.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              [\r
-                "d23f59ed.73bc4",\r
-                "2e5ee108.277b9e"\r
+                "cc186b3e.b594b",\r
+                "5f3c966d.1d57c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e5ee108.277b9e",\r
+        "id": "5f3c966d.1d57c",\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": "1806503a.76a7a",\r
+        "x": 2817.0167388916016,\r
+        "y": 5827.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "868b21d1.a7652",\r
+        "id": "224407cc.d62a7",\r
          "type": "comment",\r
          "name": "Update connectivity status to modified",\r
          "info": "",\r
          "comments": "",\r
-        "x": 2592.8834228515625,\r
-        "y": 5864.4190673828125,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2618.5667877197266,\r
+        "y": 5869.699966430664,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d23f59ed.73bc4",\r
+        "id": "cc186b3e.b594b",\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": "1806503a.76a7a",\r
+        "x": 2686.3497467041016,\r
+        "y": 5917.900161743164,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "73f93f1a.1715d8",\r
+        "id": "9067b91d.deea4",\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": "1806503a.76a7a",\r
+        "x": 1546.4500274658203,\r
+        "y": 6126.280899047852,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5f7e37aa.0d2258",\r
+        "id": "61909f2b.d81a28",\r
          "type": "set",\r
          "name": "set parameters",\r
          "xml": "<set>\n<parameter name='subscriptionId' value='`$rcvd-bandwidth-value`' />\n",\r
          "comments": "",\r
-        "x": 1452.800048828125,\r
-        "y": 6062.39990234375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 1478.483413696289,\r
+        "y": 6067.680801391602,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": []\r
      },\r
      {\r
-        "id": "29311664.f24592",\r
+        "id": "3d1d7271.d95cbe",\r
          "type": "execute",\r
          "name": "execute Terminate SSE Connection",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2069.433349609375,\r
-        "y": 5569.2333984375,\r
-        "z": "1806503a.76a7a",\r
+        "x": 2095.116714477539,\r
+        "y": 5574.514297485352,\r
+        "z": "1b4ba1fc.83240e",\r
          "wires": [\r
              []\r
          ]\r