X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json;h=807831e86ab6a28155e87b8d9b550d9a50164a70;hb=934becd6c3b0ecce44b1652820c6b4960ed5636f;hp=6b46d3262f52ff57dac24e471ce2e3499a868bec;hpb=80bf0e3b814aa3a9cef81825c1b2da0925241d09;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
index 6b46d326..807831e8 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "9b0ef60b.7214f",
+    "id": "a36be240.71b108",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 179.56666564941406,
-    "y": 189.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 181.56666564941406,
+    "y": 140.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fb71b372.446598"
+        "d32c48f4.aac76"
       ]
     ]
   },
   {
-    "id": "fb71b372.446598",
+    "id": "d32c48f4.aac76",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,10540 +22,10540 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 463.85235595703125,
-    "y": 250.52385997772217,
-    "z": "2414cd0b.85dac2",
+    "x": 465.85235595703125,
+    "y": 201.52385997772217,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "661c7873.62c16"
+        "cea08712.e1ad8"
       ]
     ]
   },
   {
-    "id": "661c7873.62c16",
+    "id": "cea08712.e1ad8",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-modify",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-modify' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 469.9952697753906,
-    "y": 335.28578186035156,
-    "z": "2414cd0b.85dac2",
+    "x": 471.9952697753906,
+    "y": 286.28578186035156,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f0354603.74586"
+        "81a694dd.59419"
       ]
     ]
   },
   {
-    "id": "f0354603.74586",
+    "id": "81a694dd.59419",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 819.5666656494141,
-    "y": 394.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 821.5666656494141,
+    "y": 345.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "729f4799.a6df6",
-        "82d86696.e8f5a",
-        "381a9eda.91673a"
+        "262c4d6b.8ef302",
+        "f6c757fc.4ac3d8",
+        "5a309470.2c2984"
       ]
     ]
   },
   {
-    "id": "729f4799.a6df6",
+    "id": "262c4d6b.8ef302",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 1120.900161743164,
-    "y": 665.2160491943359,
-    "z": "2414cd0b.85dac2",
+    "x": 1122.900161743164,
+    "y": 616.2160491943359,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "82d86696.e8f5a",
+    "id": "f6c757fc.4ac3d8",
     "type": "save",
     "name": "get service-instance from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
     "comments": "",
     "outputs": 1,
-    "x": 1142.328628540039,
-    "y": 367.6190643310547,
-    "z": "2414cd0b.85dac2",
+    "x": 1144.328628540039,
+    "y": 318.6190643310547,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "19e3f412.c2895c",
-        "22e3b9e.2e85d46",
-        "d1fd3935.e60aa8"
+        "46d97ddb.2cdac4",
+        "5d275c59.021c7c",
+        "49cae57.69a7f9c"
       ]
     ]
   },
   {
-    "id": "19e3f412.c2895c",
+    "id": "46d97ddb.2cdac4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1367.328628540039,
-    "y": 225.6190643310547,
-    "z": "2414cd0b.85dac2",
+    "x": 1369.328628540039,
+    "y": 176.6190643310547,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bdfafca5.bdc978"
+        "f1f14b39.ae66d8"
       ]
     ]
   },
   {
-    "id": "22e3b9e.2e85d46",
+    "id": "5d275c59.021c7c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1362.819595336914,
-    "y": 295.19309997558594,
-    "z": "2414cd0b.85dac2",
+    "x": 1364.819595336914,
+    "y": 246.19309997558594,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f555968c.0ca438"
+        "e0fe1751.0d1d08"
       ]
     ]
   },
   {
-    "id": "d1fd3935.e60aa8",
+    "id": "49cae57.69a7f9c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1351.328628540039,
-    "y": 341.6190643310547,
-    "z": "2414cd0b.85dac2",
+    "x": 1353.328628540039,
+    "y": 292.6190643310547,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "cd958c5e.148ca8"
+        "91b68660.fcd578"
       ]
     ]
   },
   {
-    "id": "60f90238.97edc4",
+    "id": "83ec93b8.4f0e58",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1121.328628540039,
-    "y": 255.6190643310547,
-    "z": "2414cd0b.85dac2",
+    "x": 1123.328628540039,
+    "y": 206.6190643310547,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "381a9eda.91673a",
+    "id": "5a309470.2c2984",
     "type": "execute",
     "name": "execute properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
     "comments": "",
     "outputs": 1,
-    "x": 1109.328628540039,
-    "y": 307.6190643310547,
-    "z": "2414cd0b.85dac2",
+    "x": 1111.328628540039,
+    "y": 258.6190643310547,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "bdfafca5.bdc978",
+    "id": "f1f14b39.ae66d8",
     "type": "switchNode",
     "name": "switch allotted-resources_length != 0",
     "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1607.566665649414,
-    "y": 222.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1609.566665649414,
+    "y": 173.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1d20e341.a27c1d",
-        "5ce58924.9a36f"
+        "47b460bb.508b6",
+        "e9217582.339fb"
       ]
     ]
   },
   {
-    "id": "f555968c.0ca438",
+    "id": "e0fe1751.0d1d08",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 1517.6290435791016,
-    "y": 298.14552307128906,
-    "z": "2414cd0b.85dac2",
+    "x": 1519.6290435791016,
+    "y": 249.14552307128906,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "cd958c5e.148ca8",
+    "id": "91b68660.fcd578",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1521.566665649414,
-    "y": 342.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1523.566665649414,
+    "y": 293.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1d20e341.a27c1d",
+    "id": "47b460bb.508b6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1812.566665649414,
-    "y": 259.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1814.566665649414,
+    "y": 210.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e28a7a1e.c07b78"
+        "4440eff6.476cd"
       ]
     ]
   },
   {
-    "id": "5ce58924.9a36f",
+    "id": "e9217582.339fb",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1822.566665649414,
-    "y": 186.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1824.566665649414,
+    "y": 137.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e28a7a1e.c07b78",
+    "id": "4440eff6.476cd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1805.566665649414,
-    "y": 334.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1807.566665649414,
+    "y": 285.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fd95487b.da105",
-        "526e7fc2.050288",
-        "a11cf219.9bf18",
-        "8ac4fdd4.d603a8",
-        "c717d5f4.4fddc8"
+        "3986b18c.a9e7ae",
+        "1a55fc09.fb08cc",
+        "84bc3e18.c9d6e",
+        "63b2fdab.785aac",
+        "dfc7a62b.53e19"
       ]
     ]
   },
   {
-    "id": "324358a6.ea813",
+    "id": "1cb8dc69.891db4",
     "type": "save",
     "name": "get allotted-resource from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2291.566665649414,
-    "y": 385.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2293.566665649414,
+    "y": 336.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6086efb9.edfcd",
-        "9b93dfe7.0d77",
-        "a7f7b2f5.24504"
+        "d730a66e.613558",
+        "3006b8b.6e69448",
+        "f68070c6.2ea968"
       ]
     ]
   },
   {
-    "id": "6086efb9.edfcd",
+    "id": "d730a66e.613558",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2507.566665649414,
-    "y": 452.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2509.566665649414,
+    "y": 403.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a12dc51a.620ef"
+        "e3579fa8.43b168"
       ]
     ]
   },
   {
-    "id": "9b93dfe7.0d77",
+    "id": "3006b8b.6e69448",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2508.057632446289,
-    "y": 351.85972595214844,
-    "z": "2414cd0b.85dac2",
+    "x": 2510.057632446289,
+    "y": 302.85972595214844,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "adc977fa.7cd608"
+        "6bbc8555.572b94"
       ]
     ]
   },
   {
-    "id": "a7f7b2f5.24504",
+    "id": "f68070c6.2ea968",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2503.566665649414,
-    "y": 401.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2505.566665649414,
+    "y": 352.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4d4bdb5a.3763ac"
+        "a1a8f5c7.a1ada"
       ]
     ]
   },
   {
-    "id": "fd95487b.da105",
+    "id": "3986b18c.a9e7ae",
     "type": "for",
     "name": "for each allotted-resource",
     "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2008.566665649414,
-    "y": 366.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2010.566665649414,
+    "y": 317.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "cc186f28.ba2c9",
-        "324358a6.ea813",
-        "ab78fc6f.8a0998",
-        "1e0dcc9a.c7d15b"
+        "62594551.389614",
+        "1cb8dc69.891db4",
+        "1902c403.6fb814",
+        "b21e9d77.e0db"
       ]
     ]
   },
   {
-    "id": "cc186f28.ba2c9",
+    "id": "62594551.389614",
     "type": "set",
     "name": "set the current allotted-resource-id",
     "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
     "comments": "",
-    "x": 2288.566665649414,
-    "y": 304.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2290.566665649414,
+    "y": 255.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "8ac4fdd4.d603a8",
+    "id": "63b2fdab.785aac",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
     "comments": "",
-    "x": 1982.566665649414,
-    "y": 316.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1984.566665649414,
+    "y": 267.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "526e7fc2.050288",
+    "id": "1a55fc09.fb08cc",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2025.566665649414,
-    "y": 175.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2027.566665649414,
+    "y": 126.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a11cf219.9bf18",
+    "id": "84bc3e18.c9d6e",
     "type": "get-resource",
     "name": "get-resource logical-links",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2037.566665649414,
-    "y": 216.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2039.566665649414,
+    "y": 167.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "2d1a927f.4e32b6",
+    "id": "70e12844.2efb58",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2062.566665649414,
-    "y": 128.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2064.566665649414,
+    "y": 79.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9e25d87e.938588",
+    "id": "1582189.5e20967",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
     "comments": "",
-    "x": 1982.566665649414,
-    "y": 262.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1984.566665649414,
+    "y": 213.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "adc977fa.7cd608",
+    "id": "6bbc8555.572b94",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 2686.566665649414,
-    "y": 354.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2688.566665649414,
+    "y": 305.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4d4bdb5a.3763ac",
+    "id": "a1a8f5c7.a1ada",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2686.504165649414,
-    "y": 403.42601013183594,
-    "z": "2414cd0b.85dac2",
+    "x": 2688.504165649414,
+    "y": 354.42601013183594,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "a12dc51a.620ef",
+    "id": "e3579fa8.43b168",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2688.504165649414,
-    "y": 454.42601013183594,
-    "z": "2414cd0b.85dac2",
+    "x": 2690.504165649414,
+    "y": 405.42601013183594,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e28b2f59.3a0188"
+        "234c19dd.3792f6"
       ]
     ]
   },
   {
-    "id": "e28b2f59.3a0188",
+    "id": "234c19dd.3792f6",
     "type": "save",
     "name": "get allotted-resource relationship from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3023.504165649414,
-    "y": 223.426025390625,
-    "z": "2414cd0b.85dac2",
+    "x": 3025.504165649414,
+    "y": 174.426025390625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5b54194d.44ebe",
-        "aebf4283.d1be78",
-        "4cc0a7b0.54364"
+        "403040fa.29d128",
+        "d2e9aaef.69fb08",
+        "b24293ea.efd47"
       ]
     ]
   },
   {
-    "id": "aebf4283.d1be78",
+    "id": "d2e9aaef.69fb08",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3296.995132446289,
-    "y": 116,
-    "z": "2414cd0b.85dac2",
+    "x": 3298.995132446289,
+    "y": 67,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bfbb6bff.50e7e8"
+        "fccce16d.0a609"
       ]
     ]
   },
   {
-    "id": "bfbb6bff.50e7e8",
+    "id": "fccce16d.0a609",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3474.566665649414,
-    "y": 116.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3476.566665649414,
+    "y": 67.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4cc0a7b0.54364",
+    "id": "b24293ea.efd47",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3292.504165649414,
-    "y": 165.426025390625,
-    "z": "2414cd0b.85dac2",
+    "x": 3294.504165649414,
+    "y": 116.426025390625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8ce95b42.618ca8"
+        "1cbd7c7f.481b8c"
       ]
     ]
   },
   {
-    "id": "8ce95b42.618ca8",
+    "id": "1cbd7c7f.481b8c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3474.504165649414,
-    "y": 165.426025390625,
-    "z": "2414cd0b.85dac2",
+    "x": 3476.504165649414,
+    "y": 116.426025390625,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "5b54194d.44ebe",
+    "id": "403040fa.29d128",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3296.504165649414,
-    "y": 216.426025390625,
-    "z": "2414cd0b.85dac2",
+    "x": 3298.504165649414,
+    "y": 167.426025390625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6f465aa6.4f1ee4"
+        "6553de3d.0fe06"
       ]
     ]
   },
   {
-    "id": "6f465aa6.4f1ee4",
+    "id": "6553de3d.0fe06",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3476.504165649414,
-    "y": 216.426025390625,
-    "z": "2414cd0b.85dac2",
+    "x": 3478.504165649414,
+    "y": 167.426025390625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7a127cf4.cf8b34"
+        "a3b12c76.41d528"
       ]
     ]
   },
   {
-    "id": "7a127cf4.cf8b34",
+    "id": "a3b12c76.41d528",
     "type": "switchNode",
     "name": "switch allotted-resource.relationship-list not empty",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3042.566665649414,
-    "y": 351.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3044.566665649414,
+    "y": 302.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9cc4aaf6.859c",
-        "9d86e661.45c7f"
+        "18fdd62.581202a",
+        "6160fe1a.c1358"
       ]
     ]
   },
   {
-    "id": "9d86e661.45c7f",
+    "id": "6160fe1a.c1358",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3352.566665649414,
-    "y": 358.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3354.566665649414,
+    "y": 309.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "9cc4aaf6.859c",
+    "id": "18fdd62.581202a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3351.566665649414,
-    "y": 412.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3353.566665649414,
+    "y": 363.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c9c4f2a.9305f9"
+        "be5e6e3e.4df078"
       ]
     ]
   },
   {
-    "id": "af10f438.0ffb48",
+    "id": "93300adf.7164e",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4096.566665649414,
-    "y": 366.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 4098.566665649414,
+    "y": 317.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "96cf18f1.1cad5"
+        "4304d9fb.fb05f8"
       ]
     ]
   },
   {
-    "id": "96cf18f1.1cad5",
+    "id": "4304d9fb.fb05f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4273.566543579102,
-    "y": 359.28564453125,
-    "z": "2414cd0b.85dac2",
+    "x": 4275.566543579102,
+    "y": 310.28564453125,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c590372d.ec562",
-        "d84bff3f.0a18c8"
+        "57e483bc.d9d9f4",
+        "be73e257.6c7c7"
       ]
     ]
   },
   {
-    "id": "c9c4f2a.9305f9",
+    "id": "be5e6e3e.4df078",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3515.566665649414,
-    "y": 338.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3517.566665649414,
+    "y": 289.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ec6a7a84.d65408",
-        "7d25e53c.8a468c"
+        "7cff4b8c.a234a4",
+        "44a90848.8f1578"
       ]
     ]
   },
   {
-    "id": "ec6a7a84.d65408",
+    "id": "7cff4b8c.a234a4",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3796.566665649414,
-    "y": 294.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3798.566665649414,
+    "y": 245.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7204f6fc.5ab2"
+        "9f045210.d63268"
       ]
     ]
   },
   {
-    "id": "7204f6fc.5ab2",
+    "id": "9f045210.d63268",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4058.566665649414,
-    "y": 294.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 4060.566665649414,
+    "y": 245.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "af10f438.0ffb48"
+        "93300adf.7164e"
       ]
     ]
   },
   {
-    "id": "c590372d.ec562",
+    "id": "57e483bc.d9d9f4",
     "type": "set",
     "name": "set the 1st network-policy-id",
     "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 4516.566543579102,
-    "y": 316.28564453125,
-    "z": "2414cd0b.85dac2",
+    "x": 4518.566543579102,
+    "y": 267.28564453125,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d84bff3f.0a18c8",
+    "id": "be73e257.6c7c7",
     "type": "save",
     "name": "get network-policy from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
     "comments": "",
     "outputs": 1,
-    "x": 4505.566543579102,
-    "y": 371.28564453125,
-    "z": "2414cd0b.85dac2",
+    "x": 4507.566543579102,
+    "y": 322.28564453125,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bcf7cb3d.813c08",
-        "241d629e.3937f6",
-        "ab4a02d2.dd63f8"
+        "626c6aaa.7748cc",
+        "19c4911c.086f1f",
+        "8b5b13a5.9b5548"
       ]
     ]
   },
   {
-    "id": "ab4a02d2.dd63f8",
+    "id": "8b5b13a5.9b5548",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4836.566665649414,
-    "y": 279.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 4838.566665649414,
+    "y": 230.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6fe3d858.7ad19"
+        "93609ef4.15443"
       ]
     ]
   },
   {
-    "id": "6fe3d858.7ad19",
+    "id": "93609ef4.15443",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4985.138198852539,
-    "y": 279.57151794433594,
-    "z": "2414cd0b.85dac2",
+    "x": 4987.138198852539,
+    "y": 230.57151794433594,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3cab2fad.4b6d28",
+    "id": "156c88bf.8ed887",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4984.075698852539,
-    "y": 323.71177673339844,
-    "z": "2414cd0b.85dac2",
+    "x": 4986.075698852539,
+    "y": 274.71177673339844,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "241d629e.3937f6",
+    "id": "19c4911c.086f1f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4825.075698852539,
-    "y": 323.71177673339844,
-    "z": "2414cd0b.85dac2",
+    "x": 4827.075698852539,
+    "y": 274.71177673339844,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3cab2fad.4b6d28"
+        "156c88bf.8ed887"
       ]
     ]
   },
   {
-    "id": "bcf7cb3d.813c08",
+    "id": "626c6aaa.7748cc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4832.075698852539,
-    "y": 402.71177673339844,
-    "z": "2414cd0b.85dac2",
+    "x": 4834.075698852539,
+    "y": 353.71177673339844,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c61a87d8.32a11"
+        "b50e966f.55aaa8"
       ]
     ]
   },
   {
-    "id": "c61a87d8.32a11",
+    "id": "b50e966f.55aaa8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4971.075698852539,
-    "y": 402.71177673339844,
-    "z": "2414cd0b.85dac2",
+    "x": 4973.075698852539,
+    "y": 353.71177673339844,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ab565ac9.d97978",
-        "cf0bc947.03a4d"
+        "9ee7b526.b79f4",
+        "7630b329.2d07cc"
       ]
     ]
   },
   {
-    "id": "ab565ac9.d97978",
+    "id": "9ee7b526.b79f4",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5176.566665649414,
-    "y": 400.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 5178.566665649414,
+    "y": 351.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "cf0bc947.03a4d",
+    "id": "7630b329.2d07cc",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5175.566665649414,
-    "y": 446.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 5177.566665649414,
+    "y": 397.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7d25e53c.8a468c",
+    "id": "44a90848.8f1578",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3613.566665649414,
-    "y": 410.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3615.566665649414,
+    "y": 361.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "95ed8dc.322967"
+        "62de4c53.8433ac"
       ]
     ]
   },
   {
-    "id": "95ed8dc.322967",
+    "id": "62de4c53.8433ac",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3893.566665649414,
-    "y": 410.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3895.566665649414,
+    "y": 361.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e85bd9f4.7a28d"
+        "c51917b6.8d7e"
       ]
     ]
   },
   {
-    "id": "e85bd9f4.7a28d",
+    "id": "c51917b6.8d7e",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2264.5667877197266,
-    "y": 841.2858734130859,
-    "z": "2414cd0b.85dac2",
+    "x": 2266.5667877197266,
+    "y": 792.2858734130859,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "53210c7d.ec4f8c"
+        "8a5f2855.b691a8"
       ]
     ]
   },
   {
-    "id": "53210c7d.ec4f8c",
+    "id": "8a5f2855.b691a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2441.566665649414,
-    "y": 834.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 2443.566665649414,
+    "y": 785.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6d10b617.947758",
-        "dd67d7f2.9348e"
+        "19e426d6.5b9f81",
+        "949e5077.38a42"
       ]
     ]
   },
   {
-    "id": "6d10b617.947758",
+    "id": "19e426d6.5b9f81",
     "type": "set",
     "name": "set the current logical-link-name",
     "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 2684.566665649414,
-    "y": 791.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 2686.566665649414,
+    "y": 742.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "dd67d7f2.9348e",
+    "id": "949e5077.38a42",
     "type": "save",
     "name": "get logical-link from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
     "comments": "",
     "outputs": 1,
-    "x": 2673.566665649414,
-    "y": 846.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 2675.566665649414,
+    "y": 797.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7e4e9434.83a0d4",
-        "9cee4acb.003668",
-        "47c07099.1b14a8"
+        "47392897.e24ae8",
+        "e83d2afb.d42318",
+        "ddc13460.7744f"
       ]
     ]
   },
   {
-    "id": "7e4e9434.83a0d4",
+    "id": "47392897.e24ae8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2965.057632446289,
-    "y": 824.8597259521484,
-    "z": "2414cd0b.85dac2",
+    "x": 2967.057632446289,
+    "y": 775.8597259521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bc050886.d2a05"
+        "23c66f69.49ece8"
       ]
     ]
   },
   {
-    "id": "9cee4acb.003668",
+    "id": "e83d2afb.d42318",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2953.566665649414,
-    "y": 869.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 2955.566665649414,
+    "y": 820.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c31212b9.83f5f8"
+        "bb790c96.f0e18"
       ]
     ]
   },
   {
-    "id": "bc050886.d2a05",
+    "id": "23c66f69.49ece8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3113.629165649414,
-    "y": 825.1454925537109,
-    "z": "2414cd0b.85dac2",
+    "x": 3115.629165649414,
+    "y": 776.1454925537109,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c31212b9.83f5f8",
+    "id": "bb790c96.f0e18",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3112.566665649414,
-    "y": 869.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3114.566665649414,
+    "y": 820.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "47c07099.1b14a8",
+    "id": "ddc13460.7744f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2960.566665649414,
-    "y": 948.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 2962.566665649414,
+    "y": 899.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a66b0cd4.00b53"
+        "ce7226da.e17388"
       ]
     ]
   },
   {
-    "id": "a66b0cd4.00b53",
+    "id": "ce7226da.e17388",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3099.566665649414,
-    "y": 948.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3101.566665649414,
+    "y": 899.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "628231dc.fe1998",
-        "40f53355.15a3d4",
-        "6e7728cd.6d606",
-        "591f4762.52be1",
-        "72ab083b.a6528",
-        "be414195.9b77c",
-        "8abc6705.827928",
-        "5f587418.c46734",
-        "da60761c.d9f04",
-        "fd9bd7ab.c92bd8",
-        "b37c5dee.6ca208",
-        "1bc9df09.d67e59",
-        "6e895a21.1d4594",
-        "707a9dca.527c64",
-        "9cc0dadb.189ef",
-        "e9c6a99.90dcbd8",
-        "4a92500a.dfe688",
-        "25934f35.38edd",
-        "77f3463a.2b447"
+        "5b3288fc.6936d8",
+        "9980ae35.23ba18",
+        "85d1e230.49ed",
+        "bf3e43cc.400f1",
+        "1f78077d.63f4c1",
+        "3d294d62.516b2a",
+        "21946f52.f16938",
+        "35531714.c0e89",
+        "63476979.041bd8",
+        "aac95e09.ab90b8",
+        "d36e02ea.349dc",
+        "ad429900.4c716",
+        "456e0186.bd36f8",
+        "6feba0d9.6ac0b",
+        "c1a83ef0.efb158",
+        "8429e2be.11d098",
+        "334ad959.cb8dd6",
+        "d7f7c5fa.4c43d8",
+        "4bfd3207.06ef5c"
       ]
     ]
   },
   {
-    "id": "b0809281.c581e8",
+    "id": "b6d13ba8.f00e28",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3411.566665649414,
-    "y": 498.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 3413.566665649414,
+    "y": 449.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "628231dc.fe1998",
+    "id": "5b3288fc.6936d8",
     "type": "execute",
     "name": "execute UUID generator for otn-tunnel-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3398.5665435791016,
-    "y": 590.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3400.5665435791016,
+    "y": 541.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "707a9dca.527c64",
+    "id": "6feba0d9.6ac0b",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 3355.5665435791016,
-    "y": 635.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3357.5665435791016,
+    "y": 586.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "40f53355.15a3d4",
+    "id": "9980ae35.23ba18",
     "type": "set",
     "name": "set network-route-one",
     "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
     "comments": "",
-    "x": 3330.5665435791016,
-    "y": 698.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3332.5665435791016,
+    "y": 649.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6e7728cd.6d606",
+    "id": "85d1e230.49ed",
     "type": "set",
     "name": "set network-route-two",
     "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
     "comments": "",
-    "x": 3331.5665435791016,
-    "y": 753.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3333.5665435791016,
+    "y": 704.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "591f4762.52be1",
+    "id": "bf3e43cc.400f1",
     "type": "save",
     "name": "get network-route-one from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
     "comments": "",
     "outputs": 1,
-    "x": 3347.5665435791016,
-    "y": 801.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3349.5665435791016,
+    "y": 752.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6d204f19.ffc268",
-        "1689d04b.d0aa98",
-        "34ef36cb.86ebd2"
+        "3a9b85f6.e1582a",
+        "d8d8c3b5.17db1",
+        "94ad08f1.768ca"
       ]
     ]
   },
   {
-    "id": "72ab083b.a6528",
+    "id": "1f78077d.63f4c1",
     "type": "save",
     "name": "get network-route-two from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
     "comments": "",
     "outputs": 1,
-    "x": 3342.566665649414,
-    "y": 868.2856292724609,
-    "z": "2414cd0b.85dac2",
+    "x": 3344.566665649414,
+    "y": 819.2856292724609,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a5360717.582308",
-        "a764163a.8df268",
-        "84d2b76f.25f11"
+        "92b833b8.0a3038",
+        "329b8760.c33988",
+        "4b0996dd.3831d8"
       ]
     ]
   },
   {
-    "id": "6d204f19.ffc268",
+    "id": "3a9b85f6.e1582a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3588.566665649414,
-    "y": 629.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3590.566665649414,
+    "y": 580.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "424235f5.63bc3c"
+        "11bdd863.93783"
       ]
     ]
   },
   {
-    "id": "1689d04b.d0aa98",
+    "id": "d8d8c3b5.17db1",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3584.075698852539,
-    "y": 678.7117767333984,
-    "z": "2414cd0b.85dac2",
+    "x": 3586.075698852539,
+    "y": 629.7117767333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3044babb.9a7f0e"
+        "f63a5915.f8a988"
       ]
     ]
   },
   {
-    "id": "34ef36cb.86ebd2",
+    "id": "94ad08f1.768ca",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3588.075698852539,
-    "y": 731.7117767333984,
-    "z": "2414cd0b.85dac2",
+    "x": 3590.075698852539,
+    "y": 682.7117767333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e8786087.fc4a5"
+        "d3671f93.7e55b8"
       ]
     ]
   },
   {
-    "id": "424235f5.63bc3c",
+    "id": "11bdd863.93783",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3737.138198852539,
-    "y": 628.5715179443359,
-    "z": "2414cd0b.85dac2",
+    "x": 3739.138198852539,
+    "y": 579.5715179443359,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3044babb.9a7f0e",
+    "id": "f63a5915.f8a988",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3727.075698852539,
-    "y": 678.7117767333984,
-    "z": "2414cd0b.85dac2",
+    "x": 3729.075698852539,
+    "y": 629.7117767333984,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "a5360717.582308",
+    "id": "92b833b8.0a3038",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3592.566665649414,
-    "y": 785.2856292724609,
-    "z": "2414cd0b.85dac2",
+    "x": 3594.566665649414,
+    "y": 736.2856292724609,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d832daa6.408e"
+        "675faf6a.ba5628"
       ]
     ]
   },
   {
-    "id": "a764163a.8df268",
+    "id": "329b8760.c33988",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3588.075698852539,
-    "y": 834.7116546630859,
-    "z": "2414cd0b.85dac2",
+    "x": 3590.075698852539,
+    "y": 785.7116546630859,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b0e5525.e8ef43"
+        "f0edefdd.7fbf88"
       ]
     ]
   },
   {
-    "id": "84d2b76f.25f11",
+    "id": "4b0996dd.3831d8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3571.075698852539,
-    "y": 882.7116546630859,
-    "z": "2414cd0b.85dac2",
+    "x": 3573.075698852539,
+    "y": 833.7116546630859,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8b568989.b50038"
+        "d42db304.4749e8"
       ]
     ]
   },
   {
-    "id": "d832daa6.408e",
+    "id": "675faf6a.ba5628",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3741.138198852539,
-    "y": 784.5713958740234,
-    "z": "2414cd0b.85dac2",
+    "x": 3743.138198852539,
+    "y": 735.5713958740234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b0e5525.e8ef43",
+    "id": "f0edefdd.7fbf88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3731.075698852539,
-    "y": 834.7116546630859,
-    "z": "2414cd0b.85dac2",
+    "x": 3733.075698852539,
+    "y": 785.7116546630859,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e8786087.fc4a5",
+    "id": "d3671f93.7e55b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3749.566665649414,
-    "y": 731.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3751.566665649414,
+    "y": 682.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "66efb3a1.9fe73c"
+        "bbaa9d89.298de8"
       ]
     ]
   },
   {
-    "id": "8b568989.b50038",
+    "id": "d42db304.4749e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3724.566665649414,
-    "y": 882.2856292724609,
-    "z": "2414cd0b.85dac2",
+    "x": 3726.566665649414,
+    "y": 833.2856292724609,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "26894e1f.239b9a"
+        "6b53fb28.4b35a4"
       ]
     ]
   },
   {
-    "id": "66efb3a1.9fe73c",
+    "id": "bbaa9d89.298de8",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3921.566665649414,
-    "y": 731.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3923.566665649414,
+    "y": 682.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a22f1b0d.edd33",
-        "ab951b61.cb4cb8",
-        "79c99b01.4060a4"
+        "f5f42bcc.193ca8",
+        "1ca26f5e.24e681",
+        "30c464f6.21891c"
       ]
     ]
   },
   {
-    "id": "26894e1f.239b9a",
+    "id": "6b53fb28.4b35a4",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3916.566665649414,
-    "y": 816.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3918.566665649414,
+    "y": 767.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a2c3d250.fc00d",
-        "aa59cf58.a145d8",
-        "fb5e94da.526bd"
+        "4fb6ec71.0d0c04",
+        "a3acc90b.3d737",
+        "513e1ab4.43497c"
       ]
     ]
   },
   {
-    "id": "a22f1b0d.edd33",
+    "id": "f5f42bcc.193ca8",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4082.566177368164,
-    "y": 467.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 4084.566177368164,
+    "y": 418.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2bc1e64e.d59032"
+        "47912c0e.49beac"
       ]
     ]
   },
   {
-    "id": "ab951b61.cb4cb8",
+    "id": "1ca26f5e.24e681",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4084.566177368164,
-    "y": 521.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4086.566177368164,
+    "y": 472.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "453522b8.5dbac4"
+        "eb199d13.e7038"
       ]
     ]
   },
   {
-    "id": "a2c3d250.fc00d",
+    "id": "4fb6ec71.0d0c04",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4097.565933227539,
-    "y": 689.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4099.565933227539,
+    "y": 640.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f5a4f507.86b44"
+        "ab328b3c.b23248"
       ]
     ]
   },
   {
-    "id": "aa59cf58.a145d8",
+    "id": "a3acc90b.3d737",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4099.565933227539,
-    "y": 743.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4101.565933227539,
+    "y": 694.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8148cd30.75333"
+        "4b33e71e.9ca98"
       ]
     ]
   },
   {
-    "id": "fcdd9b76.8fa5f8",
+    "id": "8d16f671.5b9d4",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4392.566177368164,
-    "y": 419.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 4394.566177368164,
+    "y": 370.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "a44710c1.f4b4c8",
+    "id": "5b74c380.dcc8d4",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4385.566177368164,
-    "y": 517.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4387.566177368164,
+    "y": 468.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "5b86250b.1183b4",
+    "id": "142c8c33.b05574",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4461.565933227539,
-    "y": 716.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4463.565933227539,
+    "y": 667.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "154b4953.ab9fcf",
+    "id": "fadd6db5.8e746",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4465.565933227539,
-    "y": 809.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4467.565933227539,
+    "y": 760.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3bb3037a.178754",
+    "id": "bb2a4685.ff5b48",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3543.566665649414,
-    "y": 1232.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3545.566665649414,
+    "y": 1183.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "10e4f75f.914479"
+        "8f64a837.4a5cd8"
       ]
     ]
   },
   {
-    "id": "8000d000.35dfa8",
+    "id": "d520358c.dbd16",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3553.057632446289,
-    "y": 1274.8597869873047,
-    "z": "2414cd0b.85dac2",
+    "x": 3555.057632446289,
+    "y": 1225.8597869873047,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c201e6b8.a3178"
+        "7a345f50.11385"
       ]
     ]
   },
   {
-    "id": "89805004.2ac398",
+    "id": "59ef9877.d005",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3541.566665649414,
-    "y": 1321.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3543.566665649414,
+    "y": 1272.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f43a00.5422b6"
+        "de9d99cd.adc298"
       ]
     ]
   },
   {
-    "id": "7d1a072.a69ea78",
+    "id": "487ac0b4.4acab8",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3243.566665649414,
-    "y": 1194.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3245.566665649414,
+    "y": 1145.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "8abc6705.827928",
+    "id": "21946f52.f16938",
     "type": "save",
     "name": "get p-interface-src from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3286.566665649414,
-    "y": 1259.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3288.566665649414,
+    "y": 1210.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3bb3037a.178754",
-        "8000d000.35dfa8",
-        "89805004.2ac398"
+        "bb2a4685.ff5b48",
+        "d520358c.dbd16",
+        "59ef9877.d005"
       ]
     ]
   },
   {
-    "id": "be414195.9b77c",
+    "id": "3d294d62.516b2a",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3275.566665649414,
-    "y": 1109.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3277.566665649414,
+    "y": 1060.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c53ee6d9.d92aa8",
-        "b00b21f6.61a17"
+        "a73d10a4.af1e28",
+        "79cd7ec1.3557b8"
       ]
     ]
   },
   {
-    "id": "b00b21f6.61a17",
+    "id": "79cd7ec1.3557b8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3498.566665649414,
-    "y": 1095.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3500.566665649414,
+    "y": 1046.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "42f02ac3.9ec4a4"
+        "9aeedd68.ffa8d8"
       ]
     ]
   },
   {
-    "id": "c53ee6d9.d92aa8",
+    "id": "a73d10a4.af1e28",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3500.566665649414,
-    "y": 1128.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3502.566665649414,
+    "y": 1079.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "dd03ebfe.8dbb"
+        "df8ae871.d54098"
       ]
     ]
   },
   {
-    "id": "10e4f75f.914479",
+    "id": "8f64a837.4a5cd8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3716.233169555664,
-    "y": 1231.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3718.233169555664,
+    "y": 1182.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e44801ab.1590c8",
-        "fa4a5699.5e244"
+        "fbb3abd1.b96e9",
+        "abe82eb0.0cab"
       ]
     ]
   },
   {
-    "id": "c201e6b8.a3178",
+    "id": "7a345f50.11385",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3706.6290435791016,
-    "y": 1278.145523071289,
-    "z": "2414cd0b.85dac2",
+    "x": 3708.6290435791016,
+    "y": 1229.145523071289,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "f43a00.5422b6",
+    "id": "de9d99cd.adc298",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3710.566665649414,
-    "y": 1322.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3712.566665649414,
+    "y": 1273.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e44801ab.1590c8",
+    "id": "fbb3abd1.b96e9",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3980.566665649414,
-    "y": 1282.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3982.566665649414,
+    "y": 1233.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "16568eac.f132a9",
-        "e40b1917.8979d8"
+        "e3260a1d.15ae2",
+        "378a4b05.ba3ff4"
       ]
     ]
   },
   {
-    "id": "e40b1917.8979d8",
+    "id": "378a4b05.ba3ff4",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4156.566665649414,
-    "y": 1332.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4158.566665649414,
+    "y": 1283.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ac556463.ec12b8"
+        "7538291f.829488"
       ]
     ]
   },
   {
-    "id": "16568eac.f132a9",
+    "id": "e3260a1d.15ae2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4158.566665649414,
-    "y": 1396.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4160.566665649414,
+    "y": 1347.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "97de31bb.b9a118"
+        "25aab61c.c2472a"
       ]
     ]
   },
   {
-    "id": "97de31bb.b9a118",
+    "id": "25aab61c.c2472a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4320.566665649414,
-    "y": 1392.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4322.566665649414,
+    "y": 1343.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "ac556463.ec12b8",
+    "id": "7538291f.829488",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4321.566665649414,
-    "y": 1329.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4323.566665649414,
+    "y": 1280.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3ab9a413.979aa4",
-        "75cbb82a.35584"
+        "32fabbd2.bab7c4",
+        "d6bf1e67.ba86d8"
       ]
     ]
   },
   {
-    "id": "dd03ebfe.8dbb",
+    "id": "df8ae871.d54098",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3643.566665649414,
-    "y": 1125.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3645.566665649414,
+    "y": 1076.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "42f02ac3.9ec4a4",
+    "id": "9aeedd68.ffa8d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3646.566665649414,
-    "y": 1088.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3648.566665649414,
+    "y": 1039.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6046ec7d.2c3dac",
-        "942aecd4.e6d53"
+        "12c81e56.7fa00a",
+        "87e2ebef.10b6c8"
       ]
     ]
   },
   {
-    "id": "6046ec7d.2c3dac",
+    "id": "12c81e56.7fa00a",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3820.566665649414,
-    "y": 1044.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3822.566665649414,
+    "y": 995.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fa4a5699.5e244",
+    "id": "abe82eb0.0cab",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3692.566665649414,
-    "y": 1413.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3694.566665649414,
+    "y": 1364.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5ae5afb9.f0afa"
+        "67c85268.32dfec"
       ]
     ]
   },
   {
-    "id": "5ae5afb9.f0afa",
+    "id": "67c85268.32dfec",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3973.566665649414,
-    "y": 1408.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3975.566665649414,
+    "y": 1359.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "cfb3ee78.011c4"
+        "22f4aa3d.402fe6"
       ]
     ]
   },
   {
-    "id": "cfb3ee78.011c4",
+    "id": "22f4aa3d.402fe6",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4284.852310180664,
-    "y": 1483.1075286865234,
-    "z": "2414cd0b.85dac2",
+    "x": 4286.852310180664,
+    "y": 1434.1075286865234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "658c69d5.ac8cf"
+        "4ffa151f.c35edc"
       ]
     ]
   },
   {
-    "id": "942aecd4.e6d53",
+    "id": "87e2ebef.10b6c8",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3835.566665649414,
-    "y": 1155.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3837.566665649414,
+    "y": 1106.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7f200322.76207c",
-        "80c4e01c.7c07b8",
-        "71ab8804.94dd5"
+        "46c6e0d9.d87168",
+        "d98bf1e8.c353c8",
+        "76b578a.409ac88"
       ]
     ]
   },
   {
-    "id": "7f200322.76207c",
+    "id": "46c6e0d9.d87168",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4031.0667877197266,
-    "y": 1107.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4033.0667877197266,
+    "y": 1058.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a99ba4fa.4ed1e8"
+        "7281b691.ff84e"
       ]
     ]
   },
   {
-    "id": "80c4e01c.7c07b8",
+    "id": "d98bf1e8.c353c8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4023.0667877197266,
-    "y": 1162.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4025.0667877197266,
+    "y": 1113.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "848293a0.71bc7"
+        "552f36f.a1294c8"
       ]
     ]
   },
   {
-    "id": "71ab8804.94dd5",
+    "id": "76b578a.409ac88",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4028.0667877197266,
-    "y": 1219.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4030.0667877197266,
+    "y": 1170.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f97b023f.267278"
+        "2fdf3cab.68e914"
       ]
     ]
   },
   {
-    "id": "f97b023f.267278",
+    "id": "2fdf3cab.68e914",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4180.066787719727,
-    "y": 1220.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4182.066787719727,
+    "y": 1171.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "848293a0.71bc7",
+    "id": "552f36f.a1294c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4191.066787719727,
-    "y": 1165.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4193.066787719727,
+    "y": 1116.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "a99ba4fa.4ed1e8",
+    "id": "7281b691.ff84e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4175.449111938477,
-    "y": 1104.941421508789,
-    "z": "2414cd0b.85dac2",
+    "x": 4177.449111938477,
+    "y": 1055.941421508789,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b504251b.7f7448"
+        "b1882a27.4b4ab8"
       ]
     ]
   },
   {
-    "id": "b504251b.7f7448",
+    "id": "b1882a27.4b4ab8",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4398.566909790039,
-    "y": 1243.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4400.566909790039,
+    "y": 1194.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "52eb8aa1.8ff274"
+        "491c14e2.9cc81c"
       ]
     ]
   },
   {
-    "id": "75cbb82a.35584",
+    "id": "d6bf1e67.ba86d8",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
     "comments": "",
-    "x": 4491.566665649414,
-    "y": 1287.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4493.566665649414,
+    "y": 1238.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3ab9a413.979aa4",
+    "id": "32fabbd2.bab7c4",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
     "comments": "",
-    "x": 4492.566665649414,
-    "y": 1395.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4494.566665649414,
+    "y": 1346.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b9ee3c01.a1e29",
+    "id": "8e04ebf5.eee41",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4493.566665649414,
-    "y": 1344.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4495.566665649414,
+    "y": 1295.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "658c69d5.ac8cf",
+    "id": "4ffa151f.c35edc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4491.683853149414,
-    "y": 1483.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 4493.683853149414,
+    "y": 1434.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "aadf2b0a.6db3d",
-        "61bc8b6e.22a73c",
-        "30cdefe5.b26318"
+        "c59a3a79.308e08",
+        "e4841ff6.3e7e08",
+        "5d11c4a6.df68cc"
       ]
     ]
   },
   {
-    "id": "aadf2b0a.6db3d",
+    "id": "c59a3a79.308e08",
     "type": "set",
     "name": "set source ttp-id",
     "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4706.683853149414,
-    "y": 1445.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 4708.683853149414,
+    "y": 1396.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "61bc8b6e.22a73c",
+    "id": "e4841ff6.3e7e08",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4703.683853149414,
-    "y": 1484.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 4705.683853149414,
+    "y": 1435.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fd577e5f.db1ba"
+        "766fb473.2a452c"
       ]
     ]
   },
   {
-    "id": "30cdefe5.b26318",
+    "id": "5d11c4a6.df68cc",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4659.183853149414,
-    "y": 1526.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 4661.183853149414,
+    "y": 1477.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fd577e5f.db1ba",
+    "id": "766fb473.2a452c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4884.183853149414,
-    "y": 1483.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 4886.183853149414,
+    "y": 1434.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fa2d5efd.88ba08"
+        "91f25d9a.835d38"
       ]
     ]
   },
   {
-    "id": "ded6fafe.4074f8",
+    "id": "cce9c2da.fea888",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4796.566909790039,
-    "y": 1247.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4798.566909790039,
+    "y": 1198.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "afabdc9f.6d39f8"
+        "7f9c2923.089b6"
       ]
     ]
   },
   {
-    "id": "afabdc9f.6d39f8",
+    "id": "7f9c2923.089b6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4973.566909790039,
-    "y": 1239.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4975.566909790039,
+    "y": 1190.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d564a26c.9a8558",
-        "3ff41e19.f0e01a"
+        "713d1c50.32082c",
+        "1fe6b234.c7fd7e"
       ]
     ]
   },
   {
-    "id": "52eb8aa1.8ff274",
+    "id": "491c14e2.9cc81c",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4593.566909790039,
-    "y": 1243.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4595.566909790039,
+    "y": 1194.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ded6fafe.4074f8",
-        "f56e57c9.6506a8"
+        "cce9c2da.fea888",
+        "181e2b72.5adced"
       ]
     ]
   },
   {
-    "id": "f56e57c9.6506a8",
+    "id": "181e2b72.5adced",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4662.566909790039,
-    "y": 1317.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4664.566909790039,
+    "y": 1268.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f21dcf5d.336178"
+        "5ef7391a.b132a8"
       ]
     ]
   },
   {
-    "id": "f21dcf5d.336178",
+    "id": "5ef7391a.b132a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4858.566909790039,
-    "y": 1317.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4860.566909790039,
+    "y": 1268.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "132ca45a.eb5e34"
+        "1d2757a1.42bf3"
       ]
     ]
   },
   {
-    "id": "fa2d5efd.88ba08",
+    "id": "91f25d9a.835d38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5042.183853149414,
-    "y": 1483.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 5044.183853149414,
+    "y": 1434.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b951f264.559ce"
+        "83fb3b54.d5c3d"
       ]
     ]
   },
   {
-    "id": "b951f264.559ce",
+    "id": "83fb3b54.d5c3d",
     "type": "set",
     "name": "set source tunnel tp ip",
     "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5249.183853149414,
-    "y": 1483.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 5251.183853149414,
+    "y": 1434.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3ff41e19.f0e01a",
+    "id": "1fe6b234.c7fd7e",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5198.566909790039,
-    "y": 1235.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5200.566909790039,
+    "y": 1186.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a40a7be5.2be498",
-        "d6b97145.3bf148",
-        "ea85892.20b4178"
+        "f445a11a.71bc2",
+        "1ca051d1.62d8c6",
+        "b5779702.ec152"
       ]
     ]
   },
   {
-    "id": "d564a26c.9a8558",
+    "id": "713d1c50.32082c",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainA id",
     "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5228.566909790039,
-    "y": 1183.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5230.566909790039,
+    "y": 1134.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "a40a7be5.2be498",
+    "id": "f445a11a.71bc2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5408.566909790039,
-    "y": 1226.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5410.566909790039,
+    "y": 1177.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d68ba68a.be89b8"
+        "97cfd71c.893b9"
       ]
     ]
   },
   {
-    "id": "d6b97145.3bf148",
+    "id": "1ca051d1.62d8c6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5400.566909790039,
-    "y": 1281.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5402.566909790039,
+    "y": 1232.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7c894f76.5a638"
+        "f71936fa.5c6ed8"
       ]
     ]
   },
   {
-    "id": "ea85892.20b4178",
+    "id": "b5779702.ec152",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5405.566909790039,
-    "y": 1338.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5407.566909790039,
+    "y": 1289.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d37deda4.10b24"
+        "2f95de59.c21562"
       ]
     ]
   },
   {
-    "id": "d37deda4.10b24",
+    "id": "2f95de59.c21562",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5557.566909790039,
-    "y": 1339.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5559.566909790039,
+    "y": 1290.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7c894f76.5a638",
+    "id": "f71936fa.5c6ed8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5568.566909790039,
-    "y": 1284.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5570.566909790039,
+    "y": 1235.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d68ba68a.be89b8",
+    "id": "97cfd71c.893b9",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5552.949234008789,
-    "y": 1223.941421508789,
-    "z": "2414cd0b.85dac2",
+    "x": 5554.949234008789,
+    "y": 1174.941421508789,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ff0f9afc.082318"
+        "3725abc9.8fe81c"
       ]
     ]
   },
   {
-    "id": "132ca45a.eb5e34",
+    "id": "1d2757a1.42bf3",
     "type": "set",
     "name": "set domainA ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5121.566909790039,
-    "y": 1320.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5123.566909790039,
+    "y": 1271.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "ff0f9afc.082318",
+    "id": "3725abc9.8fe81c",
     "type": "set",
     "name": "set controller domainA data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5739.566909790039,
-    "y": 1220.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5741.566909790039,
+    "y": 1171.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c100f1cf.959b9",
+    "id": "67aa7525.7bae1c",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4380.566177368164,
-    "y": 455.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 4382.566177368164,
+    "y": 406.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "476d7cc2.2b9e3c",
+    "id": "18cc69a3.9aa206",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4371.566177368164,
-    "y": 553.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4373.566177368164,
+    "y": 504.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2bc1e64e.d59032",
+    "id": "47912c0e.49beac",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4205.566177368164,
-    "y": 461.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 4207.566177368164,
+    "y": 412.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fcdd9b76.8fa5f8",
-        "c100f1cf.959b9"
+        "8d16f671.5b9d4",
+        "67aa7525.7bae1c"
       ]
     ]
   },
   {
-    "id": "453522b8.5dbac4",
+    "id": "eb199d13.e7038",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4211.566177368164,
-    "y": 525.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4213.566177368164,
+    "y": 476.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a44710c1.f4b4c8",
-        "476d7cc2.2b9e3c"
+        "5b74c380.dcc8d4",
+        "18cc69a3.9aa206"
       ]
     ]
   },
   {
-    "id": "f5a4f507.86b44",
+    "id": "ab328b3c.b23248",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4225.565933227539,
-    "y": 689.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4227.565933227539,
+    "y": 640.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5b86250b.1183b4",
-        "ee4f808.01bcf8"
+        "142c8c33.b05574",
+        "53d3049.af6e8fc"
       ]
     ]
   },
   {
-    "id": "8148cd30.75333",
+    "id": "4b33e71e.9ca98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4228.565933227539,
-    "y": 742.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4230.565933227539,
+    "y": 693.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "154b4953.ab9fcf",
-        "f5de4dab.b0e37"
+        "fadd6db5.8e746",
+        "2cd10454.6fd4ec"
       ]
     ]
   },
   {
-    "id": "ee4f808.01bcf8",
+    "id": "53d3049.af6e8fc",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4447.565933227539,
-    "y": 756.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4449.565933227539,
+    "y": 707.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "f5de4dab.b0e37",
+    "id": "2cd10454.6fd4ec",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4450.565933227539,
-    "y": 847.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4452.565933227539,
+    "y": 798.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fba24b6a.44ade",
+    "id": "4fd998b7.acd798",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3606.566665649414,
-    "y": 1793.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3608.566665649414,
+    "y": 1744.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6ab1e648.0c2108",
-        "e98d774e.c7639"
+        "de0c38ee.f76ef8",
+        "25935580.28bbea"
       ]
     ]
   },
   {
-    "id": "e055a781.15033",
+    "id": "170f6ee1.76ff39",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3433.900161743164,
-    "y": 1794.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3435.900161743164,
+    "y": 1745.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fba24b6a.44ade"
+        "4fd998b7.acd798"
       ]
     ]
   },
   {
-    "id": "33450ab2.d72e86",
+    "id": "6aad81bd.cb4268",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3443.391128540039,
-    "y": 1836.8597869873047,
-    "z": "2414cd0b.85dac2",
+    "x": 3445.391128540039,
+    "y": 1787.8597869873047,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "279c15e9.8df2d2"
+        "54bd0023.9501c8"
       ]
     ]
   },
   {
-    "id": "14684e53.bc0682",
+    "id": "e02aca99.393958",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3431.900161743164,
-    "y": 1883.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3433.900161743164,
+    "y": 1834.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7cf32ea0.24f2e8"
+        "20e4fbbc.46dd64"
       ]
     ]
   },
   {
-    "id": "279c15e9.8df2d2",
+    "id": "54bd0023.9501c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3596.9625396728516,
-    "y": 1840.145523071289,
-    "z": "2414cd0b.85dac2",
+    "x": 3598.9625396728516,
+    "y": 1791.145523071289,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7cf32ea0.24f2e8",
+    "id": "20e4fbbc.46dd64",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3600.900161743164,
-    "y": 1884.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3602.900161743164,
+    "y": 1835.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6ab1e648.0c2108",
+    "id": "de0c38ee.f76ef8",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3892.900161743164,
-    "y": 1797.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3894.900161743164,
+    "y": 1748.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "daabf3e5.97bed8",
-        "1e7b26c7.e7a121"
+        "36c6c2be.762bee",
+        "9dad2b66.a09d3"
       ]
     ]
   },
   {
-    "id": "1e7b26c7.e7a121",
+    "id": "9dad2b66.a09d3",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4115.900161743164,
-    "y": 1752.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4117.900161743164,
+    "y": 1703.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "acfb9237.1cd6c8"
+        "36a66ce5.93da74"
       ]
     ]
   },
   {
-    "id": "daabf3e5.97bed8",
+    "id": "36c6c2be.762bee",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4117.900161743164,
-    "y": 1816.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4119.900161743164,
+    "y": 1767.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2bdd8bed.c7bcd4"
+        "4c6cb6f3.89667"
       ]
     ]
   },
   {
-    "id": "2bdd8bed.c7bcd4",
+    "id": "4c6cb6f3.89667",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4276.900161743164,
-    "y": 1835.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4278.900161743164,
+    "y": 1786.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "acfb9237.1cd6c8",
+    "id": "36a66ce5.93da74",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4280.900161743164,
-    "y": 1749.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4282.900161743164,
+    "y": 1700.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "26977aa5.25dd2e",
-        "72fafff.27e4d"
+        "5a5e37bd.3076e",
+        "6e346008.c0c8d"
       ]
     ]
   },
   {
-    "id": "da60761c.d9f04",
+    "id": "63476979.041bd8",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3205.900161743164,
-    "y": 1829.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3207.900161743164,
+    "y": 1780.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e055a781.15033",
-        "33450ab2.d72e86",
-        "14684e53.bc0682"
+        "170f6ee1.76ff39",
+        "6aad81bd.cb4268",
+        "e02aca99.393958"
       ]
     ]
   },
   {
-    "id": "4b7ae9f1.8aec68",
+    "id": "dbdf27a7.fc5e4",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3166.900161743164,
-    "y": 1773.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3168.900161743164,
+    "y": 1724.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "5f587418.c46734",
+    "id": "35531714.c0e89",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3218.900161743164,
-    "y": 1575.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3220.900161743164,
+    "y": 1526.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f9cab6f8.ebc12",
-        "1ca010c1.fd862f"
+        "1026191c.92617f",
+        "af47cd19.1e85a"
       ]
     ]
   },
   {
-    "id": "1ca010c1.fd862f",
+    "id": "af47cd19.1e85a",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3441.900161743164,
-    "y": 1561.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3443.900161743164,
+    "y": 1512.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c0d41dc2.2e9ce8"
+        "79bebb4c.23a30c"
       ]
     ]
   },
   {
-    "id": "f9cab6f8.ebc12",
+    "id": "1026191c.92617f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3443.900161743164,
-    "y": 1594.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3445.900161743164,
+    "y": 1545.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3ccca278.68559e"
+        "f83e847f.4ec13"
       ]
     ]
   },
   {
-    "id": "3ccca278.68559e",
+    "id": "f83e847f.4ec13",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3586.900161743164,
-    "y": 1591.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3588.900161743164,
+    "y": 1542.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c0d41dc2.2e9ce8",
+    "id": "79bebb4c.23a30c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3589.900161743164,
-    "y": 1554.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3591.900161743164,
+    "y": 1505.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c99a0449.e56c2",
-        "7083ce51.93a92"
+        "3fb5f800.679e",
+        "4b785447.3b4bdc"
       ]
     ]
   },
   {
-    "id": "c99a0449.e56c2",
+    "id": "3fb5f800.679e",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3783.900161743164,
-    "y": 1557.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3785.900161743164,
+    "y": 1508.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e98d774e.c7639",
+    "id": "25935580.28bbea",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3836.900161743164,
-    "y": 1916.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3838.900161743164,
+    "y": 1867.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fd084df8.e98c58"
+        "e6fe79a3.e9ea5"
       ]
     ]
   },
   {
-    "id": "fd084df8.e98c58",
+    "id": "e6fe79a3.e9ea5",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4042.900161743164,
-    "y": 1916.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4044.900161743164,
+    "y": 1867.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6cb7488a.a222b"
+        "122e4fb.7ae86b"
       ]
     ]
   },
   {
-    "id": "6cb7488a.a222b",
+    "id": "122e4fb.7ae86b",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4260.185806274414,
-    "y": 1915.1075286865234,
-    "z": "2414cd0b.85dac2",
+    "x": 4262.185806274414,
+    "y": 1866.1075286865234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "350b3e58.c792ea"
+        "837cca48.ec2188"
       ]
     ]
   },
   {
-    "id": "7083ce51.93a92",
+    "id": "4b785447.3b4bdc",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3805.900161743164,
-    "y": 1625.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3807.900161743164,
+    "y": 1576.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5d1bde7f.a2e988",
-        "568d456e.886424",
-        "4559cac2.72065c"
+        "c81ddea8.acca2",
+        "677cee1e.585708",
+        "5b3f6a5a.a599cc"
       ]
     ]
   },
   {
-    "id": "5d1bde7f.a2e988",
+    "id": "c81ddea8.acca2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4001.4002838134766,
-    "y": 1577.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4003.4002838134766,
+    "y": 1528.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7231501f.55645"
+        "4e15930.1f2346c"
       ]
     ]
   },
   {
-    "id": "568d456e.886424",
+    "id": "677cee1e.585708",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3993.4002838134766,
-    "y": 1632.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3995.4002838134766,
+    "y": 1583.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1fe97a53.6160f6"
+        "77c7f195.03bd88"
       ]
     ]
   },
   {
-    "id": "4559cac2.72065c",
+    "id": "5b3f6a5a.a599cc",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3998.4002838134766,
-    "y": 1689.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4000.4002838134766,
+    "y": 1640.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c16f7b5a.3ed008"
+        "44cfcdb.eef3bb4"
       ]
     ]
   },
   {
-    "id": "c16f7b5a.3ed008",
+    "id": "44cfcdb.eef3bb4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4150.400283813477,
-    "y": 1690.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4152.400283813477,
+    "y": 1641.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1fe97a53.6160f6",
+    "id": "77c7f195.03bd88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4161.400283813477,
-    "y": 1635.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4163.400283813477,
+    "y": 1586.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7231501f.55645",
+    "id": "4e15930.1f2346c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4145.782608032227,
-    "y": 1574.9415435791016,
-    "z": "2414cd0b.85dac2",
+    "x": 4147.782608032227,
+    "y": 1525.9415435791016,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c3bee3fa.d3a9e"
+        "3bb66f6b.2423e"
       ]
     ]
   },
   {
-    "id": "26977aa5.25dd2e",
+    "id": "5a5e37bd.3076e",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
     "comments": "",
-    "x": 4450.900161743164,
-    "y": 1710.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4452.900161743164,
+    "y": 1661.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "72fafff.27e4d",
+    "id": "6e346008.c0c8d",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
     "comments": "",
-    "x": 4451.900161743164,
-    "y": 1815.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4453.900161743164,
+    "y": 1766.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3c2418c7.4572c8",
+    "id": "f684cc96.93a36",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4446.900161743164,
-    "y": 1764.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4448.900161743164,
+    "y": 1715.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "350b3e58.c792ea",
+    "id": "837cca48.ec2188",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4467.017349243164,
-    "y": 1904.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 4469.017349243164,
+    "y": 1855.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5da8c5d3.b9f55c",
-        "1242abaf.e56384",
-        "ed6b22ec.e3cd3"
+        "4370bd5a.9f5934",
+        "1bda5a20.b54946",
+        "7ecac2a.84cd6bc"
       ]
     ]
   },
   {
-    "id": "5da8c5d3.b9f55c",
+    "id": "4370bd5a.9f5934",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4682.017349243164,
-    "y": 1866.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 4684.017349243164,
+    "y": 1817.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1242abaf.e56384",
+    "id": "1bda5a20.b54946",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4679.017349243164,
-    "y": 1905.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 4681.017349243164,
+    "y": 1856.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "44aa2b45.5157d4"
+        "e1da362d.0aaf38"
       ]
     ]
   },
   {
-    "id": "ed6b22ec.e3cd3",
+    "id": "7ecac2a.84cd6bc",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4634.517349243164,
-    "y": 1947.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 4636.517349243164,
+    "y": 1898.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "44aa2b45.5157d4",
+    "id": "e1da362d.0aaf38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4859.517349243164,
-    "y": 1904.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 4861.517349243164,
+    "y": 1855.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "cd8ad202.8d323"
+        "4842e5f.6c9081c"
       ]
     ]
   },
   {
-    "id": "cd8ad202.8d323",
+    "id": "4842e5f.6c9081c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5017.517349243164,
-    "y": 1904.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 5019.517349243164,
+    "y": 1855.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3d8ba8c1.7feef8"
+        "d2ac7d5.8c2918"
       ]
     ]
   },
   {
-    "id": "3d8ba8c1.7feef8",
+    "id": "d2ac7d5.8c2918",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5224.517349243164,
-    "y": 1904.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 5226.517349243164,
+    "y": 1855.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "64248373.c0f1e4",
+    "id": "d8873c57.456df",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4727.900161743164,
-    "y": 1593.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4729.900161743164,
+    "y": 1544.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ebf5d941.b9751"
+        "bf2c165b.0d277"
       ]
     ]
   },
   {
-    "id": "ebf5d941.b9751",
+    "id": "bf2c165b.0d277",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4904.900161743164,
-    "y": 1585.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4906.900161743164,
+    "y": 1536.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5f21b6d8.97a7a8",
-        "a66d8cdf.7774c"
+        "7f001b92.6c2014",
+        "47ea9781.67241"
       ]
     ]
   },
   {
-    "id": "c3bee3fa.d3a9e",
+    "id": "3bb66f6b.2423e",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4329.900161743164,
-    "y": 1589.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4331.900161743164,
+    "y": 1540.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "768c4246.3384b4"
+        "c9ef5f55.13159"
       ]
     ]
   },
   {
-    "id": "768c4246.3384b4",
+    "id": "c9ef5f55.13159",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4524.900161743164,
-    "y": 1589.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4526.900161743164,
+    "y": 1540.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "64248373.c0f1e4",
-        "d4d1382b.4bf1a8"
+        "d8873c57.456df",
+        "e212cfa3.d9b94"
       ]
     ]
   },
   {
-    "id": "a66d8cdf.7774c",
+    "id": "47ea9781.67241",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5112.900161743164,
-    "y": 1592.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5114.900161743164,
+    "y": 1543.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "798943c1.0b7f24",
-        "dbd1300d.b2d4d8",
-        "c22228e5.5f04a"
+        "46f5dd83.067904",
+        "97b572f2.cabba",
+        "90953f01.0039c"
       ]
     ]
   },
   {
-    "id": "4ab59831.7b5d28",
+    "id": "666bc3f3.f942ac",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4906.900161743164,
-    "y": 1658.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4908.900161743164,
+    "y": 1609.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b63665cd.e9bca8"
+        "af972400.78ec68"
       ]
     ]
   },
   {
-    "id": "d4d1382b.4bf1a8",
+    "id": "e212cfa3.d9b94",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4729.900161743164,
-    "y": 1666.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4731.900161743164,
+    "y": 1617.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4ab59831.7b5d28"
+        "666bc3f3.f942ac"
       ]
     ]
   },
   {
-    "id": "5f21b6d8.97a7a8",
+    "id": "7f001b92.6c2014",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainB id",
     "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5142.900161743164,
-    "y": 1540.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5144.900161743164,
+    "y": 1491.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b63665cd.e9bca8",
+    "id": "af972400.78ec68",
     "type": "set",
     "name": "set domainB ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5088.900161743164,
-    "y": 1722.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5090.900161743164,
+    "y": 1673.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "798943c1.0b7f24",
+    "id": "46f5dd83.067904",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5322.900161743164,
-    "y": 1583.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5324.900161743164,
+    "y": 1534.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4408e043.c54b2"
+        "9ccd655c.46849"
       ]
     ]
   },
   {
-    "id": "dbd1300d.b2d4d8",
+    "id": "97b572f2.cabba",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5314.900161743164,
-    "y": 1638.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5316.900161743164,
+    "y": 1589.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "90ad08da.8c4d18"
+        "4f6c8e9e.87ef88"
       ]
     ]
   },
   {
-    "id": "c22228e5.5f04a",
+    "id": "90953f01.0039c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5319.900161743164,
-    "y": 1695.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5321.900161743164,
+    "y": 1646.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "de4c591d.7f2f48"
+        "5fa05e22.fdafa8"
       ]
     ]
   },
   {
-    "id": "de4c591d.7f2f48",
+    "id": "5fa05e22.fdafa8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5471.900161743164,
-    "y": 1696.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5473.900161743164,
+    "y": 1647.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "90ad08da.8c4d18",
+    "id": "4f6c8e9e.87ef88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5482.900161743164,
-    "y": 1641.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5484.900161743164,
+    "y": 1592.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4408e043.c54b2",
+    "id": "9ccd655c.46849",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5467.282485961914,
-    "y": 1580.9415435791016,
-    "z": "2414cd0b.85dac2",
+    "x": 5469.282485961914,
+    "y": 1531.9415435791016,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2133344e.893bec"
+        "9bc41fad.100098"
       ]
     ]
   },
   {
-    "id": "2133344e.893bec",
+    "id": "9bc41fad.100098",
     "type": "set",
     "name": "set controller domainB data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5681.900161743164,
-    "y": 1577.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5683.900161743164,
+    "y": 1528.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fd9bd7ab.c92bd8",
+    "id": "aac95e09.ab90b8",
     "type": "set",
     "name": "set LEAF stuff",
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
     "comments": "",
-    "x": 3270.566665649414,
-    "y": 1399.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3272.566665649414,
+    "y": 1350.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6a9b0f1.984457",
+    "id": "c158f2ac.9bf138",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4547.566177368164,
-    "y": 539.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4549.566177368164,
+    "y": 490.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2f61d3b4.f418bc",
+    "id": "1c9be409.368d34",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4615.565933227539,
-    "y": 741.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4617.565933227539,
+    "y": 692.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b37c5dee.6ca208",
+    "id": "d36e02ea.349dc",
     "type": "set",
     "name": "set ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
     "comments": "",
-    "x": 3166.566665649414,
-    "y": 1960.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3168.566665649414,
+    "y": 1911.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1bc9df09.d67e59",
+    "id": "ad429900.4c716",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3428.566665649414,
-    "y": 2873.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3430.566665649414,
+    "y": 2824.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "6e895a21.1d4594",
+    "id": "456e0186.bd36f8",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3305.566665649414,
-    "y": 2983.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3307.566665649414,
+    "y": 2934.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "cef17f20.edf7e8",
-        "6dda4254.968224"
+        "1a6260f2.b38e77",
+        "151ade37.c8cbba"
       ]
     ]
   },
   {
-    "id": "cef17f20.edf7e8",
+    "id": "1a6260f2.b38e77",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3489.566665649414,
-    "y": 2962.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3491.566665649414,
+    "y": 2913.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d8fe6f8d.d7595"
+        "ba23a41e.50085"
       ]
     ]
   },
   {
-    "id": "6dda4254.968224",
+    "id": "151ade37.c8cbba",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3025.566665649414,
-    "y": 4548.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3027.566665649414,
+    "y": 4499.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d77e7161.5348c8"
+        "f3de805.eee03"
       ]
     ]
   },
   {
-    "id": "300daee4.3b0352",
+    "id": "e429a394.1622b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3536.566665649414,
-    "y": 5133.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3538.566665649414,
+    "y": 5084.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "318b9beb.21378c",
-        "1992e083.76e587",
-        "aaed5b46.7e8eb",
-        "c7aee100.ec3998",
-        "b969bbc7.e53528",
-        "54f08fa.71777f"
+        "ee345eb7.dd48b",
+        "78110e1d.34a828",
+        "399c8052.14794",
+        "7855b68f.e847e",
+        "7a90992b.99ef7",
+        "2987a87c.d9af38"
       ]
     ]
   },
   {
-    "id": "d8fe6f8d.d7595",
+    "id": "ba23a41e.50085",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6202.566665649414,
-    "y": 1782.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6204.566665649414,
+    "y": 1733.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1a1f2023.50c9f8",
-        "e814ac2.6d99cd",
-        "27a9213f.e489d6",
-        "904795f3.631878",
-        "c284bcb.2b7c44",
-        "1d8604a2.381ee3",
-        "5946c797.be74d",
-        "a66844b6.e099c",
-        "37c7ecba.efaa4c",
-        "72cc1cfb.a77694",
-        "1e88893b.a079df",
-        "f9c59fe9.ee503",
-        "4573e73f.58afa8",
-        "c53261d3.0987a8",
-        "f109d109.e8eb",
-        "4c9e5bd3.54a49c",
-        "e1cb1e55.b0357",
-        "e177a7a3.e48c7",
-        "6fa889cc.c9cce",
-        "c91e3a5e.c6511",
-        "162cf27b.802c36",
-        "5a5c80f6.6318b8"
+        "18ef4940.2cc947",
+        "10bd34b9.d586b3",
+        "c874118.0dda17",
+        "e01a8555.4482f8",
+        "48a8a99c.f1479",
+        "65f7f754.67c0f8",
+        "a9eb431c.c27b3",
+        "9d81d981.8859c8",
+        "9ef240b6.5338",
+        "56d51e0c.3fbb48",
+        "f1e4ada5.0d8a28",
+        "9aa0ecc9.b21a38",
+        "1d111c3e.37b394",
+        "b8b78e91.784a68",
+        "43c8a40f.539994",
+        "b8201609.6ece6",
+        "6d3e15fd.90249c",
+        "7bb73f8a.b1ab48",
+        "c917b2c2.68a8d",
+        "f8b29c6c.19b2e8",
+        "374c089f.fa2538",
+        "c9cb4066.4924"
       ]
     ]
   },
   {
-    "id": "37c7ecba.efaa4c",
+    "id": "9ef240b6.5338",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainB",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6573.566665649414,
-    "y": 1705.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6575.566665649414,
+    "y": 1656.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "1a1f2023.50c9f8",
+    "id": "18ef4940.2cc947",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6527.566665649414,
-    "y": 1803.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6529.566665649414,
+    "y": 1754.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e814ac2.6d99cd",
+    "id": "10bd34b9.d586b3",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6663.566665649414,
-    "y": 1850.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6665.566665649414,
+    "y": 1801.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "2ad7ea9.f129796",
+    "id": "577f8c89.2e206c",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6494.566665649414,
-    "y": 1654.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6496.566665649414,
+    "y": 1605.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "942a9804.0c79c",
+    "id": "267ba619.c9af8a",
     "type": "comment",
     "name": "create middle man connectivity and ...",
     "info": "1- create middle man connectivity\n2- create relation with all connectivities\n   in the path\n3- put srcTtp (+dstTtp) somewhere in the\n   vpn-binding -> this is for later on to find\n   which OTN tunnel's bandwidth has to be increased.\n5- create UNIs\n4- create relationship to UNIs",
     "comments": "",
-    "x": 6990.566665649414,
-    "y": 2390.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6992.566665649414,
+    "y": 2341.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "27a9213f.e489d6",
+    "id": "c874118.0dda17",
     "type": "execute",
     "name": "execute UUID generator for connectivity middle-man",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6554.566665649414,
-    "y": 2429.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6556.566665649414,
+    "y": 2380.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "904795f3.631878",
+    "id": "e01a8555.4482f8",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6502.566665649414,
-    "y": 2480.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6504.566665649414,
+    "y": 2431.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c284bcb.2b7c44",
+    "id": "48a8a99c.f1479",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-middle-man-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-middle-man-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6638.566665649414,
-    "y": 2527.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6640.566665649414,
+    "y": 2478.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "887b2dbb.8eb65",
+    "id": "52e24832.034e88",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 6495.566665649414,
-    "y": 2389.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6497.566665649414,
+    "y": 2340.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "8252fd61.bfc208",
+    "id": "debe9e97.cd8f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6925.566665649414,
-    "y": 2586.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6927.566665649414,
+    "y": 2537.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "1d8604a2.381ee3",
+    "id": "65f7f754.67c0f8",
     "type": "save",
     "name": "get middle-man connectivity from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $prop.connectivity-middle-man-uuid\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"middle-man-conn\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 6516.566665649414,
-    "y": 2633.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6518.566665649414,
+    "y": 2584.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "68a11957.d1e54",
-        "98ce32f4.8ab98",
-        "ceda9f28.da773"
+        "85091e88.c72c7",
+        "7dba75fe.6c5c54",
+        "3df3f46e.6f2edc"
       ]
     ]
   },
   {
-    "id": "68a11957.d1e54",
+    "id": "85091e88.c72c7",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6763.566665649414,
-    "y": 2587.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6765.566665649414,
+    "y": 2538.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8252fd61.bfc208"
+        "debe9e97.cd8f"
       ]
     ]
   },
   {
-    "id": "98ce32f4.8ab98",
+    "id": "7dba75fe.6c5c54",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6764.057632446289,
-    "y": 2632.8597869873047,
-    "z": "2414cd0b.85dac2",
+    "x": 6766.057632446289,
+    "y": 2583.8597869873047,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9afbaf66.fb0d68"
+        "3c115d7c.ba4cb2"
       ]
     ]
   },
   {
-    "id": "ceda9f28.da773",
+    "id": "3df3f46e.6f2edc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6761.566665649414,
-    "y": 2676.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6763.566665649414,
+    "y": 2627.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3e284ec9.e9b522"
+        "3193d0af.6d5de8"
       ]
     ]
   },
   {
-    "id": "9afbaf66.fb0d68",
+    "id": "3c115d7c.ba4cb2",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 6926.629043579102,
-    "y": 2633.145523071289,
-    "z": "2414cd0b.85dac2",
+    "x": 6928.629043579102,
+    "y": 2584.145523071289,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3e284ec9.e9b522",
+    "id": "3193d0af.6d5de8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 6930.566665649414,
-    "y": 2677.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6932.566665649414,
+    "y": 2628.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "f109d109.e8eb",
+    "id": "43c8a40f.539994",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6570.566665649414,
-    "y": 2949.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6572.566665649414,
+    "y": 2900.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "4c9e5bd3.54a49c",
+    "id": "b8201609.6ece6",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6573.566665649414,
-    "y": 2994.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6575.566665649414,
+    "y": 2945.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e177a7a3.e48c7",
+    "id": "7bb73f8a.b1ab48",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6565.566665649414,
-    "y": 2748.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6567.566665649414,
+    "y": 2699.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "6fa889cc.c9cce",
+    "id": "c917b2c2.68a8d",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6567.566665649414,
-    "y": 2795.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6569.566665649414,
+    "y": 2746.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5dea74d5.1b4aa4",
+    "id": "8bd704e.d0521f8",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 6486.566665649414,
-    "y": 2902.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6488.566665649414,
+    "y": 2853.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3dd8554.be5c5aa",
+    "id": "e06e4d85.94c0f8",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4486.566909790039,
-    "y": 5295.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4488.566909790039,
+    "y": 5246.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "318b9beb.21378c",
+    "id": "ee345eb7.dd48b",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3751.566665649414,
-    "y": 5114.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3753.566665649414,
+    "y": 5065.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "37cde52f.e57ab2",
-        "655366f1.7fdc7"
+        "c561431f.f6e0f",
+        "49468e15.59ced"
       ]
     ]
   },
   {
-    "id": "655366f1.7fdc7",
+    "id": "49468e15.59ced",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3923.566665649414,
-    "y": 5111.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3925.566665649414,
+    "y": 5062.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "828433f7.b11a2"
+        "997265fa.7d7f1"
       ]
     ]
   },
   {
-    "id": "37cde52f.e57ab2",
+    "id": "c561431f.f6e0f",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3875.566665649414,
-    "y": 5958.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3877.566665649414,
+    "y": 5909.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e6235853.96452"
+        "e1ebd454.f4cdb8"
       ]
     ]
   },
   {
-    "id": "4ddc3818.58ee88",
+    "id": "604349fc.e0a658",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3936.566665649414,
-    "y": 5081.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3938.566665649414,
+    "y": 5032.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "bc0b6e25.72063",
+    "id": "8edd5f5.78488a",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3946.566665649414,
-    "y": 5916.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3948.566665649414,
+    "y": 5867.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "5946c797.be74d",
+    "id": "a9eb431c.c27b3",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6572.566665649414,
-    "y": 3128.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6574.566665649414,
+    "y": 3079.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "828433f7.b11a2",
+    "id": "997265fa.7d7f1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4099.566665649414,
-    "y": 5113.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4101.566665649414,
+    "y": 5064.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ec3ed36f.33f8e",
-        "2da9765.20a818a",
-        "583fc579.afbe3c",
-        "92f3ada6.6626b",
-        "d0f2c5e0.41cd1",
-        "80308a85.281f5",
-        "3dd8554.be5c5aa",
-        "b727caf7.37ccd",
-        "9d76b5ce.608a08"
+        "bcf60ed5.161338",
+        "8a063d24.55e818",
+        "27d5e3fa.d1fc64",
+        "eb431097.375ee8",
+        "146ee230.44ecc6",
+        "a86e4db4.94773",
+        "e06e4d85.94c0f8",
+        "b311bb82.023748",
+        "f2f4b1c2.9aee8"
       ]
     ]
   },
   {
-    "id": "730f8b58.f71bb4",
+    "id": "5b2e4a79.26fcd4",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5543.566421508789,
-    "y": 5038.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5545.566421508789,
+    "y": 4989.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "ec3ed36f.33f8e",
+    "id": "bcf60ed5.161338",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4345.566909790039,
-    "y": 5794.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4347.566909790039,
+    "y": 5745.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a66844b6.e099c",
+    "id": "9d81d981.8859c8",
     "type": "save",
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6579.566665649414,
-    "y": 2044.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6581.566665649414,
+    "y": 1995.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "723517cc.862aa8",
+    "id": "2ed6ffae.15a9",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid=tmp.ROOT.uni-p-interface-long",
     "xml": "<set>\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />\n",
     "comments": "",
-    "x": 6629.566665649414,
-    "y": 1747.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6631.566665649414,
+    "y": 1698.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "72cc1cfb.a77694",
+    "id": "56d51e0c.3fbb48",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6576.566665649414,
-    "y": 1335.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6578.566665649414,
+    "y": 1286.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e88893b.a079df",
+    "id": "f1e4ada5.0d8a28",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6524.566665649414,
-    "y": 1383.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6526.566665649414,
+    "y": 1334.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "f9c59fe9.ee503",
+    "id": "9aa0ecc9.b21a38",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6652.566665649414,
-    "y": 1430.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6654.566665649414,
+    "y": 1381.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5271815d.5f082",
+    "id": "59c3b9a9.bee328",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 6489.566665649414,
-    "y": 1293.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6491.566665649414,
+    "y": 1244.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4573e73f.58afa8",
+    "id": "1d111c3e.37b394",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />",
     "comments": "",
     "outputs": 1,
-    "x": 6486.566665649414,
-    "y": 1521.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6488.566665649414,
+    "y": 1472.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c53261d3.0987a8",
+    "id": "b8b78e91.784a68",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6579.566665649414,
-    "y": 1574.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6581.566665649414,
+    "y": 1525.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "61b6e37e.ff4414",
+    "id": "b1590465.c06e9",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 6470.566665649414,
-    "y": 1477.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6472.566665649414,
+    "y": 1428.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b4d51e76.274848",
+    "id": "4fd8fae5.4af44c",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 6476.566665649414,
-    "y": 1927.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6478.566665649414,
+    "y": 1878.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "92f3ada6.6626b",
+    "id": "eb431097.375ee8",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4412.566421508789,
-    "y": 5046.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4414.566421508789,
+    "y": 4997.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "cb8799d5.d6fa78",
+    "id": "111c6f80.d662f1",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4396.566421508789,
-    "y": 5002.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4398.566421508789,
+    "y": 4953.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "baf89c3.a308c6",
+    "id": "f6ae128e.43e818",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5143.566421508789,
-    "y": 5033.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5145.566421508789,
+    "y": 4984.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6ac119cc.845568",
+    "id": "273e73f0.d7fa54",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5230.566421508789,
-    "y": 5075.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5232.566421508789,
+    "y": 5026.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "be6577a4.990a1",
+    "id": "78d97bc5.d96984",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5178.566421508789,
-    "y": 5123.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5180.566421508789,
+    "y": 5074.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "ed1c0a9d.7a148",
+    "id": "464f510d.72c448",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5306.566421508789,
-    "y": 5170.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5308.566421508789,
+    "y": 5121.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "80308a85.281f5",
+    "id": "a86e4db4.94773",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4474.566909790039,
-    "y": 5337.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4476.566909790039,
+    "y": 5288.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "43c35fa0.488f88",
+    "id": "da1f3bba.7aa878",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4457.566909790039,
-    "y": 5399.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4459.566909790039,
+    "y": 5350.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2da9765.20a818a",
+    "id": "8a063d24.55e818",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4568.566909790039,
-    "y": 5441.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4570.566909790039,
+    "y": 5392.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "f1717ef6.023738",
+    "id": "cfd66aba.0bb4b",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5025.566421508789,
-    "y": 5612.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5027.566421508789,
+    "y": 5563.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "99843e38.83dd4",
+    "id": "d34f3733.82b438",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4335.566421508789,
-    "y": 6310.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4337.566421508789,
+    "y": 6261.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3c45c16a.44e536",
+    "id": "a5e6b4f4.57a38",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4268.566421508789,
-    "y": 6264.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4270.566421508789,
+    "y": 6215.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "ff6ff2f.c8fff1",
+    "id": "ea2fb779.5cdf1",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4217.566421508789,
-    "y": 6215.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4219.566421508789,
+    "y": 6166.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1431401.84d5c4",
+    "id": "cea8b041.47c29",
     "type": "save",
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5000.566665649414,
-    "y": 6421.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5002.566665649414,
+    "y": 6372.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "583fc579.afbe3c",
+    "id": "27d5e3fa.d1fc64",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4395.566909790039,
-    "y": 5498.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4397.566909790039,
+    "y": 5449.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "57091b18.0fc4d4",
-        "6835f627.925db8"
+        "76f33e89.9589e",
+        "2dcff9f1.2ed2e6"
       ]
     ]
   },
   {
-    "id": "57091b18.0fc4d4",
+    "id": "76f33e89.9589e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4606.566909790039,
-    "y": 5498.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4608.566909790039,
+    "y": 5449.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "328e270e.4a59d8"
+        "53185310.1e3aac"
       ]
     ]
   },
   {
-    "id": "328e270e.4a59d8",
+    "id": "53185310.1e3aac",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4762.566909790039,
-    "y": 5494.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4764.566909790039,
+    "y": 5445.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f1717ef6.023738",
-        "d4dec9b1.cf9de8",
-        "6712b992.157"
+        "cfd66aba.0bb4b",
+        "d5527664.91c39",
+        "7871c32f.9d91cc"
       ]
     ]
   },
   {
-    "id": "6835f627.925db8",
+    "id": "2dcff9f1.2ed2e6",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4602.566909790039,
-    "y": 5546.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4604.566909790039,
+    "y": 5497.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bc00cffe.21aeb8"
+        "74066864.f6923"
       ]
     ]
   },
   {
-    "id": "bc00cffe.21aeb8",
+    "id": "74066864.f6923",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 4750.566909790039,
-    "y": 5541.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4752.566909790039,
+    "y": 5492.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "684d6198.d250c8",
+    "id": "3e678579.1103ca",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5267.566421508789,
-    "y": 5241.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5269.566421508789,
+    "y": 5192.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "ab78fc6f.8a0998",
+    "id": "1902c403.6fb814",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2434.566665649414,
-    "y": 200.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2436.566665649414,
+    "y": 151.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e0dcc9a.c7d15b",
+    "id": "b21e9d77.e0db",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 2368.566665649414,
-    "y": 236.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2370.566665649414,
+    "y": 187.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7f3a574e.dafd48",
+    "id": "9b031e24.c71f38",
     "type": "comment",
     "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
     "info": "",
     "comments": "",
-    "x": 2553.566665649414,
-    "y": 163.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2555.566665649414,
+    "y": 114.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "131a46fd.415b69",
+    "id": "2b3dd3ef.75d514",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 4302.566421508789,
-    "y": 6376.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4304.566421508789,
+    "y": 6327.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "bd42462a.156a88",
+    "id": "44cea2e2.e10b04",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4435.566421508789,
-    "y": 6424.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4437.566421508789,
+    "y": 6375.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "28f03df7.2bcada",
+    "id": "32da350f.e91202",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4254.566421508789,
-    "y": 6482.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4256.566421508789,
+    "y": 6433.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "81c1148f.4cc3d8",
-        "1bb40996.4838a6"
+        "5b9298a4.1ed118",
+        "7163c900.606df8"
       ]
     ]
   },
   {
-    "id": "81c1148f.4cc3d8",
+    "id": "5b9298a4.1ed118",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4447.566421508789,
-    "y": 6483.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4449.566421508789,
+    "y": 6434.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5632e5bc.008fd4"
+        "5b9bdf25.e9536"
       ]
     ]
   },
   {
-    "id": "5632e5bc.008fd4",
+    "id": "5b9bdf25.e9536",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",
     "comments": "",
-    "x": 4603.566421508789,
-    "y": 6480.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4605.566421508789,
+    "y": 6431.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1bb40996.4838a6",
+    "id": "7163c900.606df8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4451.566421508789,
-    "y": 6527.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4453.566421508789,
+    "y": 6478.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2400d348.1454e4"
+        "1fa38b13.5c2175"
       ]
     ]
   },
   {
-    "id": "2400d348.1454e4",
+    "id": "1fa38b13.5c2175",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4590.566421508789,
-    "y": 6522.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4592.566421508789,
+    "y": 6473.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1431401.84d5c4",
-        "cfbbd347.67bf98",
-        "4f0e8fb5.8e798",
-        "e1e51f2c.3838b",
-        "38f3723d.fc373e",
-        "556b17f.21493e8",
-        "72f64404.57e414",
-        "4c65c6ba.14ece",
-        "72bff017.143e6",
-        "debab96e.421598",
-        "e11abdc.71e19c",
-        "6a0cb0e4.5bec78",
-        "811fcd41.48413"
+        "cea8b041.47c29",
+        "ab589b66.44dca",
+        "bec4134.89e1d7",
+        "93569c40.48d5d8",
+        "21f4d700.883112",
+        "10882f4c.ff2cd1",
+        "2d523fb9.b5b8c8",
+        "54f95ba1.fd5b14",
+        "b2a13863.b94908",
+        "8b96c2fb.4933a8",
+        "ac6c48.3b961bb8",
+        "f3a1ad9d.6eb4a8",
+        "f140933b.8acec"
       ]
     ]
   },
   {
-    "id": "72f64404.57e414",
+    "id": "2d523fb9.b5b8c8",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4787.566421508789,
-    "y": 7201.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4789.566421508789,
+    "y": 7152.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f17dbf11.a99f78",
-        "840879a8.da7ac",
-        "ff33cdc7.aad138"
+        "85a32ae2.fd7ca",
+        "2bd9412f.d2a736",
+        "14d3449f.8afb4b"
       ]
     ]
   },
   {
-    "id": "f17dbf11.a99f78",
+    "id": "85a32ae2.fd7ca",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4982.566635131836,
-    "y": 7177.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4984.566635131836,
+    "y": 7128.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9d7f152f.0d13"
+        "802d4aff.ed19c"
       ]
     ]
   },
   {
-    "id": "840879a8.da7ac",
+    "id": "2bd9412f.d2a736",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4975.057601928711,
-    "y": 7213.859756469727,
-    "z": "2414cd0b.85dac2",
+    "x": 4977.057601928711,
+    "y": 7164.859756469727,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "722c6254.b53dd4"
+        "1d4f1ec2.11c199"
       ]
     ]
   },
   {
-    "id": "ff33cdc7.aad138",
+    "id": "14d3449f.8afb4b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4972.566635131836,
-    "y": 7257.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4974.566635131836,
+    "y": 7208.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2dfdab6e.e9f304"
+        "1bbce323.6599c5"
       ]
     ]
   },
   {
-    "id": "9d7f152f.0d13",
+    "id": "802d4aff.ed19c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5154.566635131836,
-    "y": 7175.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 5156.566635131836,
+    "y": 7126.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f4de49b1.9e78c8"
+        "dd0eed5a.ced22"
       ]
     ]
   },
   {
-    "id": "722c6254.b53dd4",
+    "id": "1d4f1ec2.11c199",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5137.629013061523,
-    "y": 7214.145492553711,
-    "z": "2414cd0b.85dac2",
+    "x": 5139.629013061523,
+    "y": 7165.145492553711,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2dfdab6e.e9f304",
+    "id": "1bbce323.6599c5",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5139.566635131836,
-    "y": 7256.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 5141.566635131836,
+    "y": 7207.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "f4de49b1.9e78c8",
+    "id": "dd0eed5a.ced22",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5395.566421508789,
-    "y": 7209.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5397.566421508789,
+    "y": 7160.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c3d85a4.1f615a8"
+        "315a5202.03b08e"
       ]
     ]
   },
   {
-    "id": "c3d85a4.1f615a8",
+    "id": "315a5202.03b08e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5632.566421508789,
-    "y": 7205.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5634.566421508789,
+    "y": 7156.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f610bb15.d46c3"
+        "ffe78e55.58a2"
       ]
     ]
   },
   {
-    "id": "3165802b.467878",
+    "id": "406bc3a2.6f4c5c",
     "type": "switchNode",
     "name": "switch vpnuuid is for this slice",
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5899.566421508789,
-    "y": 7171.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5901.566421508789,
+    "y": 7122.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fa2a5991.1b9ca",
-        "bf56d405.cdd208"
+        "efd6821.7606e8",
+        "dc64cef5.f4e71"
       ]
     ]
   },
   {
-    "id": "fa2a5991.1b9ca",
+    "id": "efd6821.7606e8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6080.566421508789,
-    "y": 7197.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 6082.566421508789,
+    "y": 7148.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f610bb15.d46c3"
+        "ffe78e55.58a2"
       ]
     ]
   },
   {
-    "id": "bf56d405.cdd208",
+    "id": "dc64cef5.f4e71",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6079.566421508789,
-    "y": 7150.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 6081.566421508789,
+    "y": 7101.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "f610bb15.d46c3",
+    "id": "ffe78e55.58a2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4596.566635131836,
-    "y": 7345.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4598.566635131836,
+    "y": 7296.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c29275cf.22abd8"
+        "b29b6e84.3ec808"
       ]
     ]
   },
   {
-    "id": "424309da.5dae7",
+    "id": "aa51daf8.235328",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 5672.566421508789,
-    "y": 7377.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5674.566421508789,
+    "y": 7328.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "37faaddd.0a2fe2",
+    "id": "3e921b26.a61a44",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4885.566635131836,
-    "y": 7113.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4887.566635131836,
+    "y": 7064.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "556b17f.21493e8",
+    "id": "10882f4c.ff2cd1",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4769.566421508789,
-    "y": 6997.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4771.566421508789,
+    "y": 6948.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "bbd937d0.174fa8",
+    "id": "649ceff4.e9cc5",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5114.566421508789,
-    "y": 6828.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5116.566421508789,
+    "y": 6779.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "74d7f148.c83f28"
+        "b90f13f5.a31078"
       ]
     ]
   },
   {
-    "id": "74d7f148.c83f28",
+    "id": "b90f13f5.a31078",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5334.566421508789,
-    "y": 6834.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5336.566421508789,
+    "y": 6785.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e33037d6.9207c"
+        "4aedc9d4.9239e8"
       ]
     ]
   },
   {
-    "id": "e33037d6.9207c",
+    "id": "4aedc9d4.9239e8",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5519.566421508789,
-    "y": 6833.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5521.566421508789,
+    "y": 6784.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ff68f8c5.ac398"
+        "8b4beaf0.bd49c8"
       ]
     ]
   },
   {
-    "id": "ff68f8c5.ac398",
+    "id": "8b4beaf0.bd49c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5711.566421508789,
-    "y": 6836.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5713.566421508789,
+    "y": 6787.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3023756a.3df6f2"
+        "67fe9740.178f68"
       ]
     ]
   },
   {
-    "id": "3023756a.3df6f2",
+    "id": "67fe9740.178f68",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5920.566421508789,
-    "y": 6834.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5922.566421508789,
+    "y": 6785.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4c65c6ba.14ece",
+    "id": "54f95ba1.fd5b14",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4821.566421508789,
-    "y": 6822.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4823.566421508789,
+    "y": 6773.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bbd937d0.174fa8"
+        "649ceff4.e9cc5"
       ]
     ]
   },
   {
-    "id": "4f0e8fb5.8e798",
+    "id": "bec4134.89e1d7",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4829.566421508789,
-    "y": 6715.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4831.566421508789,
+    "y": 6666.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "689e25a7.4ec344",
-        "fb96069a.99a898",
-        "67a95680.dd059"
+        "88715119.2c7c68",
+        "d632295f.b3442",
+        "973f1048.6edbb"
       ]
     ]
   },
   {
-    "id": "689e25a7.4ec344",
+    "id": "88715119.2c7c68",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5065.566421508789,
-    "y": 6698.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5067.566421508789,
+    "y": 6649.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "fb96069a.99a898",
+    "id": "d632295f.b3442",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5062.566421508789,
-    "y": 6739.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5064.566421508789,
+    "y": 6690.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "67a95680.dd059",
+    "id": "973f1048.6edbb",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5076.566421508789,
-    "y": 6779.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5078.566421508789,
+    "y": 6730.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e1e51f2c.3838b",
+    "id": "93569c40.48d5d8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4765.566421508789,
-    "y": 6874.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4767.566421508789,
+    "y": 6825.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "38f3723d.fc373e",
+    "id": "21f4d700.883112",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4773.566421508789,
-    "y": 6932.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4775.566421508789,
+    "y": 6883.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "cfbbd347.67bf98",
+    "id": "ab589b66.44dca",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4778.566421508789,
-    "y": 6672.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4780.566421508789,
+    "y": 6623.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b798d2b8.423e4",
+    "id": "9ae90ae.274be78",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4893.566421508789,
-    "y": 6624.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4895.566421508789,
+    "y": 6575.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c29275cf.22abd8",
+    "id": "b29b6e84.3ec808",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4886.566635131836,
-    "y": 7340.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4888.566635131836,
+    "y": 7291.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "48d3293f.1d09c8",
-        "2e7c42e6.c2eade"
+        "ce3c2be3.503e38",
+        "f854c5fa.9550e8"
       ]
     ]
   },
   {
-    "id": "48d3293f.1d09c8",
+    "id": "ce3c2be3.503e38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5142.566635131836,
-    "y": 7312.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 5144.566635131836,
+    "y": 7263.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fc947668.8a9d8"
+        "eb8749e3.22de7"
       ]
     ]
   },
   {
-    "id": "2e7c42e6.c2eade",
+    "id": "f854c5fa.9550e8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5142.566635131836,
-    "y": 7361.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 5144.566635131836,
+    "y": 7312.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "86241828.71762",
+    "id": "268cfed4.3ed072",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5408.566635131836,
-    "y": 7353.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 5410.566635131836,
+    "y": 7304.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "78fc3e29.1eba58",
-        "424309da.5dae7",
-        "7b230c0f.716d14"
+        "acce766e.9c38a",
+        "aa51daf8.235328",
+        "f459d871.345a18"
       ]
     ]
   },
   {
-    "id": "ec22280e.4e15f",
+    "id": "2f1cf9f0.50adbe",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 5800.566421508789,
-    "y": 7431.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5802.566421508789,
+    "y": 7382.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7b230c0f.716d14",
+    "id": "f459d871.345a18",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\n\n<parameter name='operational-status' value='Modified' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5770.566421508789,
-    "y": 7491.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5772.566421508789,
+    "y": 7442.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "78fc3e29.1eba58",
+    "id": "acce766e.9c38a",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5677.566421508789,
-    "y": 7319.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5679.566421508789,
+    "y": 7270.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e6235853.96452",
+    "id": "e1ebd454.f4cdb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4027.566665649414,
-    "y": 5957.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4029.566665649414,
+    "y": 5908.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3c45c16a.44e536",
-        "131a46fd.415b69",
-        "bd42462a.156a88",
-        "28f03df7.2bcada",
-        "99843e38.83dd4"
+        "a5e6b4f4.57a38",
+        "2b3dd3ef.75d514",
+        "44cea2e2.e10b04",
+        "32da350f.e91202",
+        "d34f3733.82b438"
       ]
     ]
   },
   {
-    "id": "825ad15b.e200f",
+    "id": "6a9fab50.2b8dbc",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4770.566421508789,
-    "y": 6772.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4772.566421508789,
+    "y": 6723.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "72bff017.143e6",
+    "id": "b2a13863.b94908",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4893.566665649414,
-    "y": 6502.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4895.566665649414,
+    "y": 6453.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "218269db.41502e",
+    "id": "eedbe7ee.2e17",
     "type": "comment",
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "comments": "",
-    "x": 5030.566665649414,
-    "y": 6452.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5032.566665649414,
+    "y": 6403.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e1cb1e55.b0357",
+    "id": "6d3e15fd.90249c",
     "type": "save",
     "name": "save ROOT UNI in AAI",
     "xml": "<save 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='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6492.566665649414,
-    "y": 1986.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6494.566665649414,
+    "y": 1937.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d01f4492.e07e28",
+    "id": "74dbf9c4.a2cac",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3758.566665649414,
-    "y": 1380.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3760.566665649414,
+    "y": 1331.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "27d91ce4.eff5e4",
+    "id": "691659c.355b428",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3896.566665649414,
-    "y": 1868.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3898.566665649414,
+    "y": 1819.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "bcdaf6d5.61613",
+    "id": "b49b44ed.34c0f",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 6453.566665649414,
-    "y": 2698.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6455.566665649414,
+    "y": 2649.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1992e083.76e587",
+    "id": "78110e1d.34a828",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 3745.566665649414,
-    "y": 4974.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3747.566665649414,
+    "y": 4925.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "aaed5b46.7e8eb",
+    "id": "399c8052.14794",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3878.566665649414,
-    "y": 5022.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3880.566665649414,
+    "y": 4973.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d0f2c5e0.41cd1",
+    "id": "146ee230.44ecc6",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4423.566421508789,
-    "y": 5102.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4425.566421508789,
+    "y": 5053.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c51b9855.45ff88",
-        "4079da5.fe1c9a4"
+        "939f1799.36d378",
+        "a646c5c3.cf3a8"
       ]
     ]
   },
   {
-    "id": "c51b9855.45ff88",
+    "id": "939f1799.36d378",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4616.566421508789,
-    "y": 5103.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4618.566421508789,
+    "y": 5054.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "69766fb9.fbb74"
+        "bace55c5.99f12"
       ]
     ]
   },
   {
-    "id": "4079da5.fe1c9a4",
+    "id": "a646c5c3.cf3a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620.566421508789,
-    "y": 5147.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4622.566421508789,
+    "y": 5098.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1a522b67.5bcd1d"
+        "4039180c.15981"
       ]
     ]
   },
   {
-    "id": "1a522b67.5bcd1d",
+    "id": "4039180c.15981",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4759.566421508789,
-    "y": 5142.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4761.566421508789,
+    "y": 5093.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e1cf34bb.9518e",
-        "6d11acf9.928044",
-        "613e9b77.298d54"
+        "7ef13e15.cc2028",
+        "de57bd6c.da094",
+        "2e1e6c02.39beec"
       ]
     ]
   },
   {
-    "id": "69766fb9.fbb74",
+    "id": "bace55c5.99f12",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4759.566421508789,
-    "y": 5099.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4761.566421508789,
+    "y": 5050.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6ac119cc.845568",
-        "be6577a4.990a1",
-        "ed1c0a9d.7a148",
-        "684d6198.d250c8"
+        "273e73f0.d7fa54",
+        "78d97bc5.d96984",
+        "464f510d.72c448",
+        "3e678579.1103ca"
       ]
     ]
   },
   {
-    "id": "e1cf34bb.9518e",
+    "id": "7ef13e15.cc2028",
     "type": "set",
     "name": "set prop.connectivity-domainA-uuid",
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5153.566421508789,
-    "y": 5393.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5155.566421508789,
+    "y": 5344.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "63360813.209ad8",
+    "id": "e4f0f550.01eee8",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5160.566421508789,
-    "y": 5347.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5162.566421508789,
+    "y": 5298.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "debab96e.421598",
+    "id": "8b96c2fb.4933a8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4950.566635131836,
-    "y": 7062.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4952.566635131836,
+    "y": 7013.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "6d11acf9.928044",
+    "id": "de57bd6c.da094",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5272.566421508789,
-    "y": 5446.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5274.566421508789,
+    "y": 5397.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d4dec9b1.cf9de8",
+    "id": "d5527664.91c39",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5154.566421508789,
-    "y": 5664.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5156.566421508789,
+    "y": 5615.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "dbce4650.6b5848",
+    "id": "9e36b46b.83aaa",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3700.566665649414,
-    "y": 4423.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3702.566665649414,
+    "y": 4374.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "edcfccb6.0b10e8",
+    "id": "dba3b4ab.601e58",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4034.566665649414,
-    "y": 4606.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4036.566665649414,
+    "y": 4557.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7aee100.ec3998",
+    "id": "7855b68f.e847e",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3646.566665649414,
-    "y": 4473.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3648.566665649414,
+    "y": 4424.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1339ee7e.d32932",
-        "f08ce63a.aff18",
-        "a999ee96.e09558"
+        "27b19c0a.0b96bc",
+        "3755d72e.8ad5d8",
+        "e7a32b57.4d11"
       ]
     ]
   },
   {
-    "id": "f08ce63a.aff18",
+    "id": "3755d72e.8ad5d8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3874.057632446289,
-    "y": 4445.859725952148,
-    "z": "2414cd0b.85dac2",
+    "x": 3876.057632446289,
+    "y": 4396.859725952148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1c6fd05d.948d88"
+        "8db24f9.ca62db"
       ]
     ]
   },
   {
-    "id": "a999ee96.e09558",
+    "id": "e7a32b57.4d11",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3869.566665649414,
-    "y": 4490.285690307617,
-    "z": "2414cd0b.85dac2",
+    "x": 3871.566665649414,
+    "y": 4441.285690307617,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1f86883b.9ad4a8"
+        "c7878375.542c6"
       ]
     ]
   },
   {
-    "id": "1c6fd05d.948d88",
+    "id": "8db24f9.ca62db",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4036.629165649414,
-    "y": 4445.145431518555,
-    "z": "2414cd0b.85dac2",
+    "x": 4038.629165649414,
+    "y": 4396.145431518555,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1f86883b.9ad4a8",
+    "id": "c7878375.542c6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4037.566665649414,
-    "y": 4490.285690307617,
-    "z": "2414cd0b.85dac2",
+    "x": 4039.566665649414,
+    "y": 4441.285690307617,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1213361d.be12aa",
+    "id": "32e0d279.a6eca6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3822.566665649414,
-    "y": 4563.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3824.566665649414,
+    "y": 4514.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fbd53f4.dd8234",
-        "edcfccb6.0b10e8"
+        "a8a8e968.d6c638",
+        "dba3b4ab.601e58"
       ]
     ]
   },
   {
-    "id": "1339ee7e.d32932",
+    "id": "27b19c0a.0b96bc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3653.566665649414,
-    "y": 4563.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3655.566665649414,
+    "y": 4514.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1213361d.be12aa"
+        "32e0d279.a6eca6"
       ]
     ]
   },
   {
-    "id": "fbd53f4.dd8234",
+    "id": "a8a8e968.d6c638",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4011.566665649414,
-    "y": 4555.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4013.566665649414,
+    "y": 4506.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b969bbc7.e53528",
+    "id": "7a90992b.99ef7",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $middle-man-conn.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$middle-man-conn.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3853.566665649414,
-    "y": 4850.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3855.566665649414,
+    "y": 4801.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a6ad0dd0.a6fcc8",
+    "id": "258c7b31.2a3584",
     "type": "comment",
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",
     "info": "",
     "comments": "",
-    "x": 3636.566665649414,
-    "y": 2933.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3638.566665649414,
+    "y": 2884.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d73dbef9.62ae5",
+    "id": "5517fa40.8d63c4",
     "type": "comment",
     "name": "We are doing modify and middle man exists, check if LEAF UNI already exists in AAI or not. If yes, consider the possible bw change. If it does not, then it is a new link needs to be added",
     "info": "",
     "comments": "",
-    "x": 2841.566665649414,
-    "y": 4495.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 2843.566665649414,
+    "y": 4446.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "38b3d969.be8c96",
+    "id": "872d6ff1.04a5b8",
     "type": "exists",
     "name": "exists LEAF UNI",
     "xml": "<exists plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3264.566665649414,
-    "y": 4768.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3266.566665649414,
+    "y": 4719.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4afa5be1.7f901c",
-        "3036b28a.042a4e"
+        "99cdf1e3.76daa8",
+        "8ce192f6.43321"
       ]
     ]
   },
   {
-    "id": "d77e7161.5348c8",
+    "id": "f3de805.eee03",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3096.566665649414,
-    "y": 4771.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3098.566665649414,
+    "y": 4722.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "38b3d969.be8c96"
+        "872d6ff1.04a5b8"
       ]
     ]
   },
   {
-    "id": "3036b28a.042a4e",
+    "id": "8ce192f6.43321",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3427.566665649414,
-    "y": 4787.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3429.566665649414,
+    "y": 4738.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "300daee4.3b0352"
+        "e429a394.1622b"
       ]
     ]
   },
   {
-    "id": "4afa5be1.7f901c",
+    "id": "99cdf1e3.76daa8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3463.566665649414,
-    "y": 3394.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3465.566665649414,
+    "y": 3345.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "afe0131e.843c9"
+        "45ad7f75.acf2c"
       ]
     ]
   },
   {
-    "id": "40724b83.4d51bc",
+    "id": "894a7fb9.0e7198",
     "type": "switchNode",
     "name": "switch leafuni.data-source == gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3812.566665649414,
-    "y": 3236.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3814.566665649414,
+    "y": 3187.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "822b2d43.9a91a",
-        "33ca94.ea4af56c"
+        "fc9baa20.3cffe",
+        "9e39c7e6.dd8a38"
       ]
     ]
   },
   {
-    "id": "822b2d43.9a91a",
+    "id": "fc9baa20.3cffe",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4017.566665649414,
-    "y": 3232.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4019.566665649414,
+    "y": 3183.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "33ca94.ea4af56c",
+    "id": "9e39c7e6.dd8a38",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4019.566665649414,
-    "y": 3282.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4021.566665649414,
+    "y": 3233.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1d0af02e.93b4f"
+        "d198772b.5f2b"
       ]
     ]
   },
   {
-    "id": "1d0af02e.93b4f",
+    "id": "d198772b.5f2b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4175.566665649414,
-    "y": 3288.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4177.566665649414,
+    "y": 3239.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "523d0093.735cb",
-        "21f4d27b.d11a96",
-        "1c5f100e.a5d978",
-        "2d4de683.3992d2"
+        "23f5cc1d.41fbe4",
+        "fed6a907.2b3e28",
+        "fdf1da6c.032aa",
+        "51c677f3.cc82f"
       ]
     ]
   },
   {
-    "id": "523d0093.735cb",
+    "id": "23f5cc1d.41fbe4",
     "type": "set",
     "name": "set bwModified",
     "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 4401.566909790039,
-    "y": 3029.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4403.566909790039,
+    "y": 2980.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fce8efa1.5f12e",
+    "id": "84e42d5e.8f28b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4900.566390991211,
-    "y": 4326.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4902.566390991211,
+    "y": 4277.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e3611e5a.49f6f",
-        "7474f571.02042c"
+        "7591914.05111f",
+        "4f3fe980.0cfee8"
       ]
     ]
   },
   {
-    "id": "7474f571.02042c",
+    "id": "4f3fe980.0cfee8",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5102.566146850586,
-    "y": 4293.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 5104.566146850586,
+    "y": 4244.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c554c9c8.b91c38",
+    "id": "7cabc91f.298798",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4786.566635131836,
-    "y": 4503.28547668457,
-    "z": "2414cd0b.85dac2",
+    "x": 4788.566635131836,
+    "y": 4454.28547668457,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9c21225.8549a6",
+    "id": "6e8a6a19.d50624",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4783.628768920898,
-    "y": 4452.145492553711,
-    "z": "2414cd0b.85dac2",
+    "x": 4785.628768920898,
+    "y": 4403.145492553711,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6669e686.3a92d",
+    "id": "83166069.2f46b",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4366.566390991211,
-    "y": 4326.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4368.566390991211,
+    "y": 4277.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6cdd29ff.2176f"
+        "b23ac34.b9f8bc"
       ]
     ]
   },
   {
-    "id": "6cdd29ff.2176f",
+    "id": "b23ac34.b9f8bc",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4571.566390991211,
-    "y": 4326.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4573.566390991211,
+    "y": 4277.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "462e489b.1c9ea8"
+        "37a61cf7.b75674"
       ]
     ]
   },
   {
-    "id": "462e489b.1c9ea8",
+    "id": "37a61cf7.b75674",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4737.566390991211,
-    "y": 4326.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4739.566390991211,
+    "y": 4277.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fce8efa1.5f12e"
+        "84e42d5e.8f28b8"
       ]
     ]
   },
   {
-    "id": "e3611e5a.49f6f",
+    "id": "7591914.05111f",
     "type": "save",
     "name": "get vpn-binding from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4409.566390991211,
-    "y": 4404.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4411.566390991211,
+    "y": 4355.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5af860a5.71ed3",
-        "234eb12a.7530fe",
-        "358a6c9c.71984c"
+        "4b066055.dca1d",
+        "4c3bb63f.abb268",
+        "afaed0ec.37401"
       ]
     ]
   },
   {
-    "id": "5af860a5.71ed3",
+    "id": "4b066055.dca1d",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620.566390991211,
-    "y": 4406.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4622.566390991211,
+    "y": 4357.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e32197a7.4c81d8"
+        "7a2986e1.36d518"
       ]
     ]
   },
   {
-    "id": "234eb12a.7530fe",
+    "id": "4c3bb63f.abb268",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4621.057357788086,
-    "y": 4451.859756469727,
-    "z": "2414cd0b.85dac2",
+    "x": 4623.057357788086,
+    "y": 4402.859756469727,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9c21225.8549a6"
+        "6e8a6a19.d50624"
       ]
     ]
   },
   {
-    "id": "358a6c9c.71984c",
+    "id": "afaed0ec.37401",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4618.566390991211,
-    "y": 4495.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4620.566390991211,
+    "y": 4446.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c554c9c8.b91c38"
+        "7cabc91f.298798"
       ]
     ]
   },
   {
-    "id": "afe0131e.843c9",
+    "id": "45ad7f75.acf2c",
     "type": "save",
     "name": "get LEAF uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.LEAF.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.leafuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3686.566665649414,
-    "y": 3079.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3688.566665649414,
+    "y": 3030.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9dbeb0e5.86c59",
-        "ca19c457.91ce7",
-        "a8db99d3.ea1d58"
+        "77412c28.93cabc",
+        "a9cae5b1.bd79",
+        "fb412e94.ff6ef8"
       ]
     ]
   },
   {
-    "id": "ca19c457.91ce7",
+    "id": "a9cae5b1.bd79",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3914.057632446289,
-    "y": 3051.8597259521484,
-    "z": "2414cd0b.85dac2",
+    "x": 3916.057632446289,
+    "y": 3002.8597259521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "940a0baf.b50538"
+        "a9cc314f.91999"
       ]
     ]
   },
   {
-    "id": "a8db99d3.ea1d58",
+    "id": "fb412e94.ff6ef8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3909.566665649414,
-    "y": 3096.285690307617,
-    "z": "2414cd0b.85dac2",
+    "x": 3911.566665649414,
+    "y": 3047.285690307617,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "199d9fc8.23d478"
+        "7c451252.08c29c"
       ]
     ]
   },
   {
-    "id": "940a0baf.b50538",
+    "id": "a9cc314f.91999",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4076.629165649414,
-    "y": 3051.1454315185547,
-    "z": "2414cd0b.85dac2",
+    "x": 4078.629165649414,
+    "y": 3002.1454315185547,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "199d9fc8.23d478",
+    "id": "7c451252.08c29c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4077.566665649414,
-    "y": 3096.285690307617,
-    "z": "2414cd0b.85dac2",
+    "x": 4079.566665649414,
+    "y": 3047.285690307617,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9dbeb0e5.86c59",
+    "id": "77412c28.93cabc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3921.566665649414,
-    "y": 3146.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3923.566665649414,
+    "y": 3097.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "40724b83.4d51bc"
+        "894a7fb9.0e7198"
       ]
     ]
   },
   {
-    "id": "667c445f.dc3e5c",
+    "id": "22440324.4f2fcc",
     "type": "comment",
     "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",
     "info": "",
     "comments": "",
-    "x": 3811.449996948242,
-    "y": 3337.1690826416016,
-    "z": "2414cd0b.85dac2",
+    "x": 3813.449996948242,
+    "y": 3288.1690826416016,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7651a38e.4e7e44",
+    "id": "e0dae0e2.18c628",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 3793.166763305664,
-    "y": 3898.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 3795.166763305664,
+    "y": 3849.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e0666b60.cb174",
+    "id": "6f17d5e2.9b03b4",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3931.166763305664,
-    "y": 3956.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 3933.166763305664,
+    "y": 3907.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "21f4d27b.d11a96",
+    "id": "fed6a907.2b3e28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3509.166763305664,
-    "y": 3638.3690032958984,
-    "z": "2414cd0b.85dac2",
+    "x": 3511.166763305664,
+    "y": 3589.3690032958984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "407839fb.167e2",
-        "931a7a68.51c848",
-        "f4ea682a.e63f08"
+        "db019ae8.f69e68",
+        "cb5f4cbc.1262b8",
+        "ca40fb3f.0ddd08"
       ]
     ]
   },
   {
-    "id": "91a690e7.1a5918",
+    "id": "a1e56d0c.c484e8",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3750.166763305664,
-    "y": 4066.7691497802734,
-    "z": "2414cd0b.85dac2",
+    "x": 3752.166763305664,
+    "y": 4017.7691497802734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "34fa09a4.b2b1ae",
-        "809131d.392dfd"
+        "25e879f6.3e709e",
+        "8478688.57aab18"
       ]
     ]
   },
   {
-    "id": "34fa09a4.b2b1ae",
+    "id": "25e879f6.3e709e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3943.166763305664,
-    "y": 4067.7691497802734,
-    "z": "2414cd0b.85dac2",
+    "x": 3945.166763305664,
+    "y": 4018.7691497802734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b77388f8.551df8"
+        "2c016cde.6263ac"
       ]
     ]
   },
   {
-    "id": "809131d.392dfd",
+    "id": "8478688.57aab18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3947.166763305664,
-    "y": 4111.769149780273,
-    "z": "2414cd0b.85dac2",
+    "x": 3949.166763305664,
+    "y": 4062.7691497802734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2e72f134.3b345e"
+        "f613ca73.1c6bb8"
       ]
     ]
   },
   {
-    "id": "2e72f134.3b345e",
+    "id": "f613ca73.1c6bb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4086.166763305664,
-    "y": 4106.769149780273,
-    "z": "2414cd0b.85dac2",
+    "x": 4088.166763305664,
+    "y": 4057.7691497802734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6669e686.3a92d"
+        "83166069.2f46b"
       ]
     ]
   },
   {
-    "id": "b77388f8.551df8",
+    "id": "2c016cde.6263ac",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",
     "comments": "",
-    "x": 4087.166763305664,
-    "y": 4063.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 4089.166763305664,
+    "y": 4014.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1c5f100e.a5d978",
+    "id": "fdf1da6c.032aa",
     "type": "switchNode",
     "name": "switch leafuni.data-source > gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4435.283706665039,
-    "y": 3285.5691986083984,
-    "z": "2414cd0b.85dac2",
+    "x": 4437.283706665039,
+    "y": 3236.5691986083984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f17d25a9.fc3a28",
-        "d1a832ec.f421b"
+        "624fa50f.6c863c",
+        "2cbb1141.892c6e"
       ]
     ]
   },
   {
-    "id": "f17d25a9.fc3a28",
+    "id": "624fa50f.6c863c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4634.450698852539,
-    "y": 3352.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 4636.450698852539,
+    "y": 3303.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3ef002bf.b5c35e"
+        "dec3e17a.4aeb5"
       ]
     ]
   },
   {
-    "id": "d1a832ec.f421b",
+    "id": "2cbb1141.892c6e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4656.450698852539,
-    "y": 3197.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 4658.450698852539,
+    "y": 3148.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d05f5529.96a4b8"
+        "591bc18f.862f3"
       ]
     ]
   },
   {
-    "id": "2d4de683.3992d2",
+    "id": "51c677f3.cc82f",
     "type": "save",
     "name": "update LEAF UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4434.283706665039,
-    "y": 3140.7691497802734,
-    "z": "2414cd0b.85dac2",
+    "x": 4436.283706665039,
+    "y": 3091.7691497802734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e42871e4.7e7078",
+    "id": "84a6fa88.639cd8",
     "type": "comment",
     "name": "update LEAF UNI with the new bw",
     "info": "",
     "comments": "",
-    "x": 4450.450698852539,
-    "y": 3094.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 4452.450698852539,
+    "y": 3045.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "dcbc2987.d3bdd",
+    "id": "281d0553.9e5102",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5005.216567993164,
-    "y": 2549.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5007.216567993164,
+    "y": 2500.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "feb1ef44.b73648",
+    "id": "e4f725a7.1779b8",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5607.216567993164,
-    "y": 2654.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5609.216567993164,
+    "y": 2605.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "56698383.1dde24",
+    "id": "1e1b1c4e.72c2bc",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4997.216323852539,
-    "y": 2595.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 4999.216323852539,
+    "y": 2546.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b538dd4e.00fce",
-        "3917ea5e.68d896",
-        "234d36ee.00b9a2"
+        "d8429e74.2e1a2",
+        "e4667648.c01938",
+        "4ea5d18f.5a2f38"
       ]
     ]
   },
   {
-    "id": "3917ea5e.68d896",
+    "id": "e4667648.c01938",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5224.707290649414,
-    "y": 2567.7430267333984,
-    "z": "2414cd0b.85dac2",
+    "x": 5226.707290649414,
+    "y": 2518.7430267333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bb66fc72.62525"
+        "1f89164b.95601a"
       ]
     ]
   },
   {
-    "id": "234d36ee.00b9a2",
+    "id": "4ea5d18f.5a2f38",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5220.216323852539,
-    "y": 2612.168991088867,
-    "z": "2414cd0b.85dac2",
+    "x": 5222.216323852539,
+    "y": 2563.168991088867,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2eceea5f.8355a6"
+        "88705cd9.03d55"
       ]
     ]
   },
   {
-    "id": "bb66fc72.62525",
+    "id": "1f89164b.95601a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5387.278823852539,
-    "y": 2567.0287322998047,
-    "z": "2414cd0b.85dac2",
+    "x": 5389.278823852539,
+    "y": 2518.0287322998047,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2eceea5f.8355a6",
+    "id": "88705cd9.03d55",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5388.216323852539,
-    "y": 2612.168991088867,
-    "z": "2414cd0b.85dac2",
+    "x": 5390.216323852539,
+    "y": 2563.168991088867,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b5d59b15.1b765",
+    "id": "2e8d1bdd.85c644",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5385.216323852539,
-    "y": 2662.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5387.216323852539,
+    "y": 2613.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "85d5ae48.70e33",
-        "feb1ef44.b73648"
+        "f78dc911.45f94",
+        "e4f725a7.1779b8"
       ]
     ]
   },
   {
-    "id": "b538dd4e.00fce",
+    "id": "d8429e74.2e1a2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5216.216323852539,
-    "y": 2662.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5218.216323852539,
+    "y": 2613.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b5d59b15.1b765"
+        "2e8d1bdd.85c644"
       ]
     ]
   },
   {
-    "id": "85d5ae48.70e33",
+    "id": "f78dc911.45f94",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",
     "comments": "",
-    "x": 5567.217056274414,
-    "y": 2604.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5569.217056274414,
+    "y": 2555.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3c4fd972.8c727e",
+    "id": "d33826b1.ef8f58",
     "type": "comment",
     "name": "bw+ has increased ",
     "info": "",
     "comments": "",
-    "x": 4648.449996948242,
-    "y": 3159.1690826416016,
-    "z": "2414cd0b.85dac2",
+    "x": 4650.449996948242,
+    "y": 3110.1690826416016,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9a2b9c1d.56f0c",
+    "id": "84f3d20e.4f91a8",
     "type": "comment",
     "name": "bw- has decreased",
     "info": "",
     "comments": "",
-    "x": 4647.283706665039,
-    "y": 3315.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 4649.283706665039,
+    "y": 3266.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "22475743.9e3838",
+    "id": "48adb9de.8dd8c8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5096.282974243164,
-    "y": 2888.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5098.282974243164,
+    "y": 2839.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "791cfc48.d2aabc",
+    "id": "ccc0529e.d89b08",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5698.282974243164,
-    "y": 2993.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5700.282974243164,
+    "y": 2944.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "b94b085c.7cb5a8",
+    "id": "337b01b3.8933a6",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5088.282730102539,
-    "y": 2934.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5090.282730102539,
+    "y": 2885.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d976d76c.67e958",
-        "8e60ee6f.c2d2f",
-        "835f78f2.c41258"
+        "799a0808.a03288",
+        "b771a02d.8b4ba",
+        "6a9817e4.946118"
       ]
     ]
   },
   {
-    "id": "8e60ee6f.c2d2f",
+    "id": "b771a02d.8b4ba",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5315.773696899414,
-    "y": 2907.5430755615234,
-    "z": "2414cd0b.85dac2",
+    "x": 5317.773696899414,
+    "y": 2858.5430755615234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bf2ec467.02c0d8"
+        "6b02c11a.d4f898"
       ]
     ]
   },
   {
-    "id": "835f78f2.c41258",
+    "id": "6a9817e4.946118",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5311.282730102539,
-    "y": 2951.969039916992,
-    "z": "2414cd0b.85dac2",
+    "x": 5313.282730102539,
+    "y": 2902.969039916992,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c322ac12.a985c8"
+        "130a98d8.a059e7"
       ]
     ]
   },
   {
-    "id": "bf2ec467.02c0d8",
+    "id": "6b02c11a.d4f898",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5478.345230102539,
-    "y": 2906.8287811279297,
-    "z": "2414cd0b.85dac2",
+    "x": 5480.345230102539,
+    "y": 2857.8287811279297,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c322ac12.a985c8",
+    "id": "130a98d8.a059e7",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5479.282730102539,
-    "y": 2951.969039916992,
-    "z": "2414cd0b.85dac2",
+    "x": 5481.282730102539,
+    "y": 2902.969039916992,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "380b5701.029218",
+    "id": "ff63a7c4.86cf08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5476.282730102539,
-    "y": 3001.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5478.282730102539,
+    "y": 2952.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2037a317.5823d4",
-        "791cfc48.d2aabc"
+        "871b9cd5.ec522",
+        "ccc0529e.d89b08"
       ]
     ]
   },
   {
-    "id": "d976d76c.67e958",
+    "id": "799a0808.a03288",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5307.282730102539,
-    "y": 3001.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5309.282730102539,
+    "y": 2952.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "380b5701.029218"
+        "ff63a7c4.86cf08"
       ]
     ]
   },
   {
-    "id": "2037a317.5823d4",
+    "id": "871b9cd5.ec522",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",
     "comments": "",
-    "x": 5658.283462524414,
-    "y": 2943.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5660.283462524414,
+    "y": 2894.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d383ac36.342cc",
+    "id": "dce7c6b5.af48e",
     "type": "set",
     "name": "set delta",
     "xml": "<set>\n<parameter name='tmp.delta' value='`$tmp.aai.leafuni.data-source - $gfp`' />\n<parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.isBwIncreased' value='false' />\n\n\n",
     "comments": "",
-    "x": 5013.282730102539,
-    "y": 2847.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5015.282730102539,
+    "y": 2798.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3ef002bf.b5c35e",
+    "id": "dec3e17a.4aeb5",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4806.449996948242,
-    "y": 3341.1690826416016,
-    "z": "2414cd0b.85dac2",
+    "x": 4808.449996948242,
+    "y": 3292.1690826416016,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d383ac36.342cc",
-        "b94b085c.7cb5a8",
-        "37f3e792.01b98"
+        "dce7c6b5.af48e",
+        "337b01b3.8933a6",
+        "9c79a60.2e838d8"
       ]
     ]
   },
   {
-    "id": "d05f5529.96a4b8",
+    "id": "591bc18f.862f3",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4827.183364868164,
-    "y": 3167.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 4829.183364868164,
+    "y": 3118.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "30b48cfc.8858f4",
-        "56698383.1dde24",
-        "9f73e0e4.5bd9a8"
+        "c0c09747.1b1be",
+        "1e1b1c4e.72c2bc",
+        "615783e8.7114bc"
       ]
     ]
   },
   {
-    "id": "30b48cfc.8858f4",
+    "id": "c0c09747.1b1be",
     "type": "set",
     "name": "set delta",
     "xml": "<set>\n<parameter name='tmp.delta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.isBwIncreased' value='true' />\n",
     "comments": "",
-    "x": 4962.016128540039,
-    "y": 2473.7691497802734,
-    "z": "2414cd0b.85dac2",
+    "x": 4964.016128540039,
+    "y": 2424.7691497802734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "eb34d49c.d22a8",
+    "id": "1fd4804f.571bd8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4421.333267211914,
-    "y": 3240.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 4423.333267211914,
+    "y": 3191.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2675acce.b9a12c",
+    "id": "793c3d11.91f2fc",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3890.666732788086,
-    "y": 4229.769607543945,
-    "z": "2414cd0b.85dac2",
+    "x": 3892.666732788086,
+    "y": 4180.769607543945,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "b63f121.ce4247",
+    "id": "334968de.3ae5d",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3725.666732788086,
-    "y": 4301.96955871582,
-    "z": "2414cd0b.85dac2",
+    "x": 3727.666732788086,
+    "y": 4252.96955871582,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8b9ac42e.1e08f",
-        "109545ec.57786a"
+        "420a91d4.f005f",
+        "9e2d332a.723078"
       ]
     ]
   },
   {
-    "id": "8b9ac42e.1e08f",
+    "id": "420a91d4.f005f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3936.666732788086,
-    "y": 4301.96955871582,
-    "z": "2414cd0b.85dac2",
+    "x": 3938.666732788086,
+    "y": 4252.96955871582,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8bee6e1e.eff33"
+        "692a8c7a.fda954"
       ]
     ]
   },
   {
-    "id": "109545ec.57786a",
+    "id": "9e2d332a.723078",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3932.666732788086,
-    "y": 4349.96955871582,
-    "z": "2414cd0b.85dac2",
+    "x": 3934.666732788086,
+    "y": 4300.96955871582,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a4995391.fc5358"
+        "6695c568.10d40c"
       ]
     ]
   },
   {
-    "id": "8bee6e1e.eff33",
+    "id": "692a8c7a.fda954",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4092.666732788086,
-    "y": 4297.96955871582,
-    "z": "2414cd0b.85dac2",
+    "x": 4094.666732788086,
+    "y": 4248.96955871582,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b36b53d7.2d66a8"
+        "1378eadb.299955"
       ]
     ]
   },
   {
-    "id": "a4995391.fc5358",
+    "id": "6695c568.10d40c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found but it should have been!' />\n",
     "comments": "",
-    "x": 4080.666732788086,
-    "y": 4344.96955871582,
-    "z": "2414cd0b.85dac2",
+    "x": 4082.666732788086,
+    "y": 4295.96955871582,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "294f0835.1325e",
+    "id": "42d7c1e3.70d63",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4933.632827758789,
-    "y": 4612.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4935.632827758789,
+    "y": 4563.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "66149bc9.393fc4",
-        "ca1fbeb5.c9d45"
+        "48aa49b9.b94898",
+        "9faa5f11.a8b628"
       ]
     ]
   },
   {
-    "id": "ca1fbeb5.c9d45",
+    "id": "9faa5f11.a8b628",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5176.633071899414,
-    "y": 4581.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 5178.633071899414,
+    "y": 4532.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fb61c0ac.1edc98",
+    "id": "6b7d6b27.bf3f6c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4793.632827758789,
-    "y": 4722.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4795.632827758789,
+    "y": 4673.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3b9c82f6.e6f406"
+        "8f38170c.15c52"
       ]
     ]
   },
   {
-    "id": "ca5b121a.c4f29",
+    "id": "e53eb8db.b4de68",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4781.633071899414,
-    "y": 4815.168563842773,
-    "z": "2414cd0b.85dac2",
+    "x": 4783.633071899414,
+    "y": 4766.168563842773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "27d3cdcb.a5be82",
+    "id": "8d6af4a3.13c21",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4783.695205688477,
-    "y": 4770.028091430664,
-    "z": "2414cd0b.85dac2",
+    "x": 4785.695205688477,
+    "y": 4721.028091430664,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b36b53d7.2d66a8",
+    "id": "1378eadb.299955",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.ROOT.connectivity.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4399.632827758789,
-    "y": 4612.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4401.632827758789,
+    "y": 4563.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a0726a73.552d38"
+        "b83aa531.8a6d18"
       ]
     ]
   },
   {
-    "id": "a0726a73.552d38",
+    "id": "b83aa531.8a6d18",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4604.632827758789,
-    "y": 4612.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4606.632827758789,
+    "y": 4563.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c054f471.25372"
+        "a88f4eb0.5f047"
       ]
     ]
   },
   {
-    "id": "c054f471.25372",
+    "id": "a88f4eb0.5f047",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4770.632827758789,
-    "y": 4612.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4772.632827758789,
+    "y": 4563.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "294f0835.1325e"
+        "42d7c1e3.70d63"
       ]
     ]
   },
   {
-    "id": "66149bc9.393fc4",
+    "id": "48aa49b9.b94898",
     "type": "save",
     "name": "get vpn-binding from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4409.632827758789,
-    "y": 4722.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4411.632827758789,
+    "y": 4673.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6e23d592.fd6b7c",
-        "ebdcd4d0.c0565",
-        "cbc774c8.750668"
+        "7a79979c.8eea88",
+        "442b3988.19bc",
+        "5c729d6c.56aa94"
       ]
     ]
   },
   {
-    "id": "6e23d592.fd6b7c",
+    "id": "7a79979c.8eea88",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620.632827758789,
-    "y": 4724.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4622.632827758789,
+    "y": 4675.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fb61c0ac.1edc98"
+        "6b7d6b27.bf3f6c"
       ]
     ]
   },
   {
-    "id": "ebdcd4d0.c0565",
+    "id": "442b3988.19bc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4621.123794555664,
-    "y": 4769.74235534668,
-    "z": "2414cd0b.85dac2",
+    "x": 4623.123794555664,
+    "y": 4720.74235534668,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "27d3cdcb.a5be82"
+        "8d6af4a3.13c21"
       ]
     ]
   },
   {
-    "id": "cbc774c8.750668",
+    "id": "5c729d6c.56aa94",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4618.632827758789,
-    "y": 4813.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4620.632827758789,
+    "y": 4764.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ca5b121a.c4f29"
+        "e53eb8db.b4de68"
       ]
     ]
   },
   {
-    "id": "c9811fe.3333a6",
+    "id": "4e4fb9a1.270b08",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 6029.449722290039,
-    "y": 7111.369247436523,
-    "z": "2414cd0b.85dac2",
+    "x": 6031.449722290039,
+    "y": 7062.369247436523,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e4958a72.db4418",
+    "id": "16ba58e8.574907",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5297.916732788086,
-    "y": 4342.568923950195,
-    "z": "2414cd0b.85dac2",
+    "x": 5299.916732788086,
+    "y": 4293.568923950195,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e32197a7.4c81d8",
+    "id": "7a2986e1.36d518",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4799.916976928711,
-    "y": 4408.568923950195,
-    "z": "2414cd0b.85dac2",
+    "x": 4801.916976928711,
+    "y": 4359.568923950195,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c808b6be.91a2f",
+    "id": "f1d3809d.7253c8",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5330.916732788086,
-    "y": 4410.568923950195,
-    "z": "2414cd0b.85dac2",
+    "x": 5332.916732788086,
+    "y": 4361.568923950195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "81cfd436.09d848",
-        "56387492.e922bc"
+        "2b6629f8.8ae99e",
+        "6b873c45.812654"
       ]
     ]
   },
   {
-    "id": "81cfd436.09d848",
+    "id": "2b6629f8.8ae99e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5455.916732788086,
-    "y": 4308.56867980957,
-    "z": "2414cd0b.85dac2",
+    "x": 5457.916732788086,
+    "y": 4259.56867980957,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f77cd261.9bc248"
+        "575e916.aaad5f"
       ]
     ]
   },
   {
-    "id": "56387492.e922bc",
+    "id": "6b873c45.812654",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5574.916763305664,
-    "y": 4382.568710327148,
-    "z": "2414cd0b.85dac2",
+    "x": 5576.916763305664,
+    "y": 4333.568710327148,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "ebf96cf8.b5e018",
+    "id": "1440683a.de744",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4543.599868774414,
-    "y": 3954.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4545.599868774414,
+    "y": 3905.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "305ba790.74ff78",
+    "id": "c9d5b018.f8051",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4888.599868774414,
-    "y": 3816.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4890.599868774414,
+    "y": 3767.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "810cd856.9ccc78"
+        "74718a63.36de84"
       ]
     ]
   },
   {
-    "id": "c7beb2fc.58c5e",
+    "id": "55284001.8f5b08",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4595.599868774414,
-    "y": 3810.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4597.599868774414,
+    "y": 3761.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "305ba790.74ff78"
+        "c9d5b018.f8051"
       ]
     ]
   },
   {
-    "id": "42cb0058.08b348",
+    "id": "75332f13.262108",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4850.599868774414,
-    "y": 3767.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4852.599868774414,
+    "y": 3718.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "f96c39ea.1e754",
+    "id": "1dffa908.5b5767",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4539.599868774414,
-    "y": 3862.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4541.599868774414,
+    "y": 3813.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9b7536d9.f58d3",
+    "id": "2247e7bb.aa6698",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4547.599868774414,
-    "y": 3907.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4549.599868774414,
+    "y": 3858.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "78f36f08.9d23a",
+    "id": "766a8bc6.9fb0cc",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4544.599868774414,
-    "y": 3760.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4546.599868774414,
+    "y": 3711.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "810cd856.9ccc78",
+    "id": "74718a63.36de84",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4797.599868774414,
-    "y": 3884.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4799.599868774414,
+    "y": 3835.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "842c0b07.9daf5"
+        "238ee53c.904a6a"
       ]
     ]
   },
   {
-    "id": "842c0b07.9daf5",
+    "id": "238ee53c.904a6a",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4982.599868774414,
-    "y": 3883.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4984.599868774414,
+    "y": 3834.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "effe4e96.61186"
+        "7de620b3.3d3198"
       ]
     ]
   },
   {
-    "id": "effe4e96.61186",
+    "id": "7de620b3.3d3198",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5174.599868774414,
-    "y": 3886.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5176.599868774414,
+    "y": 3837.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e837bc5d.d6f4a"
+        "f9ce03fd.3df508"
       ]
     ]
   },
   {
-    "id": "e837bc5d.d6f4a",
+    "id": "f9ce03fd.3df508",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5346.599868774414,
-    "y": 3882.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5348.599868774414,
+    "y": 3833.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "5ae03ba5.e05364",
+    "id": "d48247ca.056eb",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4722.599868774414,
-    "y": 3997.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4724.599868774414,
+    "y": 3948.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "407839fb.167e2",
+    "id": "db019ae8.f69e68",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4239.599868774414,
-    "y": 3782.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4241.599868774414,
+    "y": 3733.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "873e71a3.8a59a",
-        "2ae96c09.c29bbc",
-        "f96c39ea.1e754",
-        "9b7536d9.f58d3",
-        "ebf96cf8.b5e018",
-        "c7beb2fc.58c5e",
-        "5ae03ba5.e05364"
+        "d62659b6.160db8",
+        "cf64723d.dfeea8",
+        "1dffa908.5b5767",
+        "2247e7bb.aa6698",
+        "1440683a.de744",
+        "55284001.8f5b08",
+        "d48247ca.056eb"
       ]
     ]
   },
   {
-    "id": "78165047.ec87e8",
+    "id": "1fb81d61.c0c6c3",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4224.599868774414,
-    "y": 3716.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4226.599868774414,
+    "y": 3667.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2ae96c09.c29bbc",
+    "id": "cf64723d.dfeea8",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4603.599868774414,
-    "y": 3703.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4605.599868774414,
+    "y": 3654.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d4c85a8.dd0a8a8",
-        "e8890a4e.1d2fd",
-        "42cb0058.08b348"
+        "61f8c12d.7ec188",
+        "b0224d35.db0ba",
+        "75332f13.262108"
       ]
     ]
   },
   {
-    "id": "d4c85a8.dd0a8a8",
+    "id": "61f8c12d.7ec188",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4839.599868774414,
-    "y": 3686.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4841.599868774414,
+    "y": 3637.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e8890a4e.1d2fd",
+    "id": "b0224d35.db0ba",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4836.599868774414,
-    "y": 3727.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4838.599868774414,
+    "y": 3678.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "873e71a3.8a59a",
+    "id": "d62659b6.160db8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4552.599868774414,
-    "y": 3660.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4554.599868774414,
+    "y": 3611.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "86fc32b9.5b11e8",
+    "id": "cbd695e8.8ce3",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5281.999771118164,
-    "y": 4709.685653686523,
-    "z": "2414cd0b.85dac2",
+    "x": 5283.999771118164,
+    "y": 4660.685653686523,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3b9c82f6.e6f406",
+    "id": "8f38170c.15c52",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5070.999771118164,
-    "y": 4771.685653686523,
-    "z": "2414cd0b.85dac2",
+    "x": 5072.999771118164,
+    "y": 4722.685653686523,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1361709c.aa1da7"
+        "eec0ed64.666e3"
       ]
     ]
   },
   {
-    "id": "1361709c.aa1da7",
+    "id": "eec0ed64.666e3",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5314.999771118164,
-    "y": 4777.685653686523,
-    "z": "2414cd0b.85dac2",
+    "x": 5316.999771118164,
+    "y": 4728.685653686523,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "65e42246.3bc70c",
-        "4c5853af.96f634"
+        "da15375d.9b0ee8",
+        "3ee187ea.cd5be8"
       ]
     ]
   },
   {
-    "id": "65e42246.3bc70c",
+    "id": "da15375d.9b0ee8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5545.999771118164,
-    "y": 4755.685653686523,
-    "z": "2414cd0b.85dac2",
+    "x": 5547.999771118164,
+    "y": 4706.685653686523,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "86c13c.8334e6c8"
+        "7e1ed8b0.7851f"
       ]
     ]
   },
   {
-    "id": "4c5853af.96f634",
+    "id": "3ee187ea.cd5be8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5550.999771118164,
-    "y": 4822.685653686523,
-    "z": "2414cd0b.85dac2",
+    "x": 5552.999771118164,
+    "y": 4773.685653686523,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c5f7e346.0cad5",
+    "id": "33a4fd6a.f05cf2",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5799.883529663086,
-    "y": 4320.36799621582,
-    "z": "2414cd0b.85dac2",
+    "x": 5801.883529663086,
+    "y": 4271.36799621582,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "36b3fe84.38d7ba",
-        "4dc5480c.f82fe8"
+        "e619571d.07b27",
+        "7e5b3b13.527164"
       ]
     ]
   },
   {
-    "id": "36b3fe84.38d7ba",
+    "id": "e619571d.07b27",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5954.883560180664,
-    "y": 4248.368270874023,
-    "z": "2414cd0b.85dac2",
+    "x": 5956.883560180664,
+    "y": 4199.368270874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "55b477cf.ef13f8"
+        "a419c34.20a76c"
       ]
     ]
   },
   {
-    "id": "4dc5480c.f82fe8",
+    "id": "7e5b3b13.527164",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5955.883560180664,
-    "y": 4381.368270874023,
-    "z": "2414cd0b.85dac2",
+    "x": 5957.883560180664,
+    "y": 4332.368270874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c669d5e6.7b56e8"
+        "8b03748e.6511"
       ]
     ]
   },
   {
-    "id": "55b477cf.ef13f8",
+    "id": "a419c34.20a76c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6099.883560180664,
-    "y": 4248.368515014648,
-    "z": "2414cd0b.85dac2",
+    "x": 6101.883560180664,
+    "y": 4199.368515014648,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "13bb5bff.e1f664",
-        "d1738758.598cd8"
+        "e331e060.96ce2",
+        "f02eaafa.80f4b"
       ]
     ]
   },
   {
-    "id": "13bb5bff.e1f664",
+    "id": "e331e060.96ce2",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6392.883560180664,
-    "y": 4226.368270874023,
-    "z": "2414cd0b.85dac2",
+    "x": 6394.883560180664,
+    "y": 4177.368270874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d1738758.598cd8",
+    "id": "f02eaafa.80f4b",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6344.533462524414,
-    "y": 4273.685165405273,
-    "z": "2414cd0b.85dac2",
+    "x": 6346.533462524414,
+    "y": 4224.685165405273,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c20dae0a.c8db1",
+    "id": "fac6e0eb.b7e5e8",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6417.883529663086,
-    "y": 4175.36799621582,
-    "z": "2414cd0b.85dac2",
+    "x": 6419.883529663086,
+    "y": 4126.36799621582,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c669d5e6.7b56e8",
+    "id": "8b03748e.6511",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6111.883560180664,
-    "y": 4380.368515014648,
-    "z": "2414cd0b.85dac2",
+    "x": 6113.883560180664,
+    "y": 4331.368515014648,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fbd54f6b.bd5de8",
-        "4b0d9778.02ef98"
+        "7cde89b.f9cde78",
+        "44d5eb8e.8b5a7c"
       ]
     ]
   },
   {
-    "id": "fbd54f6b.bd5de8",
+    "id": "7cde89b.f9cde78",
     "type": "save",
     "name": "update the-vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6404.883560180664,
-    "y": 4358.368270874023,
-    "z": "2414cd0b.85dac2",
+    "x": 6406.883560180664,
+    "y": 4309.368270874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "4b0d9778.02ef98",
+    "id": "44d5eb8e.8b5a7c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6356.533462524414,
-    "y": 4405.685165405273,
-    "z": "2414cd0b.85dac2",
+    "x": 6358.533462524414,
+    "y": 4356.685165405273,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "2c35c11.f28a13e",
+    "id": "8783d256.dfbee8",
     "type": "comment",
     "name": "decrease the bw of the-vpn-binding and change status to modified",
     "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6428.883560180664,
-    "y": 4319.368270874023,
-    "z": "2414cd0b.85dac2",
+    "x": 6430.883560180664,
+    "y": 4270.368270874023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "86c13c.8334e6c8",
+    "id": "7e1ed8b0.7851f",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5751.116470336914,
-    "y": 4762.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5753.116470336914,
+    "y": 4713.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f84ec623.3e0358",
-        "579a6f55.5876b8"
+        "cf050a6d.dffd88",
+        "15aed249.cbc52e"
       ]
     ]
   },
   {
-    "id": "f84ec623.3e0358",
+    "id": "cf050a6d.dffd88",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5946.116470336914,
-    "y": 4690.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5948.116470336914,
+    "y": 4641.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7ac296e6.db7d4"
+        "5ed50abf.ff9d7c"
       ]
     ]
   },
   {
-    "id": "579a6f55.5876b8",
+    "id": "15aed249.cbc52e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5947.116470336914,
-    "y": 4823.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5949.116470336914,
+    "y": 4774.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "63acc8c1.d0489"
+        "2100e232.b11cce"
       ]
     ]
   },
   {
-    "id": "7ac296e6.db7d4",
+    "id": "5ed50abf.ff9d7c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6091.116470336914,
-    "y": 4690.569198608398,
-    "z": "2414cd0b.85dac2",
+    "x": 6093.116470336914,
+    "y": 4641.569198608398,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7470326b.50fd4c",
-        "6067f5da.462f2c"
+        "e4e29811.e1048",
+        "e58be206.dcc488"
       ]
     ]
   },
   {
-    "id": "7470326b.50fd4c",
+    "id": "e4e29811.e1048",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6384.116470336914,
-    "y": 4668.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 6386.116470336914,
+    "y": 4619.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "6067f5da.462f2c",
+    "id": "e58be206.dcc488",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6335.766372680664,
-    "y": 4715.885848999023,
-    "z": "2414cd0b.85dac2",
+    "x": 6337.766372680664,
+    "y": 4666.885848999023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "b621fab3.fd22d8",
+    "id": "fa3f6ab4.8ef07",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6408.116470336914,
-    "y": 4629.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 6410.116470336914,
+    "y": 4580.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "63acc8c1.d0489",
+    "id": "2100e232.b11cce",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6103.116470336914,
-    "y": 4822.569198608398,
-    "z": "2414cd0b.85dac2",
+    "x": 6105.116470336914,
+    "y": 4773.569198608398,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ab9c7cb.6ee1c8",
-        "478e555b.00c56c"
+        "8a653803.fc1f6",
+        "4431f46f.b3008c"
       ]
     ]
   },
   {
-    "id": "ab9c7cb.6ee1c8",
+    "id": "8a653803.fc1f6",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6396.116470336914,
-    "y": 4800.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 6398.116470336914,
+    "y": 4751.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "478e555b.00c56c",
+    "id": "4431f46f.b3008c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6347.766372680664,
-    "y": 4847.885848999023,
-    "z": "2414cd0b.85dac2",
+    "x": 6349.766372680664,
+    "y": 4798.885848999023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "57c5a214.d70e3c",
+    "id": "bbeeae4d.bca708",
     "type": "comment",
     "name": "decrease the bw of the-vpn-binding and change status to modified",
     "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6420.116470336914,
-    "y": 4761.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 6422.116470336914,
+    "y": 4712.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b34554cf.aa2d2",
+    "id": "aea70ead.9836b8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5158.966567993164,
-    "y": 5502.769149780273,
-    "z": "2414cd0b.85dac2",
+    "x": 5160.966567993164,
+    "y": 5453.769149780273,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "613e9b77.298d54",
+    "id": "2e1e6c02.39beec",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5156.749771118164,
-    "y": 5542.969345092773,
-    "z": "2414cd0b.85dac2",
+    "x": 5158.749771118164,
+    "y": 5493.969345092773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "95d677c9.726458",
+    "id": "a8fe1a2c.71b3c8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5032.000015258789,
-    "y": 5727.452255249023,
-    "z": "2414cd0b.85dac2",
+    "x": 5034.000015258789,
+    "y": 5678.452255249023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6712b992.157",
+    "id": "7871c32f.9d91cc",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5029.783218383789,
-    "y": 5767.652450561523,
-    "z": "2414cd0b.85dac2",
+    "x": 5031.783218383789,
+    "y": 5718.652450561523,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "abfdee17.12df08",
+    "id": "685061c3.01675",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5129.116470336914,
-    "y": 6051.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5131.116470336914,
+    "y": 6002.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "1b1c3355.4ab2b5",
+    "id": "29335c50.b3bc5c",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4956.116470336914,
-    "y": 6108.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 4958.116470336914,
+    "y": 6059.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5c00f9d2.103a1",
-        "4db44e39.57056"
+        "a0a30ce1.826348",
+        "8ce5c005.55e608"
       ]
     ]
   },
   {
-    "id": "5c00f9d2.103a1",
+    "id": "a0a30ce1.826348",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5167.116470336914,
-    "y": 6108.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5169.116470336914,
+    "y": 6059.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e62c2a04.834ba8"
+        "590e11da.6a5d5"
       ]
     ]
   },
   {
-    "id": "4db44e39.57056",
+    "id": "8ce5c005.55e608",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5163.116470336914,
-    "y": 6156.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5165.116470336914,
+    "y": 6107.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2dd9a1ca.3380de"
+        "ceea008c.a129b"
       ]
     ]
   },
   {
-    "id": "e62c2a04.834ba8",
+    "id": "590e11da.6a5d5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5323.116470336914,
-    "y": 6104.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5325.116470336914,
+    "y": 6055.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "59a4f603.629458",
-        "cf3067c2.3ee01",
-        "b81f8f7c.c8bbe"
+        "755f894f.dc414",
+        "2f6a3eee.3c813a",
+        "d68f19c9.00e6c"
       ]
     ]
   },
   {
-    "id": "2dd9a1ca.3380de",
+    "id": "ceea008c.a129b",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 5311.116470336914,
-    "y": 6151.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5313.116470336914,
+    "y": 6102.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4526cd48.9f1514",
+    "id": "692d5d8e.91da94",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5589.000259399414,
-    "y": 6204.452255249023,
-    "z": "2414cd0b.85dac2",
+    "x": 5591.000259399414,
+    "y": 6155.452255249023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b81f8f7c.c8bbe",
+    "id": "d68f19c9.00e6c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5586.783462524414,
-    "y": 6244.652450561523,
-    "z": "2414cd0b.85dac2",
+    "x": 5588.783462524414,
+    "y": 6195.652450561523,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "cf3067c2.3ee01",
+    "id": "2f6a3eee.3c813a",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5706.116470336914,
-    "y": 6156.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5708.116470336914,
+    "y": 6107.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "59a4f603.629458",
+    "id": "755f894f.dc414",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5577.116470336914,
-    "y": 6104.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5579.116470336914,
+    "y": 6055.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "67b13c77.507314",
+    "id": "e084ba5b.54a44",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5018.116470336914,
-    "y": 6009.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5020.116470336914,
+    "y": 5960.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e11abdc.71e19c",
+    "id": "ac6c48.3b961bb8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4665.449478149414,
-    "y": 6096.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 4667.449478149414,
+    "y": 6047.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "abfdee17.12df08",
-        "1b1c3355.4ab2b5",
-        "b5179b.b5811868",
-        "8a0b9185.29b548"
+        "685061c3.01675",
+        "29335c50.b3bc5c",
+        "2fa7a2c0.97e2e6",
+        "ed4e275a.a600a"
       ]
     ]
   },
   {
-    "id": "6a0cb0e4.5bec78",
+    "id": "f3a1ad9d.6eb4a8",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5009.199966430664,
-    "y": 6565.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5011.199966430664,
+    "y": 6516.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "4b79bf18.1b12f8",
+    "id": "d3bca3b6.20d5e8",
     "type": "comment",
     "name": "TODO: BUG -- DONE",
     "info": "momkene connectivity haye vasati ke dummy hastand ham\nvpn-binding dashte bashand ke too in path involve hast pas\nbayad bw aan niz update shavad.",
     "comments": "",
-    "x": 3714.567123413086,
-    "y": 3842.2857208251953,
-    "z": "2414cd0b.85dac2",
+    "x": 3716.567123413086,
+    "y": 3793.2857208251953,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "931a7a68.51c848",
+    "id": "cb5f4cbc.1262b8",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4467.100326538086,
-    "y": 4116.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4469.100326538086,
+    "y": 4067.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "810ab4c1.abf7e",
-        "4e13a1b8.dde8c",
-        "e5e81f70.f40458"
+        "e967ddfe.3a6e28",
+        "90c367c2.c3898",
+        "a6021f01.4f12a"
       ]
     ]
   },
   {
-    "id": "c0e77edb.5b02c",
+    "id": "1401df85.96017",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4575.100570678711,
-    "y": 4072.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 4577.100570678711,
+    "y": 4023.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "810ab4c1.abf7e",
+    "id": "e967ddfe.3a6e28",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4672.100326538086,
-    "y": 4113.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4674.100326538086,
+    "y": 4064.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fa4e460e.6cd96"
+        "358ef01b.aa0e8"
       ]
     ]
   },
   {
-    "id": "4e13a1b8.dde8c",
+    "id": "90c367c2.c3898",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4655.591293334961,
-    "y": 4174.976455688477,
-    "z": "2414cd0b.85dac2",
+    "x": 4657.591293334961,
+    "y": 4125.976455688477,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4d1c0281.9a84bc"
+        "e4912ec.a7606d"
       ]
     ]
   },
   {
-    "id": "e5e81f70.f40458",
+    "id": "a6021f01.4f12a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4653.100326538086,
-    "y": 4218.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4655.100326538086,
+    "y": 4169.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5961321d.8806a4"
+        "ac2440d8.b536c"
       ]
     ]
   },
   {
-    "id": "fa4e460e.6cd96",
+    "id": "358ef01b.aa0e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4840.100570678711,
-    "y": 4108.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4842.100570678711,
+    "y": 4059.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4d09e7f7.7140b8"
+        "f658df6.9a7612"
       ]
     ]
   },
   {
-    "id": "4d1c0281.9a84bc",
+    "id": "e4912ec.a7606d",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4818.162704467773,
-    "y": 4175.262191772461,
-    "z": "2414cd0b.85dac2",
+    "x": 4820.162704467773,
+    "y": 4126.262191772461,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "5961321d.8806a4",
+    "id": "ac2440d8.b536c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4820.100326538086,
-    "y": 4217.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4822.100326538086,
+    "y": 4168.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4d09e7f7.7140b8",
+    "id": "f658df6.9a7612",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5078.100570678711,
-    "y": 4113.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 5080.100570678711,
+    "y": 4064.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "45b87759.5a906"
+        "d609729e.4f23e"
       ]
     ]
   },
   {
-    "id": "45b87759.5a906",
+    "id": "d609729e.4f23e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5312.100326538086,
-    "y": 4120.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 5314.100326538086,
+    "y": 4071.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c808b6be.91a2f"
+        "f1d3809d.7253c8"
       ]
     ]
   },
   {
-    "id": "f4ea682a.e63f08",
+    "id": "ca40fb3f.0ddd08",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4445.800033569336,
-    "y": 4042.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 4447.800033569336,
+    "y": 3993.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1d230bf5.a23cfc",
+    "id": "1e5e2cd.ecb6453",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5728.949935913086,
-    "y": 4130.985427856445,
-    "z": "2414cd0b.85dac2",
+    "x": 5730.949935913086,
+    "y": 4081.9854278564453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "516d68ca.7c7f6"
+        "960f8364.63d43"
       ]
     ]
   },
   {
-    "id": "516d68ca.7c7f6",
+    "id": "960f8364.63d43",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5920.949935913086,
-    "y": 4119.98567199707,
-    "z": "2414cd0b.85dac2",
+    "x": 5922.949935913086,
+    "y": 4070.9856719970703,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "39e7022f.c30a2e"
+        "f97c2bb4.e56a"
       ]
     ]
   },
   {
-    "id": "39e7022f.c30a2e",
+    "id": "f97c2bb4.e56a",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6102.949935913086,
-    "y": 4098.98567199707,
-    "z": "2414cd0b.85dac2",
+    "x": 6104.949935913086,
+    "y": 4049.9856719970703,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "455228ea.3ce16"
+        "b79d4999.d7cb98"
       ]
     ]
   },
   {
-    "id": "455228ea.3ce16",
+    "id": "b79d4999.d7cb98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 6264.949935913086,
-    "y": 4087.9856719970703,
-    "z": "2414cd0b.85dac2",
+    "x": 6266.949935913086,
+    "y": 4038.9856719970703,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "826e861c.8cb3f8",
-        "78a2c33b.328edc"
+        "722e24a9.0c2c14",
+        "e69b5880.065b08"
       ]
     ]
   },
   {
-    "id": "826e861c.8cb3f8",
+    "id": "722e24a9.0c2c14",
     "type": "set",
     "name": "unset tmp.the-connectivity",
     "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
     "comments": "",
-    "x": 6461.949935913086,
-    "y": 4016.9856719970703,
-    "z": "2414cd0b.85dac2",
+    "x": 6463.949935913086,
+    "y": 3967.9856719970703,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d1bcb0d5.b833a",
+    "id": "ee3fdd91.33b3e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5635.900131225586,
-    "y": 4245.985427856445,
-    "z": "2414cd0b.85dac2",
+    "x": 5637.900131225586,
+    "y": 4196.985427856445,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c5f7e346.0cad5",
-        "1d230bf5.a23cfc",
-        "1966547c.c3884c",
-        "d31d83e1.8d9b98"
+        "33a4fd6a.f05cf2",
+        "1e5e2cd.ecb6453",
+        "126e49f8.4ace7e",
+        "fdd429d6.294198"
       ]
     ]
   },
   {
-    "id": "1966547c.c3884c",
+    "id": "126e49f8.4ace7e",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5767.466537475586,
-    "y": 4021.2024688720703,
-    "z": "2414cd0b.85dac2",
+    "x": 5769.466537475586,
+    "y": 3972.2024688720703,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d31d83e1.8d9b98",
+    "id": "fdd429d6.294198",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 5759.466537475586,
-    "y": 4070.2024688720703,
-    "z": "2414cd0b.85dac2",
+    "x": 5761.466537475586,
+    "y": 4021.2024688720703,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "78a2c33b.328edc",
+    "id": "e69b5880.065b08",
     "type": "set",
     "name": "set tmp.the-connectivity.connectivity-id",
     "xml": "<set>\n<parameter name='tmp.the-connectivity.connectivity-id' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",
     "comments": "",
-    "x": 6467.416732788086,
-    "y": 4126.20246887207,
-    "z": "2414cd0b.85dac2",
+    "x": 6469.416732788086,
+    "y": 4077.2024688720703,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b4318014.e1a038",
+    "id": "bca47127.d5cfd8",
     "type": "set",
     "name": "set vpnNameToSearch",
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
     "comments": "",
-    "x": 5760.683334350586,
-    "y": 3844.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 5762.683334350586,
+    "y": 3795.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "985ed7d4.ec17a",
+    "id": "16b26942.410c5f",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5914.683334350586,
-    "y": 3896.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 5916.683334350586,
+    "y": 3847.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "f77cd261.9bc248",
+    "id": "575e916.aaad5f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5505.683334350586,
-    "y": 3963.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 5507.683334350586,
+    "y": 3914.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "985ed7d4.ec17a",
-        "543e7c89.750024",
-        "b4318014.e1a038"
+        "16b26942.410c5f",
+        "4e79a048.28ceb8",
+        "bca47127.d5cfd8"
       ]
     ]
   },
   {
-    "id": "543e7c89.750024",
+    "id": "4e79a048.28ceb8",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5759.683334350586,
-    "y": 3951.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 5761.683334350586,
+    "y": 3902.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8bf41864.55ad6"
+        "d6032421.ea99d8"
       ]
     ]
   },
   {
-    "id": "8bf41864.55ad6",
+    "id": "d6032421.ea99d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5938.683334350586,
-    "y": 3950.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 5940.683334350586,
+    "y": 3901.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d1bcb0d5.b833a"
+        "ee3fdd91.33b3e8"
       ]
     ]
   },
   {
-    "id": "fc947668.8a9d8",
+    "id": "eb8749e3.22de7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4636.683334350586,
-    "y": 7468.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4638.683334350586,
+    "y": 7419.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9818a5dd.1c569",
-        "2b482f66.6e7e5",
-        "43c9acaa.ef761c"
+        "aa8c3669.88cdf8",
+        "fad2776b.9a9d28",
+        "2612fef6.812a92"
       ]
     ]
   },
   {
-    "id": "43c9acaa.ef761c",
+    "id": "2612fef6.812a92",
     "type": "set",
     "name": "set vpnNameToSearch",
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
     "comments": "",
-    "x": 4859.683334350586,
-    "y": 7412.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4861.683334350586,
+    "y": 7363.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9818a5dd.1c569",
+    "id": "aa8c3669.88cdf8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5038.683334350586,
-    "y": 7455.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 5040.683334350586,
+    "y": 7406.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "2b482f66.6e7e5",
+    "id": "fad2776b.9a9d28",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4883.683334350586,
-    "y": 7510.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4885.683334350586,
+    "y": 7461.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e0a7a605.9205d8"
+        "2437b1d5.2f95e6"
       ]
     ]
   },
   {
-    "id": "e0a7a605.9205d8",
+    "id": "2437b1d5.2f95e6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5062.683334350586,
-    "y": 7509.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 5064.683334350586,
+    "y": 7460.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "86241828.71762"
+        "268cfed4.3ed072"
       ]
     ]
   },
   {
-    "id": "811fcd41.48413",
+    "id": "f140933b.8acec",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4793.683334350586,
-    "y": 7148.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4795.683334350586,
+    "y": 7099.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9cc0dadb.189ef",
+    "id": "c1a83ef0.efb158",
     "type": "set",
     "name": "unset secondary related variables",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
     "comments": "",
-    "x": 3359.2999420166016,
-    "y": 542.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 3361.2999420166016,
+    "y": 493.85240173339844,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "79c99b01.4060a4",
+    "id": "30c464f6.21891c",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4134.399429321289,
-    "y": 603.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 4136.399429321289,
+    "y": 554.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4bbb66bd.93eca"
+        "92681273.ecf0b8"
       ]
     ]
   },
   {
-    "id": "4bbb66bd.93eca",
+    "id": "92681273.ecf0b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4303.399429321289,
-    "y": 600.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 4305.399429321289,
+    "y": 551.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "506bfd50.24ebdc",
-        "e2033e30.afcd1"
+        "c003a5ba.a5cd",
+        "f6645586.4c0b38"
       ]
     ]
   },
   {
-    "id": "506bfd50.24ebdc",
+    "id": "c003a5ba.a5cd",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4527.399429321289,
-    "y": 633.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 4529.399429321289,
+    "y": 584.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e2033e30.afcd1",
+    "id": "f6645586.4c0b38",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4473.399429321289,
-    "y": 673.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 4475.399429321289,
+    "y": 624.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fb5e94da.526bd",
+    "id": "513e1ab4.43497c",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4099.399917602539,
-    "y": 803.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 4101.399917602539,
+    "y": 754.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2507bbe.52fb3c4"
+        "b7c1f5eb.1c0428"
       ]
     ]
   },
   {
-    "id": "2507bbe.52fb3c4",
+    "id": "b7c1f5eb.1c0428",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4264.399185180664,
-    "y": 808.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 4266.399185180664,
+    "y": 759.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "93fd5f76.e542d8",
-        "736d4375.48de7c"
+        "8d3bba48.eab118",
+        "ecf8bfe7.1b0ad8"
       ]
     ]
   },
   {
-    "id": "93fd5f76.e542d8",
+    "id": "8d3bba48.eab118",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4511.399429321289,
-    "y": 890.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 4513.399429321289,
+    "y": 841.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "736d4375.48de7c",
+    "id": "ecf8bfe7.1b0ad8",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4457.399429321289,
-    "y": 930.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 4459.399429321289,
+    "y": 881.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e9c6a99.90dcbd8",
+    "id": "8429e2be.11d098",
     "type": "save",
     "name": "get network-route-three from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
     "comments": "",
     "outputs": 1,
-    "x": 3342.399917602539,
-    "y": 942.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 3344.399917602539,
+    "y": 893.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "554ea6a8.9888f",
-        "3be7a41.d9c04dc",
-        "65e70654.5cdcc8"
+        "ad35aa48.056498",
+        "881c5027.ef1da8",
+        "c8b7bc97.b40ba"
       ]
     ]
   },
   {
-    "id": "554ea6a8.9888f",
+    "id": "ad35aa48.056498",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3584.399917602539,
-    "y": 935.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 3586.399917602539,
+    "y": 886.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3be7a41.d9c04dc",
+    "id": "881c5027.ef1da8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3579.908981323242,
-    "y": 977.4784698486328,
-    "z": "2414cd0b.85dac2",
+    "x": 3581.908981323242,
+    "y": 928.4784698486328,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "65e70654.5cdcc8",
+    "id": "c8b7bc97.b40ba",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3583.908950805664,
-    "y": 1025.4784393310547,
-    "z": "2414cd0b.85dac2",
+    "x": 3585.908950805664,
+    "y": 976.4784393310547,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "834a986c.4e7048"
+        "9ce363a2.dd0398"
       ]
     ]
   },
   {
-    "id": "834a986c.4e7048",
+    "id": "9ce363a2.dd0398",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3745.399917602539,
-    "y": 966.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 3747.399917602539,
+    "y": 917.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f5a8155b.186e1"
+        "411baca6.4afa04"
       ]
     ]
   },
   {
-    "id": "f5a8155b.186e1",
+    "id": "411baca6.4afa04",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3916.399917602539,
-    "y": 966.0525970458984,
-    "z": "2414cd0b.85dac2",
+    "x": 3918.399917602539,
+    "y": 917.0525970458984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "49a01940.91879",
-        "fb61a82e.a48e6",
-        "bf3bb014.cd44d"
+        "d6c02163.09f2f",
+        "26b7eb30.1a16a4",
+        "96d019f1.51b6c"
       ]
     ]
   },
   {
-    "id": "49a01940.91879",
+    "id": "d6c02163.09f2f",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4083.399673461914,
-    "y": 876.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4085.399673461914,
+    "y": 827.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "13796778.1bcaa1"
+        "a0fe031a.dea47"
       ]
     ]
   },
   {
-    "id": "fb61a82e.a48e6",
+    "id": "26b7eb30.1a16a4",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4085.399673461914,
-    "y": 930.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4087.399673461914,
+    "y": 881.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "dfa37602.2a592"
+        "229f8aa8.94f7fe"
       ]
     ]
   },
   {
-    "id": "13796778.1bcaa1",
+    "id": "a0fe031a.dea47",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4211.399673461914,
-    "y": 876.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4213.399673461914,
+    "y": 827.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c61c7290.5d0048",
-        "9330928e.78e4a8"
+        "4f78be1b.93fa4",
+        "f44f2336.c1f56"
       ]
     ]
   },
   {
-    "id": "dfa37602.2a592",
+    "id": "229f8aa8.94f7fe",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4214.399673461914,
-    "y": 929.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4216.399673461914,
+    "y": 880.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b3bef05d.261898",
-        "4885c383.a5f124"
+        "a67f23a8.85781",
+        "587a77f8.86931"
       ]
     ]
   },
   {
-    "id": "9330928e.78e4a8",
+    "id": "f44f2336.c1f56",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4457.399429321289,
-    "y": 1015.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4459.399429321289,
+    "y": 966.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b3bef05d.261898",
+    "id": "a67f23a8.85781",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4474.399429321289,
-    "y": 1057.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4476.399429321289,
+    "y": 1008.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4885c383.a5f124",
+    "id": "587a77f8.86931",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4459.399429321289,
-    "y": 1095.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4461.399429321289,
+    "y": 1046.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c61c7290.5d0048",
+    "id": "4f78be1b.93fa4",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4471.399429321289,
-    "y": 975.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4473.399429321289,
+    "y": 926.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3c2a776f.fcd778",
+    "id": "fcadc9d5.a748f8",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4636.399429321289,
-    "y": 991.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4638.399429321289,
+    "y": 942.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "bf3bb014.cd44d",
+    "id": "96d019f1.51b6c",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4024.399917602539,
-    "y": 1021.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 4026.399917602539,
+    "y": 972.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4b490f7e.359388"
+        "af991ebb.5e627"
       ]
     ]
   },
   {
-    "id": "4b490f7e.359388",
+    "id": "af991ebb.5e627",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4198.399917602539,
-    "y": 1016.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 4200.399917602539,
+    "y": 967.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "14062c05.c0d224",
-        "a29138d9.9f86a8"
+        "f09b675e.f8da7",
+        "2dc559.0e4fdaa8"
       ]
     ]
   },
   {
-    "id": "a29138d9.9f86a8",
+    "id": "2dc559.0e4fdaa8",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4431.399429321289,
-    "y": 1185.0522918701172,
-    "z": "2414cd0b.85dac2",
+    "x": 4433.399429321289,
+    "y": 1136.0522918701172,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "14062c05.c0d224",
+    "id": "f09b675e.f8da7",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4485.399429321289,
-    "y": 1145.0522918701172,
-    "z": "2414cd0b.85dac2",
+    "x": 4487.399429321289,
+    "y": 1096.0522918701172,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "de8acab8.aa46c",
+    "id": "5c549048.27d988",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4599.399429321289,
-    "y": 1170.0522918701172,
-    "z": "2414cd0b.85dac2",
+    "x": 4601.399429321289,
+    "y": 1121.0522918701172,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fd1dbeb5.643a7",
+    "id": "f87c2434.973ea",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3600.066665649414,
-    "y": 2250.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3602.066665649414,
+    "y": 2201.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c723b1c5.5db71",
-        "935dac93.06ba68"
+        "5b1e0335.2e861c",
+        "c761c99f.075528"
       ]
     ]
   },
   {
-    "id": "bc4d7dbf.afb29",
+    "id": "7e1476f1.6750f8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3427.400161743164,
-    "y": 2251.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3429.400161743164,
+    "y": 2202.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fd1dbeb5.643a7"
+        "f87c2434.973ea"
       ]
     ]
   },
   {
-    "id": "e6ea02c1.c3c8b",
+    "id": "6c010aa3.624334",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3436.891128540039,
-    "y": 2293.8597869873047,
-    "z": "2414cd0b.85dac2",
+    "x": 3438.891128540039,
+    "y": 2244.8597869873047,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "4af5d292.f0e44c",
+    "id": "72d07b8a.849984",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3425.400161743164,
-    "y": 2340.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3427.400161743164,
+    "y": 2291.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c723b1c5.5db71",
+    "id": "5b1e0335.2e861c",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3886.400161743164,
-    "y": 2254.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3888.400161743164,
+    "y": 2205.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e1f3a987.bed2a8",
-        "cd75a949.bbc878"
+        "279a9ed1.bf6a32",
+        "e13b8d61.77167"
       ]
     ]
   },
   {
-    "id": "cd75a949.bbc878",
+    "id": "e13b8d61.77167",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4109.400161743164,
-    "y": 2209.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4111.400161743164,
+    "y": 2160.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c2b43a53.588108"
+        "76113157.988ef"
       ]
     ]
   },
   {
-    "id": "e1f3a987.bed2a8",
+    "id": "279a9ed1.bf6a32",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4111.400161743164,
-    "y": 2273.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4113.400161743164,
+    "y": 2224.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "183afe84.247bf9"
+        "26da469d.16a06a"
       ]
     ]
   },
   {
-    "id": "25934f35.38edd",
+    "id": "d7f7c5fa.4c43d8",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3199.400161743164,
-    "y": 2286.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3201.400161743164,
+    "y": 2237.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bc4d7dbf.afb29",
-        "e6ea02c1.c3c8b",
-        "4af5d292.f0e44c"
+        "7e1476f1.6750f8",
+        "6c010aa3.624334",
+        "72d07b8a.849984"
       ]
     ]
   },
   {
-    "id": "e6f36ca.9e7909",
+    "id": "1989a06e.d4f03",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3160.400161743164,
-    "y": 2230.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3162.400161743164,
+    "y": 2181.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4a92500a.dfe688",
+    "id": "334ad959.cb8dd6",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3219.400161743164,
-    "y": 2026.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3221.400161743164,
+    "y": 1977.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f38e9f0f.aeb28",
-        "c00bcf8d.007da8"
+        "52bf5f88.b043b",
+        "50b4842f.e69cbc"
       ]
     ]
   },
   {
-    "id": "c00bcf8d.007da8",
+    "id": "50b4842f.e69cbc",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3442.400161743164,
-    "y": 2012.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3444.400161743164,
+    "y": 1963.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8c221cd.f6641e"
+        "a9726b2d.fccd7"
       ]
     ]
   },
   {
-    "id": "f38e9f0f.aeb28",
+    "id": "52bf5f88.b043b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3444.400161743164,
-    "y": 2045.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3446.400161743164,
+    "y": 1996.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "8c221cd.f6641e",
+    "id": "a9726b2d.fccd7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3590.400161743164,
-    "y": 2005.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3592.400161743164,
+    "y": 1956.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7fdb72b7.69f4e4",
-        "70d5d0aa.d1559"
+        "5ee377e.4e34b08",
+        "eb05f6d8.e8b8d8"
       ]
     ]
   },
   {
-    "id": "7fdb72b7.69f4e4",
+    "id": "5ee377e.4e34b08",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3784.400161743164,
-    "y": 2008.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3786.400161743164,
+    "y": 1959.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "935dac93.06ba68",
+    "id": "c761c99f.075528",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3837.400131225586,
-    "y": 2377.2857208251953,
-    "z": "2414cd0b.85dac2",
+    "x": 3839.400131225586,
+    "y": 2328.2857208251953,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bb098115.17482"
+        "82e8744d.2f169"
       ]
     ]
   },
   {
-    "id": "bb098115.17482",
+    "id": "82e8744d.2f169",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4043.400131225586,
-    "y": 2377.2857208251953,
-    "z": "2414cd0b.85dac2",
+    "x": 4045.400131225586,
+    "y": 2328.2857208251953,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "eb63cf64.6fcac8"
+        "fde94d7a.1c1f78"
       ]
     ]
   },
   {
-    "id": "70d5d0aa.d1559",
+    "id": "eb05f6d8.e8b8d8",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3806.400161743164,
-    "y": 2076.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3808.400161743164,
+    "y": 2027.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4772aa88.8815f4",
-        "2f88517d.a786fe",
-        "a51a10da.7f1bc8"
+        "4c08dffc.53f9b",
+        "367fe0d1.441908",
+        "e6dd27d7.84d748"
       ]
     ]
   },
   {
-    "id": "4772aa88.8815f4",
+    "id": "4c08dffc.53f9b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4001.9002838134766,
-    "y": 2028.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4003.9002838134766,
+    "y": 1979.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bea56767.e75718"
+        "335d38ec.2d1a38"
       ]
     ]
   },
   {
-    "id": "2f88517d.a786fe",
+    "id": "367fe0d1.441908",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3993.9002838134766,
-    "y": 2083.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3995.9002838134766,
+    "y": 2034.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3775c8.545c2238"
+        "d6efed88.7d53"
       ]
     ]
   },
   {
-    "id": "a51a10da.7f1bc8",
+    "id": "e6dd27d7.84d748",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3998.9002838134766,
-    "y": 2140.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4000.9002838134766,
+    "y": 2091.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "afbc062e.468e"
+        "177f57a1.3eb1f8"
       ]
     ]
   },
   {
-    "id": "afbc062e.468e",
+    "id": "177f57a1.3eb1f8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4150.900283813477,
-    "y": 2141.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4152.900283813477,
+    "y": 2092.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "bea56767.e75718",
+    "id": "335d38ec.2d1a38",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4146.282608032227,
-    "y": 2025.9415435791016,
-    "z": "2414cd0b.85dac2",
+    "x": 4148.282608032227,
+    "y": 1976.9415435791016,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "80389683.dd0d1"
+        "6ad02bf1.79a934"
       ]
     ]
   },
   {
-    "id": "77f3463a.2b447",
+    "id": "4bfd3207.06ef5c",
     "type": "set",
     "name": "set SECONDARY-ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
     "comments": "",
-    "x": 3222.066665649414,
-    "y": 2365.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3224.066665649414,
+    "y": 2316.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "75f1943f.b94b8c",
+    "id": "7f049b99.392e44",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3897.066635131836,
-    "y": 2329.2857208251953,
-    "z": "2414cd0b.85dac2",
+    "x": 3899.066635131836,
+    "y": 2280.2857208251953,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "183afe84.247bf9",
+    "id": "26da469d.16a06a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4270.400161743164,
-    "y": 2292.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4272.400161743164,
+    "y": 2243.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c2b43a53.588108",
+    "id": "76113157.988ef",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4274.400161743164,
-    "y": 2206.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4276.400161743164,
+    "y": 2157.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "62ce6308.22a894",
-        "3f411974.bc06ee"
+        "9aa2a686.be54a8",
+        "433203.bfdcb5fc"
       ]
     ]
   },
   {
-    "id": "eb63cf64.6fcac8",
+    "id": "fde94d7a.1c1f78",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4260.685775756836,
-    "y": 2376.1074981689453,
-    "z": "2414cd0b.85dac2",
+    "x": 4262.685775756836,
+    "y": 2327.1074981689453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "68a23803.3ba65"
+        "2950d492.5666c4"
       ]
     ]
   },
   {
-    "id": "3775c8.545c2238",
+    "id": "d6efed88.7d53",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4161.900283813477,
-    "y": 2086.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4163.900283813477,
+    "y": 2037.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "62ce6308.22a894",
+    "id": "9aa2a686.be54a8",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
     "comments": "",
-    "x": 4444.400161743164,
-    "y": 2167.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4446.400161743164,
+    "y": 2118.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3f411974.bc06ee",
+    "id": "433203.bfdcb5fc",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
     "comments": "",
-    "x": 4445.400161743164,
-    "y": 2272.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4447.400161743164,
+    "y": 2223.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6316b810.f1aee8",
+    "id": "279b9c4d.6439cc",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4440.400161743164,
-    "y": 2221.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4442.400161743164,
+    "y": 2172.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "68a23803.3ba65",
+    "id": "2950d492.5666c4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4467.517318725586,
-    "y": 2365.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 4469.517318725586,
+    "y": 2316.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "affb5b24.b6cca8",
-        "4a56bfa4.77eef",
-        "2836e90b.67e1be"
+        "27d287be.22449",
+        "54646993.252b48",
+        "ce1fcbcf.439b7"
       ]
     ]
   },
   {
-    "id": "affb5b24.b6cca8",
+    "id": "27d287be.22449",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4682.517318725586,
-    "y": 2327.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 4684.517318725586,
+    "y": 2278.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4a56bfa4.77eef",
+    "id": "54646993.252b48",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4679.517318725586,
-    "y": 2366.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 4681.517318725586,
+    "y": 2317.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "963f6cd5.b5f28"
+        "4c6f5d99.cc2504"
       ]
     ]
   },
   {
-    "id": "2836e90b.67e1be",
+    "id": "ce1fcbcf.439b7",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4635.017318725586,
-    "y": 2408.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 4637.017318725586,
+    "y": 2359.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2cd6b3b7.1e0b44",
+    "id": "20c12f13.f01e2",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4728.400161743164,
-    "y": 2044.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4730.400161743164,
+    "y": 1995.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "af33acb2.7cd3c"
+        "2b8eec9f.d7eabc"
       ]
     ]
   },
   {
-    "id": "80389683.dd0d1",
+    "id": "6ad02bf1.79a934",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4330.400161743164,
-    "y": 2040.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4332.400161743164,
+    "y": 1991.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6ef2734a.a2ab44"
+        "656e6085.f2c5b8"
       ]
     ]
   },
   {
-    "id": "6ef2734a.a2ab44",
+    "id": "656e6085.f2c5b8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4525.400161743164,
-    "y": 2040.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4527.400161743164,
+    "y": 1991.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2cd6b3b7.1e0b44",
-        "a9acfdfb.534e9"
+        "20c12f13.f01e2",
+        "f43b8884.ec34f"
       ]
     ]
   },
   {
-    "id": "a9acfdfb.534e9",
+    "id": "f43b8884.ec34f",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4730.400161743164,
-    "y": 2117.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4732.400161743164,
+    "y": 2068.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3ae5ea54.6e54a6"
+        "16e499c4.79bb2e"
       ]
     ]
   },
   {
-    "id": "963f6cd5.b5f28",
+    "id": "4c6f5d99.cc2504",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4860.017318725586,
-    "y": 2365.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 4862.017318725586,
+    "y": 2316.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e92c023f.140be8"
+        "955e8579.618ad8"
       ]
     ]
   },
   {
-    "id": "e92c023f.140be8",
+    "id": "955e8579.618ad8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5018.017318725586,
-    "y": 2365.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 5020.017318725586,
+    "y": 2316.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b67ecfac.fb906"
+        "7f2dc653.30af1"
       ]
     ]
   },
   {
-    "id": "b67ecfac.fb906",
+    "id": "7f2dc653.30af1",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5225.017318725586,
-    "y": 2365.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 5227.017318725586,
+    "y": 2316.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "af33acb2.7cd3c",
+    "id": "2b8eec9f.d7eabc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4905.400161743164,
-    "y": 2036.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4907.400161743164,
+    "y": 1987.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "21a9bcb5.4aa85c",
-        "c4167bd6.551f58"
+        "6743bfb3.fe491",
+        "f129d672.d83d38"
       ]
     ]
   },
   {
-    "id": "c4167bd6.551f58",
+    "id": "f129d672.d83d38",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5113.400161743164,
-    "y": 2043.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5115.400161743164,
+    "y": 1994.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8ae061a9.0d8d7",
-        "7fc92de3.a78f3c",
-        "220302ba.be0f7e"
+        "2fcdf070.6eea68",
+        "1f831cdc.092a93",
+        "38d0f9ee.3ac5f6"
       ]
     ]
   },
   {
-    "id": "3ae5ea54.6e54a6",
+    "id": "16e499c4.79bb2e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4907.400161743164,
-    "y": 2109.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4909.400161743164,
+    "y": 2060.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "256fff1.5dd26"
+        "7af0e2e8.47fa2c"
       ]
     ]
   },
   {
-    "id": "21a9bcb5.4aa85c",
+    "id": "6743bfb3.fe491",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainC id",
     "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5143.400161743164,
-    "y": 1991.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5145.400161743164,
+    "y": 1942.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "256fff1.5dd26",
+    "id": "7af0e2e8.47fa2c",
     "type": "set",
     "name": "set domainC ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5142.400161743164,
-    "y": 2233.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5144.400161743164,
+    "y": 2184.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "8ae061a9.0d8d7",
+    "id": "2fcdf070.6eea68",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5323.400161743164,
-    "y": 2034.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5325.400161743164,
+    "y": 1985.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9c166c79.f96aa8"
+        "c8f2d024.71cdc8"
       ]
     ]
   },
   {
-    "id": "7fc92de3.a78f3c",
+    "id": "1f831cdc.092a93",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5315.400161743164,
-    "y": 2089.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5317.400161743164,
+    "y": 2040.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f289682c.7a8f28"
+        "67195fbd.2c818"
       ]
     ]
   },
   {
-    "id": "220302ba.be0f7e",
+    "id": "38d0f9ee.3ac5f6",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5320.400161743164,
-    "y": 2146.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5322.400161743164,
+    "y": 2097.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "700667b1.628978"
+        "a92d2828.f616b8"
       ]
     ]
   },
   {
-    "id": "700667b1.628978",
+    "id": "a92d2828.f616b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5472.400161743164,
-    "y": 2147.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5474.400161743164,
+    "y": 2098.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "f289682c.7a8f28",
+    "id": "67195fbd.2c818",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5483.400161743164,
-    "y": 2092.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5485.400161743164,
+    "y": 2043.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9c166c79.f96aa8",
+    "id": "c8f2d024.71cdc8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5467.782485961914,
-    "y": 2031.9415435791016,
-    "z": "2414cd0b.85dac2",
+    "x": 5469.782485961914,
+    "y": 1982.9415435791016,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "cc2fb272.8011c"
+        "2e63be54.b089ca"
       ]
     ]
   },
   {
-    "id": "cc2fb272.8011c",
+    "id": "2e63be54.b089ca",
     "type": "set",
     "name": "set controller domainC data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5682.400161743164,
-    "y": 2028.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5684.400161743164,
+    "y": 1979.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6be3a1db.a02ba8",
+    "id": "7237f1d4.deff98",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 5711.900161743164,
-    "y": 2151.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 5713.900161743164,
+    "y": 2102.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c91e3a5e.c6511",
+    "id": "f8b29c6c.19b2e8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5684.016860961914,
-    "y": 2200.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5686.016860961914,
+    "y": 2151.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8269b8aa.68a3b"
+        "6fed43d1.51eac4"
       ]
     ]
   },
   {
-    "id": "8269b8aa.68a3b",
+    "id": "6fed43d1.51eac4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5875.016860961914,
-    "y": 2204.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5877.016860961914,
+    "y": 2155.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8a849c85.456228"
+        "419e36dc.a0f56"
       ]
     ]
   },
   {
-    "id": "8a849c85.456228",
+    "id": "419e36dc.a0f56",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6002.016860961914,
-    "y": 2203.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 6004.016860961914,
+    "y": 2154.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5d5d757b.d8e52c",
-        "a560a2f0.7f8828"
+        "38e4a1b4.0b7b5e",
+        "e98accf8.e7a08"
       ]
     ]
   },
   {
-    "id": "a560a2f0.7f8828",
+    "id": "e98accf8.e7a08",
     "type": "save",
     "name": "save SECONDARY-ROOT UNI in AAI",
     "xml": "<save 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='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6224.016860961914,
-    "y": 2092.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 6226.016860961914,
+    "y": 2043.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5d5d757b.d8e52c",
+    "id": "38e4a1b4.0b7b5e",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6219.900161743164,
-    "y": 2151.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6221.900161743164,
+    "y": 2102.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "51d8510d.dcc058",
-        "79e7df30.7f8138"
+        "d45ed8c9.67af08",
+        "a74deeb1.a26ec"
       ]
     ]
   },
   {
-    "id": "51d8510d.dcc058",
+    "id": "d45ed8c9.67af08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6429.900161743164,
-    "y": 2128.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6431.900161743164,
+    "y": 2079.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b3aa8483.9bdec"
+        "c2c70bd5.e2175"
       ]
     ]
   },
   {
-    "id": "b3aa8483.9bdec",
+    "id": "c2c70bd5.e2175",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6555.900161743164,
-    "y": 2128.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6557.900161743164,
+    "y": 2079.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "50564c45.182124"
+        "b21cfff5.d8a4c8"
       ]
     ]
   },
   {
-    "id": "eaeffe9b.6e1578",
+    "id": "92db42c4.6a4d78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6560.900161743164,
-    "y": 2177.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6562.900161743164,
+    "y": 2128.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5ed2f363.68208c",
-        "ad95a077.a4baa8",
-        "283ec58.ad1d4ba",
-        "ccdfc934.795ad8"
+        "a32c1047.9c5c8",
+        "eadb0235.467f7",
+        "5b398d7f.65258c",
+        "7c47a5bb.9c9814"
       ]
     ]
   },
   {
-    "id": "79e7df30.7f8138",
+    "id": "a74deeb1.a26ec",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6434.900161743164,
-    "y": 2177.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6436.900161743164,
+    "y": 2128.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "eaeffe9b.6e1578"
+        "92db42c4.6a4d78"
       ]
     ]
   },
   {
-    "id": "50564c45.182124",
+    "id": "b21cfff5.d8a4c8",
     "type": "save",
     "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6883.900161743164,
-    "y": 2125.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6885.900161743164,
+    "y": 2076.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5ed2f363.68208c",
+    "id": "a32c1047.9c5c8",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainC",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6836.900161743164,
-    "y": 2216.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6838.900161743164,
+    "y": 2167.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "ad95a077.a4baa8",
+    "id": "eadb0235.467f7",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6784.900161743164,
-    "y": 2258.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6786.900161743164,
+    "y": 2209.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "283ec58.ad1d4ba",
+    "id": "5b398d7f.65258c",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6913.900161743164,
-    "y": 2300.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6915.900161743164,
+    "y": 2251.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "192e2e3d.32bda2",
+    "id": "9878fd26.fb04",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6799.900161743164,
-    "y": 2173.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6801.900161743164,
+    "y": 2124.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "ccdfc934.795ad8",
+    "id": "7c47a5bb.9c9814",
     "type": "save",
     "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6891.900161743164,
-    "y": 2348.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6893.900161743164,
+    "y": 2299.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "162cf27b.802c36",
+    "id": "374c089f.fa2538",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6455.900161743164,
-    "y": 2844.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 6457.900161743164,
+    "y": 2795.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b694c10f.97993"
+        "e0f14a64.4f8738"
       ]
     ]
   },
   {
-    "id": "b694c10f.97993",
+    "id": "e0f14a64.4f8738",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6647.900161743164,
-    "y": 2839.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 6649.900161743164,
+    "y": 2790.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5f9a1d2b.927d2c"
+        "db26ab33.fe7e58"
       ]
     ]
   },
   {
-    "id": "5f9a1d2b.927d2c",
+    "id": "db26ab33.fe7e58",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6776.900161743164,
-    "y": 2839.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 6778.900161743164,
+    "y": 2790.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2368c13a.48b366"
+        "26e82d17.b3e8e2"
       ]
     ]
   },
   {
-    "id": "2368c13a.48b366",
+    "id": "26e82d17.b3e8e2",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 7108.900161743164,
-    "y": 2837.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 7110.900161743164,
+    "y": 2788.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5a5c80f6.6318b8",
+    "id": "c9cb4066.4924",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6040.900161743164,
-    "y": 3056.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 6042.900161743164,
+    "y": 3007.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c941a0b5.409658"
+        "2a720623.f2b5c2"
       ]
     ]
   },
   {
-    "id": "c941a0b5.409658",
+    "id": "2a720623.f2b5c2",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6220.900161743164,
-    "y": 3055.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 6222.900161743164,
+    "y": 3006.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e3672c28.52e2c"
+        "af745266.aa6"
       ]
     ]
   },
   {
-    "id": "e3672c28.52e2c",
+    "id": "af745266.aa6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6349.900161743164,
-    "y": 3055.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 6351.900161743164,
+    "y": 3006.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "78510894.01d168"
+        "981d0119.b686c"
       ]
     ]
   },
   {
-    "id": "78510894.01d168",
+    "id": "981d0119.b686c",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6567.783462524414,
-    "y": 3054.7357025146484,
-    "z": "2414cd0b.85dac2",
+    "x": 6569.783462524414,
+    "y": 3005.7357025146484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7f59bec0.83cea8"
+        "365c0f8e.cfd0e"
       ]
     ]
   },
   {
-    "id": "7f59bec0.83cea8",
+    "id": "365c0f8e.cfd0e",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6782.783462524414,
-    "y": 3054.7357025146484,
-    "z": "2414cd0b.85dac2",
+    "x": 6784.783462524414,
+    "y": 3005.7357025146484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bd133df9.897ce8"
+        "5255edd.4efb714"
       ]
     ]
   },
   {
-    "id": "bd133df9.897ce8",
+    "id": "5255edd.4efb714",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6914.783462524414,
-    "y": 3054.7357025146484,
-    "z": "2414cd0b.85dac2",
+    "x": 6916.783462524414,
+    "y": 3005.7357025146484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5e2761fa.54e448"
+        "d5b5d130.3528a"
       ]
     ]
   },
   {
-    "id": "5e2761fa.54e448",
+    "id": "d5b5d130.3528a",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 7278.900161743164,
-    "y": 3053.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 7280.900161743164,
+    "y": 3004.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "9f73e0e4.5bd9a8",
+    "id": "615783e8.7114bc",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5011.399185180664,
-    "y": 2704.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5013.399185180664,
+    "y": 2655.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3e0d324f.39029e"
+        "b5a2c9a9.2d0b1"
       ]
     ]
   },
   {
-    "id": "3e0d324f.39029e",
+    "id": "b5a2c9a9.2d0b1",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5191.399185180664,
-    "y": 2703.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5193.399185180664,
+    "y": 2654.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2acf977a.ab8578"
+        "38f8112d.6307b6"
       ]
     ]
   },
   {
-    "id": "2acf977a.ab8578",
+    "id": "38f8112d.6307b6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5320.399185180664,
-    "y": 2703.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5322.399185180664,
+    "y": 2654.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "94be4455.78db28"
+        "73260aa7.cfafe4"
       ]
     ]
   },
   {
-    "id": "83e5c66f.42223",
+    "id": "3fb31c3b.d5983c",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5056.399185180664,
-    "y": 2762.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5058.399185180664,
+    "y": 2713.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "94be4455.78db28",
+    "id": "73260aa7.cfafe4",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5086.399185180664,
-    "y": 2795.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5088.399185180664,
+    "y": 2746.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e215df2d.d0af58",
-        "4a2bacef.6efd64",
-        "5a609856.e771c"
+        "4f61494b.d04d88",
+        "50778a9c.0e895c",
+        "979ddcd.34a972"
       ]
     ]
   },
   {
-    "id": "4a2bacef.6efd64",
+    "id": "50778a9c.0e895c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5267.890151977539,
-    "y": 2772.9932708740234,
-    "z": "2414cd0b.85dac2",
+    "x": 5269.890151977539,
+    "y": 2723.9932708740234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8ad6e6e5.397628"
+        "67ea0823.c7b72"
       ]
     ]
   },
   {
-    "id": "5a609856.e771c",
+    "id": "979ddcd.34a972",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5256.399185180664,
-    "y": 2812.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5258.399185180664,
+    "y": 2763.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e676f166.0b9d7"
+        "c80cb8af.ac2d48"
       ]
     ]
   },
   {
-    "id": "8ad6e6e5.397628",
+    "id": "67ea0823.c7b72",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5427.461685180664,
-    "y": 2771.2789154052734,
-    "z": "2414cd0b.85dac2",
+    "x": 5429.461685180664,
+    "y": 2722.2789154052734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e676f166.0b9d7",
+    "id": "c80cb8af.ac2d48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5417.399185180664,
-    "y": 2813.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5419.399185180664,
+    "y": 2764.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e215df2d.d0af58",
+    "id": "4f61494b.d04d88",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5261.399185180664,
-    "y": 2849.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5263.399185180664,
+    "y": 2800.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c842a7cf.827af"
+        "ef6cfd54.d63cb8"
       ]
     ]
   },
   {
-    "id": "c842a7cf.827af",
+    "id": "ef6cfd54.d63cb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5419.399185180664,
-    "y": 2857.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5421.399185180664,
+    "y": 2808.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c480afef.6388b8",
-        "1261035b.27b08d"
+        "d727e5a5.b31118",
+        "c17b79a.0f49c88"
       ]
     ]
   },
   {
-    "id": "c480afef.6388b8",
+    "id": "d727e5a5.b31118",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 5580.399185180664,
-    "y": 2789.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5582.399185180664,
+    "y": 2740.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1261035b.27b08d",
+    "id": "c17b79a.0f49c88",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5622.399185180664,
-    "y": 2861.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5624.399185180664,
+    "y": 2812.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "37f3e792.01b98",
+    "id": "9c79a60.2e838d8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5098.399185180664,
-    "y": 3062.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5100.399185180664,
+    "y": 3013.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f8a6bae7.e43428"
+        "c138ef39.513f8"
       ]
     ]
   },
   {
-    "id": "f8a6bae7.e43428",
+    "id": "c138ef39.513f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5278.399185180664,
-    "y": 3061.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5280.399185180664,
+    "y": 3012.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ebf9b17f.54212"
+        "8ad866ac.595d58"
       ]
     ]
   },
   {
-    "id": "ebf9b17f.54212",
+    "id": "8ad866ac.595d58",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5407.399185180664,
-    "y": 3061.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5409.399185180664,
+    "y": 3012.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7632b9a7.046188"
+        "17191cff.7c3d3b"
       ]
     ]
   },
   {
-    "id": "a3e62ac2.613cb8",
+    "id": "2bf187fb.3634e8",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5143.399185180664,
-    "y": 3120.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5145.399185180664,
+    "y": 3071.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7632b9a7.046188",
+    "id": "17191cff.7c3d3b",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5173.399185180664,
-    "y": 3153.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5175.399185180664,
+    "y": 3104.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "aa9ebc0c.15b74",
-        "34556fac.9550b8",
-        "8f78cb97.869598"
+        "e2951a5a.6753c8",
+        "f24616d3.430fb8",
+        "57d651f0.348b08"
       ]
     ]
   },
   {
-    "id": "34556fac.9550b8",
+    "id": "f24616d3.430fb8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5354.890151977539,
-    "y": 3130.9932708740234,
-    "z": "2414cd0b.85dac2",
+    "x": 5356.890151977539,
+    "y": 3081.9932708740234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "81becde2.b2238"
+        "c95458c9.25b988"
       ]
     ]
   },
   {
-    "id": "8f78cb97.869598",
+    "id": "57d651f0.348b08",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5343.399185180664,
-    "y": 3170.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5345.399185180664,
+    "y": 3121.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1e2ed61a.69a74a"
+        "59776330.9b2ecc"
       ]
     ]
   },
   {
-    "id": "81becde2.b2238",
+    "id": "c95458c9.25b988",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5514.461685180664,
-    "y": 3129.2789154052734,
-    "z": "2414cd0b.85dac2",
+    "x": 5516.461685180664,
+    "y": 3080.2789154052734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1e2ed61a.69a74a",
+    "id": "59776330.9b2ecc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5504.399185180664,
-    "y": 3171.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5506.399185180664,
+    "y": 3122.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "aa9ebc0c.15b74",
+    "id": "e2951a5a.6753c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5348.399185180664,
-    "y": 3207.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5350.399185180664,
+    "y": 3158.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a5e9d80e.798b58"
+        "1f0787c1.98ffc"
       ]
     ]
   },
   {
-    "id": "a5e9d80e.798b58",
+    "id": "1f0787c1.98ffc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5506.399185180664,
-    "y": 3215.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5508.399185180664,
+    "y": 3166.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f6d35763.a75968",
-        "4c3e3376.aec354"
+        "4ff50da8.51bbec",
+        "fc471e6.a2d406"
       ]
     ]
   },
   {
-    "id": "f6d35763.a75968",
+    "id": "4ff50da8.51bbec",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 5667.399185180664,
-    "y": 3147.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5669.399185180664,
+    "y": 3098.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4c3e3376.aec354",
+    "id": "fc471e6.a2d406",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5709.399185180664,
-    "y": 3219.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5711.399185180664,
+    "y": 3170.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "54f08fa.71777f",
+    "id": "2987a87c.d9af38",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3580.066665649414,
-    "y": 4644.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3582.066665649414,
+    "y": 4595.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f59f8a4e.ee5228"
+        "101679fa.cd8636"
       ]
     ]
   },
   {
-    "id": "f59f8a4e.ee5228",
+    "id": "101679fa.cd8636",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3760.066665649414,
-    "y": 4643.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3762.066665649414,
+    "y": 4594.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6dfc836d.44e47c"
+        "a4d69355.b5e7f8"
       ]
     ]
   },
   {
-    "id": "6dfc836d.44e47c",
+    "id": "a4d69355.b5e7f8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3889.066665649414,
-    "y": 4643.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3891.066665649414,
+    "y": 4594.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "84addd88.4602"
+        "42187454.b3e72c"
       ]
     ]
   },
   {
-    "id": "8e14b0c3.7931e8",
+    "id": "8dc12596.0dad2",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3625.066665649414,
-    "y": 4702.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3627.066665649414,
+    "y": 4653.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "84addd88.4602",
+    "id": "42187454.b3e72c",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3655.066665649414,
-    "y": 4735.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3657.066665649414,
+    "y": 4686.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "15dd9d01.198e13",
-        "99598358.2ea178",
-        "d0193baa.0b0ba8"
+        "53201291.0789d4",
+        "6de03a2b.1543fc",
+        "13099433.0c6bc4"
       ]
     ]
   },
   {
-    "id": "99598358.2ea178",
+    "id": "6de03a2b.1543fc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3836.557632446289,
-    "y": 4712.993270874023,
-    "z": "2414cd0b.85dac2",
+    "x": 3838.557632446289,
+    "y": 4663.993270874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4987dd19.729c2c"
+        "328b19c8.a304fe"
       ]
     ]
   },
   {
-    "id": "d0193baa.0b0ba8",
+    "id": "13099433.0c6bc4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3825.066665649414,
-    "y": 4752.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3827.066665649414,
+    "y": 4703.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4de60967.145d88"
+        "693d642a.e0385c"
       ]
     ]
   },
   {
-    "id": "4987dd19.729c2c",
+    "id": "328b19c8.a304fe",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3996.129165649414,
-    "y": 4711.278915405273,
-    "z": "2414cd0b.85dac2",
+    "x": 3998.129165649414,
+    "y": 4662.278915405273,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4de60967.145d88",
+    "id": "693d642a.e0385c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3986.066665649414,
-    "y": 4753.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3988.066665649414,
+    "y": 4704.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "15dd9d01.198e13",
+    "id": "53201291.0789d4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3830.066665649414,
-    "y": 4789.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3832.066665649414,
+    "y": 4740.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7135b7da.689598"
+        "def4b54e.65d1b"
       ]
     ]
   },
   {
-    "id": "7135b7da.689598",
+    "id": "def4b54e.65d1b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3988.066665649414,
-    "y": 4797.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3990.066665649414,
+    "y": 4748.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "db75607b.34ec4",
-        "368002b6.6c78de"
+        "c5033189.07a6e8",
+        "bea5279c.558ed8"
       ]
     ]
   },
   {
-    "id": "db75607b.34ec4",
+    "id": "c5033189.07a6e8",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4149.066665649414,
-    "y": 4729.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4151.066665649414,
+    "y": 4680.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "368002b6.6c78de",
+    "id": "bea5279c.558ed8",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4191.066665649414,
-    "y": 4801.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4193.066665649414,
+    "y": 4752.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "9630090a.96156",
+    "id": "be749200.95b238",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4271.733657836914,
-    "y": 5599.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4273.733657836914,
+    "y": 5550.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b727caf7.37ccd",
+    "id": "b311bb82.023748",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4426.733657836914,
-    "y": 5640.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4428.733657836914,
+    "y": 5591.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d76b5ce.608a08",
+    "id": "f2f4b1c2.9aee8",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4242.733657836914,
-    "y": 5698.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4244.733657836914,
+    "y": 5649.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6c688e63.a06ce",
-        "a407cbc4.6c0c8"
+        "7d42099c.1673f8",
+        "afcc0a1f.ae4ca8"
       ]
     ]
   },
   {
-    "id": "6c688e63.a06ce",
+    "id": "7d42099c.1673f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4478.733657836914,
-    "y": 5682.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4480.733657836914,
+    "y": 5633.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "65c46de7.6d4354"
+        "1db6f77.6e57a09"
       ]
     ]
   },
   {
-    "id": "a407cbc4.6c0c8",
+    "id": "afcc0a1f.ae4ca8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4477.733657836914,
-    "y": 5730.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4479.733657836914,
+    "y": 5681.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "65c46de7.6d4354",
+    "id": "1db6f77.6e57a09",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4622.733657836914,
-    "y": 5684.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4624.733657836914,
+    "y": 5635.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a13d8ec4.2f4c18",
-        "3e4d3365.1256fc",
-        "d2dac5fa.54c798"
+        "435458de.d8d258",
+        "fe506663.263e38",
+        "7c36c2be.89228c"
       ]
     ]
   },
   {
-    "id": "a13d8ec4.2f4c18",
+    "id": "435458de.d8d258",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5034.733901977539,
-    "y": 5819.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5036.733901977539,
+    "y": 5770.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3e4d3365.1256fc",
+    "id": "fe506663.263e38",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5155.733901977539,
-    "y": 5866.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5157.733901977539,
+    "y": 5817.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "37767c8a.d0935c",
+    "id": "4a2e81b2.7cd548",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5038.617691040039,
-    "y": 5910.302352905273,
-    "z": "2414cd0b.85dac2",
+    "x": 5040.617691040039,
+    "y": 5861.302352905273,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d2dac5fa.54c798",
+    "id": "7c36c2be.89228c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5037.400894165039,
-    "y": 5951.502548217773,
-    "z": "2414cd0b.85dac2",
+    "x": 5039.400894165039,
+    "y": 5902.502548217773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d0ed0f43.9ac178",
+    "id": "4c09fba5.801644",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4898.066665649414,
-    "y": 6205.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4900.066665649414,
+    "y": 6156.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b5179b.b5811868",
+    "id": "2fa7a2c0.97e2e6",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5064.066665649414,
-    "y": 6244.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5066.066665649414,
+    "y": 6195.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "8a0b9185.29b548",
+    "id": "ed4e275a.a600a",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4903.066665649414,
-    "y": 6294.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4905.066665649414,
+    "y": 6245.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bb485e07.c51f48",
-        "f5c035ca.78263"
+        "5ed92a8d.935c6c",
+        "3b32d9b.10ad726"
       ]
     ]
   },
   {
-    "id": "bb485e07.c51f48",
+    "id": "5ed92a8d.935c6c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5136.066665649414,
-    "y": 6288.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5138.066665649414,
+    "y": 6239.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3bbd1b25.f0fda4"
+        "4b8f3c41.8b089c"
       ]
     ]
   },
   {
-    "id": "f5c035ca.78263",
+    "id": "3b32d9b.10ad726",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5137.066665649414,
-    "y": 6338.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5139.066665649414,
+    "y": 6289.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3bbd1b25.f0fda4",
+    "id": "4b8f3c41.8b089c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5283.066665649414,
-    "y": 6296.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5285.066665649414,
+    "y": 6247.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e99c4f39.622098",
-        "424cf9d2.7701e8",
-        "2a6230e2.ffd498"
+        "980344cd.e7e958",
+        "6a19d23d.0e42e4",
+        "b0adad9f.731368"
       ]
     ]
   },
   {
-    "id": "e99c4f39.622098",
+    "id": "980344cd.e7e958",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5530.066665649414,
-    "y": 6284.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5532.066665649414,
+    "y": 6235.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "424cf9d2.7701e8",
+    "id": "6a19d23d.0e42e4",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5651.066665649414,
-    "y": 6331.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5653.066665649414,
+    "y": 6282.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "b810129e.2691f8",
+    "id": "351a146f.cf6ee4",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5533.950454711914,
-    "y": 6375.302352905273,
-    "z": "2414cd0b.85dac2",
+    "x": 5535.950454711914,
+    "y": 6326.302352905273,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2a6230e2.ffd498",
+    "id": "b0adad9f.731368",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5532.733657836914,
-    "y": 6416.502548217773,
-    "z": "2414cd0b.85dac2",
+    "x": 5534.733657836914,
+    "y": 6367.502548217773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a198d826.7242b",
+    "id": "62fdede4.849824",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3660.066665649414,
-    "y": 6189.852645874023,
-    "z": "2414cd0b.85dac2",
+    "x": 3662.066665649414,
+    "y": 6140.852645874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c717d5f4.4fddc8",
+    "id": "dfc7a62b.53e19",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2997.316665649414,
-    "y": 6188.102645874023,
-    "z": "2414cd0b.85dac2",
+    "x": 2999.316665649414,
+    "y": 6139.102645874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "420e4506.143cfc",
-        "beb3687c.2f0758"
+        "4e06d40d.0d98f4",
+        "2df2f3f0.950c74"
       ]
     ]
   },
   {
-    "id": "420e4506.143cfc",
+    "id": "4e06d40d.0d98f4",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3188.316665649414,
-    "y": 6192.102645874023,
-    "z": "2414cd0b.85dac2",
+    "x": 3190.316665649414,
+    "y": 6143.102645874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "75f23708.93f968"
+        "7ac2dc81.94449c"
       ]
     ]
   },
   {
-    "id": "75f23708.93f968",
+    "id": "7ac2dc81.94449c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3315.316665649414,
-    "y": 6191.102645874023,
-    "z": "2414cd0b.85dac2",
+    "x": 3317.316665649414,
+    "y": 6142.102645874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a198d826.7242b"
+        "62fdede4.849824"
       ]
     ]
   },
   {
-    "id": "beb3687c.2f0758",
+    "id": "2df2f3f0.950c74",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3184.316665649414,
-    "y": 6262.102645874023,
-    "z": "2414cd0b.85dac2",
+    "x": 3186.316665649414,
+    "y": 6213.102645874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "befff12f.84551"
+        "4a8e4e30.44e1e8"
       ]
     ]
   },
   {
-    "id": "41f38680.b5ae6",
+    "id": "717a4778.c8606",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3733.816665649414,
-    "y": 6261.186141967773,
-    "z": "2414cd0b.85dac2",
+    "x": 3735.816665649414,
+    "y": 6212.186141967773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "befff12f.84551",
+    "id": "4a8e4e30.44e1e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3317.816665649414,
-    "y": 6264.186141967773,
-    "z": "2414cd0b.85dac2",
+    "x": 3319.816665649414,
+    "y": 6215.186141967773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "41f38680.b5ae6"
+        "717a4778.c8606"
       ]
     ]
   }