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=7f05d90e8f15cd8ee72ded2161079f0d63be133c;hb=645b21298c9a4aff5f3f625eabb586fff40db732;hp=807831e86ab6a28155e87b8d9b550d9a50164a70;hpb=a3fc5687fdd9b8d89fa36019d6e61eb2d22f8c27;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 807831e8..7f05d90e 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": "a36be240.71b108",
+    "id": "25755a71.e1632e",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 181.56666564941406,
-    "y": 140.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 123.56666564941406,
+    "y": 162.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d32c48f4.aac76"
+        "9782b41f.c0bae8"
       ]
     ]
   },
   {
-    "id": "d32c48f4.aac76",
+    "id": "9782b41f.c0bae8",
     "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": 465.85235595703125,
-    "y": 201.52385997772217,
-    "z": "3edf77d7.add3c",
+    "x": 407.85235595703125,
+    "y": 223.32380199432373,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cea08712.e1ad8"
+        "aa6f3182.becc9"
       ]
     ]
   },
   {
-    "id": "cea08712.e1ad8",
+    "id": "aa6f3182.becc9",
     "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": 471.9952697753906,
-    "y": 286.28578186035156,
-    "z": "3edf77d7.add3c",
+    "x": 413.9952697753906,
+    "y": 308.0857238769531,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "81a694dd.59419"
+        "29bc2f8.db80dd"
       ]
     ]
   },
   {
-    "id": "81a694dd.59419",
+    "id": "29bc2f8.db80dd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 821.5666656494141,
-    "y": 345.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 763.5666656494141,
+    "y": 367.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "262c4d6b.8ef302",
-        "f6c757fc.4ac3d8",
-        "5a309470.2c2984"
+        "9c0eb1ca.43b71",
+        "3646fbaf.66abd4",
+        "ab0c0a1d.943358"
       ]
     ]
   },
   {
-    "id": "262c4d6b.8ef302",
+    "id": "9c0eb1ca.43b71",
     "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": 1122.900161743164,
-    "y": 616.2160491943359,
-    "z": "3edf77d7.add3c",
+    "x": 1064.900161743164,
+    "y": 638.0159912109375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f6c757fc.4ac3d8",
+    "id": "3646fbaf.66abd4",
     "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": 1144.328628540039,
-    "y": 318.6190643310547,
-    "z": "3edf77d7.add3c",
+    "x": 1086.328628540039,
+    "y": 340.41900634765625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "46d97ddb.2cdac4",
-        "5d275c59.021c7c",
-        "49cae57.69a7f9c"
+        "7f13e7b9.528038",
+        "21855f86.1eb1c",
+        "8626acaa.0dcb08"
       ]
     ]
   },
   {
-    "id": "46d97ddb.2cdac4",
+    "id": "7f13e7b9.528038",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1369.328628540039,
-    "y": 176.6190643310547,
-    "z": "3edf77d7.add3c",
+    "x": 1311.328628540039,
+    "y": 198.41900634765625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f1f14b39.ae66d8"
+        "d8a6bab4.98cd48"
       ]
     ]
   },
   {
-    "id": "5d275c59.021c7c",
+    "id": "21855f86.1eb1c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1364.819595336914,
-    "y": 246.19309997558594,
-    "z": "3edf77d7.add3c",
+    "x": 1306.819595336914,
+    "y": 267.9930419921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e0fe1751.0d1d08"
+        "2ec478eb.d4cdf8"
       ]
     ]
   },
   {
-    "id": "49cae57.69a7f9c",
+    "id": "8626acaa.0dcb08",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1353.328628540039,
-    "y": 292.6190643310547,
-    "z": "3edf77d7.add3c",
+    "x": 1295.328628540039,
+    "y": 314.41900634765625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "91b68660.fcd578"
+        "7ead638e.196dac"
       ]
     ]
   },
   {
-    "id": "83ec93b8.4f0e58",
+    "id": "250bdb2a.4b0894",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1123.328628540039,
-    "y": 206.6190643310547,
-    "z": "3edf77d7.add3c",
+    "x": 1065.328628540039,
+    "y": 228.41900634765625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5a309470.2c2984",
+    "id": "ab0c0a1d.943358",
     "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": 1111.328628540039,
-    "y": 258.6190643310547,
-    "z": "3edf77d7.add3c",
+    "x": 1053.328628540039,
+    "y": 280.41900634765625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f1f14b39.ae66d8",
+    "id": "d8a6bab4.98cd48",
     "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": 1609.566665649414,
-    "y": 173.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1551.566665649414,
+    "y": 195.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "47b460bb.508b6",
-        "e9217582.339fb"
+        "ddda0f66.6b349",
+        "66168207.1d9724"
       ]
     ]
   },
   {
-    "id": "e0fe1751.0d1d08",
+    "id": "2ec478eb.d4cdf8",
     "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": 1519.6290435791016,
-    "y": 249.14552307128906,
-    "z": "3edf77d7.add3c",
+    "x": 1461.6290435791016,
+    "y": 270.9454650878906,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "91b68660.fcd578",
+    "id": "7ead638e.196dac",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1523.566665649414,
-    "y": 293.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1465.566665649414,
+    "y": 315.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "47b460bb.508b6",
+    "id": "ddda0f66.6b349",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1814.566665649414,
-    "y": 210.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1756.566665649414,
+    "y": 232.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4440eff6.476cd"
+        "5c931c3f.aba674"
       ]
     ]
   },
   {
-    "id": "e9217582.339fb",
+    "id": "66168207.1d9724",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1824.566665649414,
-    "y": 137.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1766.566665649414,
+    "y": 159.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4440eff6.476cd",
+    "id": "5c931c3f.aba674",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1807.566665649414,
-    "y": 285.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1749.566665649414,
+    "y": 307.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3986b18c.a9e7ae",
-        "1a55fc09.fb08cc",
-        "84bc3e18.c9d6e",
-        "63b2fdab.785aac",
-        "dfc7a62b.53e19"
+        "b951c0d0.48c67",
+        "3ae502fc.de69ae",
+        "7554f41e.870f04",
+        "b94dc7e3.86f89",
+        "37dc60ca.62221"
       ]
     ]
   },
   {
-    "id": "1cb8dc69.891db4",
+    "id": "fb84a849.18463",
     "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": 2293.566665649414,
-    "y": 336.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2235.566665649414,
+    "y": 358.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d730a66e.613558",
-        "3006b8b.6e69448",
-        "f68070c6.2ea968"
+        "7f791be2.0d23ec",
+        "6090d832.b4d3b8",
+        "b011647e.200f58"
       ]
     ]
   },
   {
-    "id": "d730a66e.613558",
+    "id": "7f791be2.0d23ec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2509.566665649414,
-    "y": 403.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2451.566665649414,
+    "y": 425.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e3579fa8.43b168"
+        "f400ea8d.94bbd8"
       ]
     ]
   },
   {
-    "id": "3006b8b.6e69448",
+    "id": "6090d832.b4d3b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2510.057632446289,
-    "y": 302.85972595214844,
-    "z": "3edf77d7.add3c",
+    "x": 2452.057632446289,
+    "y": 324.65966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6bbc8555.572b94"
+        "84744d3b.9da2a"
       ]
     ]
   },
   {
-    "id": "f68070c6.2ea968",
+    "id": "b011647e.200f58",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2505.566665649414,
-    "y": 352.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2447.566665649414,
+    "y": 374.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a1a8f5c7.a1ada"
+        "d7ef13e5.e943b8"
       ]
     ]
   },
   {
-    "id": "3986b18c.a9e7ae",
+    "id": "b951c0d0.48c67",
     "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": 2010.566665649414,
-    "y": 317.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1952.566665649414,
+    "y": 339.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "62594551.389614",
-        "1cb8dc69.891db4",
-        "1902c403.6fb814",
-        "b21e9d77.e0db"
+        "4b529d8b.e7269c",
+        "fb84a849.18463",
+        "4f8a0bf3.f76a6c",
+        "6a76544b.f753cc"
       ]
     ]
   },
   {
-    "id": "62594551.389614",
+    "id": "4b529d8b.e7269c",
     "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": 2290.566665649414,
-    "y": 255.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2232.566665649414,
+    "y": 277.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "63b2fdab.785aac",
+    "id": "b94dc7e3.86f89",
     "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": 1984.566665649414,
-    "y": 267.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1926.566665649414,
+    "y": 289.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1a55fc09.fb08cc",
+    "id": "3ae502fc.de69ae",
     "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/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2027.566665649414,
-    "y": 126.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1969.566665649414,
+    "y": 148.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "84bc3e18.c9d6e",
+    "id": "7554f41e.870f04",
     "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": 2039.566665649414,
-    "y": 167.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1981.566665649414,
+    "y": 189.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "70e12844.2efb58",
+    "id": "c4ed6feb.870ac",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2064.566665649414,
-    "y": 79.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2006.566665649414,
+    "y": 101.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1582189.5e20967",
+    "id": "3fa0fea5.b1a7a2",
     "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": 1984.566665649414,
-    "y": 213.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 1926.566665649414,
+    "y": 235.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6bbc8555.572b94",
+    "id": "84744d3b.9da2a",
     "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": 2688.566665649414,
-    "y": 305.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2630.566665649414,
+    "y": 327.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a1a8f5c7.a1ada",
+    "id": "d7ef13e5.e943b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2688.504165649414,
-    "y": 354.42601013183594,
-    "z": "3edf77d7.add3c",
+    "x": 2630.504165649414,
+    "y": 376.2259521484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e3579fa8.43b168",
+    "id": "f400ea8d.94bbd8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2690.504165649414,
-    "y": 405.42601013183594,
-    "z": "3edf77d7.add3c",
+    "x": 2632.504165649414,
+    "y": 427.2259521484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "234c19dd.3792f6"
+        "3f239fa1.c0b958"
       ]
     ]
   },
   {
-    "id": "234c19dd.3792f6",
+    "id": "3f239fa1.c0b958",
     "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": 3025.504165649414,
-    "y": 174.426025390625,
-    "z": "3edf77d7.add3c",
+    "x": 2967.504165649414,
+    "y": 196.22596740722656,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "403040fa.29d128",
-        "d2e9aaef.69fb08",
-        "b24293ea.efd47"
+        "b38986d.d0d7878",
+        "824af3e9.18d3c",
+        "c4ad697c.ed235"
       ]
     ]
   },
   {
-    "id": "d2e9aaef.69fb08",
+    "id": "824af3e9.18d3c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3298.995132446289,
-    "y": 67,
-    "z": "3edf77d7.add3c",
+    "x": 3240.995132446289,
+    "y": 88.79994201660156,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fccce16d.0a609"
+        "53ebc234.9c89e4"
       ]
     ]
   },
   {
-    "id": "fccce16d.0a609",
+    "id": "53ebc234.9c89e4",
     "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": 3476.566665649414,
-    "y": 67.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3418.566665649414,
+    "y": 89.08570861816406,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b24293ea.efd47",
+    "id": "c4ad697c.ed235",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3294.504165649414,
-    "y": 116.426025390625,
-    "z": "3edf77d7.add3c",
+    "x": 3236.504165649414,
+    "y": 138.22596740722656,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1cbd7c7f.481b8c"
+        "d35b45c.ac75538"
       ]
     ]
   },
   {
-    "id": "1cbd7c7f.481b8c",
+    "id": "d35b45c.ac75538",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3476.504165649414,
-    "y": 116.426025390625,
-    "z": "3edf77d7.add3c",
+    "x": 3418.504165649414,
+    "y": 138.22596740722656,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "403040fa.29d128",
+    "id": "b38986d.d0d7878",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3298.504165649414,
-    "y": 167.426025390625,
-    "z": "3edf77d7.add3c",
+    "x": 3240.504165649414,
+    "y": 189.22596740722656,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6553de3d.0fe06"
+        "cda04f1c.b5e8e8"
       ]
     ]
   },
   {
-    "id": "6553de3d.0fe06",
+    "id": "cda04f1c.b5e8e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3478.504165649414,
-    "y": 167.426025390625,
-    "z": "3edf77d7.add3c",
+    "x": 3420.504165649414,
+    "y": 189.22596740722656,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a3b12c76.41d528"
+        "9d21d2af.f1a338"
       ]
     ]
   },
   {
-    "id": "a3b12c76.41d528",
+    "id": "9d21d2af.f1a338",
     "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": 3044.566665649414,
-    "y": 302.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 2986.566665649414,
+    "y": 324.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "18fdd62.581202a",
-        "6160fe1a.c1358"
+        "2a81c517.5bc7ca",
+        "6137d6c5.a89918"
       ]
     ]
   },
   {
-    "id": "6160fe1a.c1358",
+    "id": "6137d6c5.a89918",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3354.566665649414,
-    "y": 309.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3296.566665649414,
+    "y": 331.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "18fdd62.581202a",
+    "id": "2a81c517.5bc7ca",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3353.566665649414,
-    "y": 363.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3295.566665649414,
+    "y": 385.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "be5e6e3e.4df078"
+        "5824c72f.9c5af"
       ]
     ]
   },
   {
-    "id": "93300adf.7164e",
+    "id": "28f331ee.9053e6",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4098.566665649414,
-    "y": 317.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 4040.566665649414,
+    "y": 339.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4304d9fb.fb05f8"
+        "75d3715b.ab7198"
       ]
     ]
   },
   {
-    "id": "4304d9fb.fb05f8",
+    "id": "75d3715b.ab7198",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4275.566543579102,
-    "y": 310.28564453125,
-    "z": "3edf77d7.add3c",
+    "x": 4217.566543579102,
+    "y": 332.08558654785156,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "57e483bc.d9d9f4",
-        "be73e257.6c7c7"
+        "ae2a4fce.8a1ea",
+        "2c72c44.f2aec3c"
       ]
     ]
   },
   {
-    "id": "be5e6e3e.4df078",
+    "id": "5824c72f.9c5af",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3517.566665649414,
-    "y": 289.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3459.566665649414,
+    "y": 311.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7cff4b8c.a234a4",
-        "44a90848.8f1578"
+        "a5e82cdc.4d956",
+        "b714d40c.0dac68"
       ]
     ]
   },
   {
-    "id": "7cff4b8c.a234a4",
+    "id": "a5e82cdc.4d956",
     "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": 3798.566665649414,
-    "y": 245.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3740.566665649414,
+    "y": 267.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9f045210.d63268"
+        "e552898d.0c1d9"
       ]
     ]
   },
   {
-    "id": "9f045210.d63268",
+    "id": "e552898d.0c1d9",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4060.566665649414,
-    "y": 245.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 4002.566665649414,
+    "y": 267.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "93300adf.7164e"
+        "28f331ee.9053e6"
       ]
     ]
   },
   {
-    "id": "57e483bc.d9d9f4",
+    "id": "ae2a4fce.8a1ea",
     "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": 4518.566543579102,
-    "y": 267.28564453125,
-    "z": "3edf77d7.add3c",
+    "x": 4460.566543579102,
+    "y": 289.08558654785156,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "be73e257.6c7c7",
+    "id": "2c72c44.f2aec3c",
     "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": 4507.566543579102,
-    "y": 322.28564453125,
-    "z": "3edf77d7.add3c",
+    "x": 4449.566543579102,
+    "y": 344.08558654785156,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "626c6aaa.7748cc",
-        "19c4911c.086f1f",
-        "8b5b13a5.9b5548"
+        "9efeb089.3f19c",
+        "79f2e4c0.6b947c",
+        "6e1f853a.2f305c"
       ]
     ]
   },
   {
-    "id": "8b5b13a5.9b5548",
+    "id": "6e1f853a.2f305c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4838.566665649414,
-    "y": 230.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4780.566665649414,
+    "y": 252.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "93609ef4.15443"
+        "4cb6456e.ff636c"
       ]
     ]
   },
   {
-    "id": "93609ef4.15443",
+    "id": "4cb6456e.ff636c",
     "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": 4987.138198852539,
-    "y": 230.57151794433594,
-    "z": "3edf77d7.add3c",
+    "x": 4929.138198852539,
+    "y": 252.3714599609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "156c88bf.8ed887",
+    "id": "7e5b3ac6.b0f59c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4986.075698852539,
-    "y": 274.71177673339844,
-    "z": "3edf77d7.add3c",
+    "x": 4928.075698852539,
+    "y": 296.51171875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "19c4911c.086f1f",
+    "id": "79f2e4c0.6b947c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4827.075698852539,
-    "y": 274.71177673339844,
-    "z": "3edf77d7.add3c",
+    "x": 4769.075698852539,
+    "y": 296.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "156c88bf.8ed887"
+        "7e5b3ac6.b0f59c"
       ]
     ]
   },
   {
-    "id": "626c6aaa.7748cc",
+    "id": "9efeb089.3f19c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4834.075698852539,
-    "y": 353.71177673339844,
-    "z": "3edf77d7.add3c",
+    "x": 4776.075698852539,
+    "y": 375.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b50e966f.55aaa8"
+        "826c9ce5.e54c8"
       ]
     ]
   },
   {
-    "id": "b50e966f.55aaa8",
+    "id": "826c9ce5.e54c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4973.075698852539,
-    "y": 353.71177673339844,
-    "z": "3edf77d7.add3c",
+    "x": 4915.075698852539,
+    "y": 375.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9ee7b526.b79f4",
-        "7630b329.2d07cc"
+        "97cd2b3d.5361c",
+        "b21dac06.214a"
       ]
     ]
   },
   {
-    "id": "9ee7b526.b79f4",
+    "id": "97cd2b3d.5361c",
     "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": 5178.566665649414,
-    "y": 351.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 5120.566665649414,
+    "y": 373.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7630b329.2d07cc",
+    "id": "b21dac06.214a",
     "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": 5177.566665649414,
-    "y": 397.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 5119.566665649414,
+    "y": 419.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "44a90848.8f1578",
+    "id": "b714d40c.0dac68",
     "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": 3615.566665649414,
-    "y": 361.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3557.566665649414,
+    "y": 383.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "62de4c53.8433ac"
+        "1e5b0c1.e0c2e74"
       ]
     ]
   },
   {
-    "id": "62de4c53.8433ac",
+    "id": "1e5b0c1.e0c2e74",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3895.566665649414,
-    "y": 361.2857666015625,
-    "z": "3edf77d7.add3c",
+    "x": 3837.566665649414,
+    "y": 383.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c51917b6.8d7e"
+        "4e4dff53.dcf898"
       ]
     ]
   },
   {
-    "id": "c51917b6.8d7e",
+    "id": "4e4dff53.dcf898",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2266.5667877197266,
-    "y": 792.2858734130859,
-    "z": "3edf77d7.add3c",
+    "x": 2208.5667877197266,
+    "y": 814.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8a5f2855.b691a8"
+        "ac446985.9d513"
       ]
     ]
   },
   {
-    "id": "8a5f2855.b691a8",
+    "id": "ac446985.9d513",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2443.566665649414,
-    "y": 785.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 2385.566665649414,
+    "y": 807.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "19e426d6.5b9f81",
-        "949e5077.38a42"
+        "8274477.dcf57b8",
+        "276accab.cdfa24"
       ]
     ]
   },
   {
-    "id": "19e426d6.5b9f81",
+    "id": "8274477.dcf57b8",
     "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": 2686.566665649414,
-    "y": 742.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 2628.566665649414,
+    "y": 764.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "949e5077.38a42",
+    "id": "276accab.cdfa24",
     "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": 2675.566665649414,
-    "y": 797.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 2617.566665649414,
+    "y": 819.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "47392897.e24ae8",
-        "e83d2afb.d42318",
-        "ddc13460.7744f"
+        "650f90f1.61d618",
+        "627e407c.cdb6e8",
+        "11b910a0.ac71f7"
       ]
     ]
   },
   {
-    "id": "47392897.e24ae8",
+    "id": "650f90f1.61d618",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2967.057632446289,
-    "y": 775.8597259521484,
-    "z": "3edf77d7.add3c",
+    "x": 2909.057632446289,
+    "y": 797.65966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "23c66f69.49ece8"
+        "4873b670.d0b66"
       ]
     ]
   },
   {
-    "id": "e83d2afb.d42318",
+    "id": "627e407c.cdb6e8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2955.566665649414,
-    "y": 820.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 2897.566665649414,
+    "y": 842.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bb790c96.f0e18"
+        "24b3a747.017c5"
       ]
     ]
   },
   {
-    "id": "23c66f69.49ece8",
+    "id": "4873b670.d0b66",
     "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": 3115.629165649414,
-    "y": 776.1454925537109,
-    "z": "3edf77d7.add3c",
+    "x": 3057.629165649414,
+    "y": 797.9454345703125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bb790c96.f0e18",
+    "id": "24b3a747.017c5",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3114.566665649414,
-    "y": 820.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3056.566665649414,
+    "y": 842.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ddc13460.7744f",
+    "id": "11b910a0.ac71f7",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2962.566665649414,
-    "y": 899.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 2904.566665649414,
+    "y": 921.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ce7226da.e17388"
+        "90fde557.205cd"
       ]
     ]
   },
   {
-    "id": "ce7226da.e17388",
+    "id": "90fde557.205cd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3101.566665649414,
-    "y": 899.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3043.566665649414,
+    "y": 921.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "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"
+        "c9c2aba8.a4026",
+        "ff35ed1f.a0a938",
+        "85e3c5ae.d3ea4",
+        "f6929a04.bb038",
+        "aab96898.397318",
+        "1f6e9e43.7e8d42",
+        "158807bc.c2dde8",
+        "b53436ed.4e5d8",
+        "8c4c723a.871028",
+        "af5ed41e.3d53d8",
+        "ad7d5348.0e5498",
+        "36740b66.98fa4c",
+        "344dee20.fc9faa",
+        "8b000822.1c253",
+        "4b552ff.dab62d",
+        "76a3b118.862498",
+        "62eac021.71055",
+        "fbc065ad.333e38",
+        "28bc0683.b68302"
       ]
     ]
   },
   {
-    "id": "b6d13ba8.f00e28",
+    "id": "e37a586.c072528",
     "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": 3413.566665649414,
-    "y": 449.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 3355.566665649414,
+    "y": 471.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "5b3288fc.6936d8",
+    "id": "c9c2aba8.a4026",
     "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": 3400.5665435791016,
-    "y": 541.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3342.5665435791016,
+    "y": 563.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "6feba0d9.6ac0b",
+    "id": "8b000822.1c253",
     "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": 3357.5665435791016,
-    "y": 586.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3299.5665435791016,
+    "y": 608.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9980ae35.23ba18",
+    "id": "ff35ed1f.a0a938",
     "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": 3332.5665435791016,
-    "y": 649.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3274.5665435791016,
+    "y": 671.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "85d1e230.49ed",
+    "id": "85e3c5ae.d3ea4",
     "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": 3333.5665435791016,
-    "y": 704.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3275.5665435791016,
+    "y": 726.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bf3e43cc.400f1",
+    "id": "f6929a04.bb038",
     "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": 3349.5665435791016,
-    "y": 752.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3291.5665435791016,
+    "y": 774.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3a9b85f6.e1582a",
-        "d8d8c3b5.17db1",
-        "94ad08f1.768ca"
+        "b38ce95d.a8d8b",
+        "924a9986.e8ef18",
+        "f99ce89.2f90198"
       ]
     ]
   },
   {
-    "id": "1f78077d.63f4c1",
+    "id": "aab96898.397318",
     "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": 3344.566665649414,
-    "y": 819.2856292724609,
-    "z": "3edf77d7.add3c",
+    "x": 3286.566665649414,
+    "y": 841.0855712890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "92b833b8.0a3038",
-        "329b8760.c33988",
-        "4b0996dd.3831d8"
+        "84f95296.4ca828",
+        "1e5b7441.b6964c",
+        "529168b7.ab36c8"
       ]
     ]
   },
   {
-    "id": "3a9b85f6.e1582a",
+    "id": "b38ce95d.a8d8b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3590.566665649414,
-    "y": 580.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3532.566665649414,
+    "y": 602.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "11bdd863.93783"
+        "b93c3fb5.8aab08"
       ]
     ]
   },
   {
-    "id": "d8d8c3b5.17db1",
+    "id": "924a9986.e8ef18",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3586.075698852539,
-    "y": 629.7117767333984,
-    "z": "3edf77d7.add3c",
+    "x": 3528.075698852539,
+    "y": 651.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f63a5915.f8a988"
+        "e5b21304.84d3f"
       ]
     ]
   },
   {
-    "id": "94ad08f1.768ca",
+    "id": "f99ce89.2f90198",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3590.075698852539,
-    "y": 682.7117767333984,
-    "z": "3edf77d7.add3c",
+    "x": 3532.075698852539,
+    "y": 704.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d3671f93.7e55b8"
+        "27a2d9bd.f2416e"
       ]
     ]
   },
   {
-    "id": "11bdd863.93783",
+    "id": "b93c3fb5.8aab08",
     "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": 3739.138198852539,
-    "y": 579.5715179443359,
-    "z": "3edf77d7.add3c",
+    "x": 3681.138198852539,
+    "y": 601.3714599609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f63a5915.f8a988",
+    "id": "e5b21304.84d3f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3729.075698852539,
-    "y": 629.7117767333984,
-    "z": "3edf77d7.add3c",
+    "x": 3671.075698852539,
+    "y": 651.51171875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "92b833b8.0a3038",
+    "id": "84f95296.4ca828",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3594.566665649414,
-    "y": 736.2856292724609,
-    "z": "3edf77d7.add3c",
+    "x": 3536.566665649414,
+    "y": 758.0855712890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "675faf6a.ba5628"
+        "5554565c.9228c"
       ]
     ]
   },
   {
-    "id": "329b8760.c33988",
+    "id": "1e5b7441.b6964c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3590.075698852539,
-    "y": 785.7116546630859,
-    "z": "3edf77d7.add3c",
+    "x": 3532.075698852539,
+    "y": 807.5115966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f0edefdd.7fbf88"
+        "6ebd88b9.37bc78"
       ]
     ]
   },
   {
-    "id": "4b0996dd.3831d8",
+    "id": "529168b7.ab36c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3573.075698852539,
-    "y": 833.7116546630859,
-    "z": "3edf77d7.add3c",
+    "x": 3515.075698852539,
+    "y": 855.5115966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d42db304.4749e8"
+        "a79b682c.88ba1"
       ]
     ]
   },
   {
-    "id": "675faf6a.ba5628",
+    "id": "5554565c.9228c",
     "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": 3743.138198852539,
-    "y": 735.5713958740234,
-    "z": "3edf77d7.add3c",
+    "x": 3685.138198852539,
+    "y": 757.371337890625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f0edefdd.7fbf88",
+    "id": "6ebd88b9.37bc78",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3733.075698852539,
-    "y": 785.7116546630859,
-    "z": "3edf77d7.add3c",
+    "x": 3675.075698852539,
+    "y": 807.5115966796875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d3671f93.7e55b8",
+    "id": "27a2d9bd.f2416e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3751.566665649414,
-    "y": 682.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3693.566665649414,
+    "y": 704.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bbaa9d89.298de8"
+        "e35dbf37.07c328"
       ]
     ]
   },
   {
-    "id": "d42db304.4749e8",
+    "id": "a79b682c.88ba1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3726.566665649414,
-    "y": 833.2856292724609,
-    "z": "3edf77d7.add3c",
+    "x": 3668.566665649414,
+    "y": 855.0855712890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6b53fb28.4b35a4"
+        "25d6cc4d.0a0984"
       ]
     ]
   },
   {
-    "id": "bbaa9d89.298de8",
+    "id": "e35dbf37.07c328",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3923.566665649414,
-    "y": 682.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3865.566665649414,
+    "y": 704.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f5f42bcc.193ca8",
-        "1ca26f5e.24e681",
-        "30c464f6.21891c"
+        "df69d2ac.c94928",
+        "d63273d9.506ef8",
+        "3dcf3da2.14e88a"
       ]
     ]
   },
   {
-    "id": "6b53fb28.4b35a4",
+    "id": "25d6cc4d.0a0984",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3918.566665649414,
-    "y": 767.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3860.566665649414,
+    "y": 789.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4fb6ec71.0d0c04",
-        "a3acc90b.3d737",
-        "513e1ab4.43497c"
+        "284fe38.7ff599c",
+        "574139dc.c55898",
+        "f46ebe04.450d9"
       ]
     ]
   },
   {
-    "id": "f5f42bcc.193ca8",
+    "id": "df69d2ac.c94928",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4084.566177368164,
-    "y": 418.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4026.566177368164,
+    "y": 440.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "47912c0e.49beac"
+        "7ce464fa.676414"
       ]
     ]
   },
   {
-    "id": "1ca26f5e.24e681",
+    "id": "d63273d9.506ef8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4086.566177368164,
-    "y": 472.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4028.566177368164,
+    "y": 494.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "eb199d13.e7038"
+        "6bd6b0d9.b558a"
       ]
     ]
   },
   {
-    "id": "4fb6ec71.0d0c04",
+    "id": "284fe38.7ff599c",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4099.565933227539,
-    "y": 640.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4041.565933227539,
+    "y": 662.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ab328b3c.b23248"
+        "6918e709.d57e78"
       ]
     ]
   },
   {
-    "id": "a3acc90b.3d737",
+    "id": "574139dc.c55898",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4101.565933227539,
-    "y": 694.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4043.565933227539,
+    "y": 716.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4b33e71e.9ca98"
+        "688d98a0.dbdc1"
       ]
     ]
   },
   {
-    "id": "8d16f671.5b9d4",
+    "id": "69d167e5.40c62",
     "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": 4394.566177368164,
-    "y": 370.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4336.566177368164,
+    "y": 392.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5b74c380.dcc8d4",
+    "id": "e079feb5.4893f8",
     "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": 4387.566177368164,
-    "y": 468.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4329.566177368164,
+    "y": 490.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "142c8c33.b05574",
+    "id": "81aa5c4a.edfc28",
     "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": 4463.565933227539,
-    "y": 667.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4405.565933227539,
+    "y": 689.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fadd6db5.8e746",
+    "id": "3e901a8b.2e5bae",
     "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": 4467.565933227539,
-    "y": 760.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4409.565933227539,
+    "y": 782.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bb2a4685.ff5b48",
+    "id": "93aaa3a6.0ddda8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3545.566665649414,
-    "y": 1183.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3487.566665649414,
+    "y": 1205.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8f64a837.4a5cd8"
+        "e42413be.b1fcf8"
       ]
     ]
   },
   {
-    "id": "d520358c.dbd16",
+    "id": "9cfab2db.ec2e9",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3555.057632446289,
-    "y": 1225.8597869873047,
-    "z": "3edf77d7.add3c",
+    "x": 3497.057632446289,
+    "y": 1247.6597290039062,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7a345f50.11385"
+        "b6bb4e8e.b484d"
       ]
     ]
   },
   {
-    "id": "59ef9877.d005",
+    "id": "aba7aaee.8e0cf8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3543.566665649414,
-    "y": 1272.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3485.566665649414,
+    "y": 1294.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "de9d99cd.adc298"
+        "30b7412f.1199ae"
       ]
     ]
   },
   {
-    "id": "487ac0b4.4acab8",
+    "id": "3ca3d712.007d28",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3245.566665649414,
-    "y": 1145.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3187.566665649414,
+    "y": 1167.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "21946f52.f16938",
+    "id": "158807bc.c2dde8",
     "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": 3288.566665649414,
-    "y": 1210.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3230.566665649414,
+    "y": 1232.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bb2a4685.ff5b48",
-        "d520358c.dbd16",
-        "59ef9877.d005"
+        "93aaa3a6.0ddda8",
+        "9cfab2db.ec2e9",
+        "aba7aaee.8e0cf8"
       ]
     ]
   },
   {
-    "id": "3d294d62.516b2a",
+    "id": "1f6e9e43.7e8d42",
     "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": 3277.566665649414,
-    "y": 1060.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3219.566665649414,
+    "y": 1082.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a73d10a4.af1e28",
-        "79cd7ec1.3557b8"
+        "aef080fa.c114b",
+        "ec7d5fb1.6942b"
       ]
     ]
   },
   {
-    "id": "79cd7ec1.3557b8",
+    "id": "ec7d5fb1.6942b",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3500.566665649414,
-    "y": 1046.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3442.566665649414,
+    "y": 1068.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9aeedd68.ffa8d8"
+        "fd803677.f63638"
       ]
     ]
   },
   {
-    "id": "a73d10a4.af1e28",
+    "id": "aef080fa.c114b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3502.566665649414,
-    "y": 1079.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3444.566665649414,
+    "y": 1101.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "df8ae871.d54098"
+        "51e88d79.18cdf4"
       ]
     ]
   },
   {
-    "id": "8f64a837.4a5cd8",
+    "id": "e42413be.b1fcf8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3718.233169555664,
-    "y": 1182.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3660.233169555664,
+    "y": 1204.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fbb3abd1.b96e9",
-        "abe82eb0.0cab"
+        "4ed4fbc5.711d0c",
+        "90207f5c.a05dd8"
       ]
     ]
   },
   {
-    "id": "7a345f50.11385",
+    "id": "b6bb4e8e.b484d",
     "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": 3708.6290435791016,
-    "y": 1229.145523071289,
-    "z": "3edf77d7.add3c",
+    "x": 3650.6290435791016,
+    "y": 1250.9454650878906,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "de9d99cd.adc298",
+    "id": "30b7412f.1199ae",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3712.566665649414,
-    "y": 1273.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3654.566665649414,
+    "y": 1295.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fbb3abd1.b96e9",
+    "id": "4ed4fbc5.711d0c",
     "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": 3982.566665649414,
-    "y": 1233.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3924.566665649414,
+    "y": 1255.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e3260a1d.15ae2",
-        "378a4b05.ba3ff4"
+        "db4ec7c1.fb8ff8",
+        "8a68098.2ae2578"
       ]
     ]
   },
   {
-    "id": "378a4b05.ba3ff4",
+    "id": "8a68098.2ae2578",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4158.566665649414,
-    "y": 1283.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4100.566665649414,
+    "y": 1305.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7538291f.829488"
+        "9f8db296.d1b7"
       ]
     ]
   },
   {
-    "id": "e3260a1d.15ae2",
+    "id": "db4ec7c1.fb8ff8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4160.566665649414,
-    "y": 1347.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4102.566665649414,
+    "y": 1369.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "25aab61c.c2472a"
+        "19ec1ce6.638d63"
       ]
     ]
   },
   {
-    "id": "25aab61c.c2472a",
+    "id": "19ec1ce6.638d63",
     "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": 4322.566665649414,
-    "y": 1343.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4264.566665649414,
+    "y": 1365.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7538291f.829488",
+    "id": "9f8db296.d1b7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4323.566665649414,
-    "y": 1280.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4265.566665649414,
+    "y": 1302.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "32fabbd2.bab7c4",
-        "d6bf1e67.ba86d8"
+        "5c94bd3f.3e7f94",
+        "fc089afb.f44ed8"
       ]
     ]
   },
   {
-    "id": "df8ae871.d54098",
+    "id": "51e88d79.18cdf4",
     "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": 3645.566665649414,
-    "y": 1076.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3587.566665649414,
+    "y": 1098.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9aeedd68.ffa8d8",
+    "id": "fd803677.f63638",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3648.566665649414,
-    "y": 1039.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3590.566665649414,
+    "y": 1061.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "12c81e56.7fa00a",
-        "87e2ebef.10b6c8"
+        "eccb372c.34c8d",
+        "98d2965b.47a9d8"
       ]
     ]
   },
   {
-    "id": "12c81e56.7fa00a",
+    "id": "eccb372c.34c8d",
     "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": 3822.566665649414,
-    "y": 995.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3764.566665649414,
+    "y": 1017.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "abe82eb0.0cab",
+    "id": "90207f5c.a05dd8",
     "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": 3694.566665649414,
-    "y": 1364.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3636.566665649414,
+    "y": 1386.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "67c85268.32dfec"
+        "5a97a44a.833984"
       ]
     ]
   },
   {
-    "id": "67c85268.32dfec",
+    "id": "5a97a44a.833984",
     "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": 3975.566665649414,
-    "y": 1359.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3917.566665649414,
+    "y": 1381.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "22f4aa3d.402fe6"
+        "1a323487.0d80a3"
       ]
     ]
   },
   {
-    "id": "22f4aa3d.402fe6",
+    "id": "1a323487.0d80a3",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4286.852310180664,
-    "y": 1434.1075286865234,
-    "z": "3edf77d7.add3c",
+    "x": 4228.852310180664,
+    "y": 1455.907470703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4ffa151f.c35edc"
+        "25962334.407414"
       ]
     ]
   },
   {
-    "id": "87e2ebef.10b6c8",
+    "id": "98d2965b.47a9d8",
     "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": 3837.566665649414,
-    "y": 1106.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3779.566665649414,
+    "y": 1128.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "46c6e0d9.d87168",
-        "d98bf1e8.c353c8",
-        "76b578a.409ac88"
+        "3ec80c0c.a7d6a4",
+        "fb8be251.80b5",
+        "c39223e5.81b608"
       ]
     ]
   },
   {
-    "id": "46c6e0d9.d87168",
+    "id": "3ec80c0c.a7d6a4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4033.0667877197266,
-    "y": 1058.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3975.0667877197266,
+    "y": 1080.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7281b691.ff84e"
+        "cee29929.100dd"
       ]
     ]
   },
   {
-    "id": "d98bf1e8.c353c8",
+    "id": "fb8be251.80b5",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4025.0667877197266,
-    "y": 1113.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3967.0667877197266,
+    "y": 1135.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "552f36f.a1294c8"
+        "75204f77.c3b168"
       ]
     ]
   },
   {
-    "id": "76b578a.409ac88",
+    "id": "c39223e5.81b608",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4030.0667877197266,
-    "y": 1170.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3972.0667877197266,
+    "y": 1192.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2fdf3cab.68e914"
+        "24e0ef02.5cfcc"
       ]
     ]
   },
   {
-    "id": "2fdf3cab.68e914",
+    "id": "24e0ef02.5cfcc",
     "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": 4182.066787719727,
-    "y": 1171.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4124.066787719727,
+    "y": 1193.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "552f36f.a1294c8",
+    "id": "75204f77.c3b168",
     "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": 4193.066787719727,
-    "y": 1116.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4135.066787719727,
+    "y": 1138.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7281b691.ff84e",
+    "id": "cee29929.100dd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4177.449111938477,
-    "y": 1055.941421508789,
-    "z": "3edf77d7.add3c",
+    "x": 4119.449111938477,
+    "y": 1077.7413635253906,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b1882a27.4b4ab8"
+        "20e9a108.5fcefe"
       ]
     ]
   },
   {
-    "id": "b1882a27.4b4ab8",
+    "id": "20e9a108.5fcefe",
     "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": 4400.566909790039,
-    "y": 1194.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4342.566909790039,
+    "y": 1216.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "491c14e2.9cc81c"
+        "4c952f98.568af8"
       ]
     ]
   },
   {
-    "id": "d6bf1e67.ba86d8",
+    "id": "fc089afb.f44ed8",
     "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": 4493.566665649414,
-    "y": 1238.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4435.566665649414,
+    "y": 1260.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "32fabbd2.bab7c4",
+    "id": "5c94bd3f.3e7f94",
     "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": 4494.566665649414,
-    "y": 1346.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4436.566665649414,
+    "y": 1368.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8e04ebf5.eee41",
+    "id": "e2e3430b.441438",
     "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": 4495.566665649414,
-    "y": 1295.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4437.566665649414,
+    "y": 1317.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4ffa151f.c35edc",
+    "id": "25962334.407414",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4493.683853149414,
-    "y": 1434.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 4435.683853149414,
+    "y": 1456.426025390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c59a3a79.308e08",
-        "e4841ff6.3e7e08",
-        "5d11c4a6.df68cc"
+        "c4c94be4.c4e6d8",
+        "778cb9b9.8f8fe8",
+        "bf204b7b.9bfdb"
       ]
     ]
   },
   {
-    "id": "c59a3a79.308e08",
+    "id": "c4c94be4.c4e6d8",
     "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": 4708.683853149414,
-    "y": 1396.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 4650.683853149414,
+    "y": 1418.426025390625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e4841ff6.3e7e08",
+    "id": "778cb9b9.8f8fe8",
     "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": 4705.683853149414,
-    "y": 1435.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 4647.683853149414,
+    "y": 1457.426025390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "766fb473.2a452c"
+        "ec4224f7.9e7cd8"
       ]
     ]
   },
   {
-    "id": "5d11c4a6.df68cc",
+    "id": "bf204b7b.9bfdb",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4661.183853149414,
-    "y": 1477.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 4603.183853149414,
+    "y": 1499.426025390625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "766fb473.2a452c",
+    "id": "ec4224f7.9e7cd8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4886.183853149414,
-    "y": 1434.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 4828.183853149414,
+    "y": 1456.426025390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "91f25d9a.835d38"
+        "582de34f.7fb28c"
       ]
     ]
   },
   {
-    "id": "cce9c2da.fea888",
+    "id": "594a82b5.27abf4",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4798.566909790039,
-    "y": 1198.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4740.566909790039,
+    "y": 1220.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7f9c2923.089b6"
+        "66078b.852b6874"
       ]
     ]
   },
   {
-    "id": "7f9c2923.089b6",
+    "id": "66078b.852b6874",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4975.566909790039,
-    "y": 1190.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4917.566909790039,
+    "y": 1212.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "713d1c50.32082c",
-        "1fe6b234.c7fd7e"
+        "845ac8fd.748f28",
+        "83b24a05.2f8a"
       ]
     ]
   },
   {
-    "id": "491c14e2.9cc81c",
+    "id": "4c952f98.568af8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4595.566909790039,
-    "y": 1194.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4537.566909790039,
+    "y": 1216.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cce9c2da.fea888",
-        "181e2b72.5adced"
+        "594a82b5.27abf4",
+        "5ed6730.6c8c00c"
       ]
     ]
   },
   {
-    "id": "181e2b72.5adced",
+    "id": "5ed6730.6c8c00c",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4664.566909790039,
-    "y": 1268.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4606.566909790039,
+    "y": 1290.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5ef7391a.b132a8"
+        "4c5161e.9fd722"
       ]
     ]
   },
   {
-    "id": "5ef7391a.b132a8",
+    "id": "4c5161e.9fd722",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4860.566909790039,
-    "y": 1268.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4802.566909790039,
+    "y": 1290.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1d2757a1.42bf3"
+        "56b33693.b47598"
       ]
     ]
   },
   {
-    "id": "91f25d9a.835d38",
+    "id": "582de34f.7fb28c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5044.183853149414,
-    "y": 1434.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 4986.183853149414,
+    "y": 1456.426025390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "83fb3b54.d5c3d"
+        "85577907.9676c"
       ]
     ]
   },
   {
-    "id": "83fb3b54.d5c3d",
+    "id": "85577907.9676c",
     "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": 5251.183853149414,
-    "y": 1434.6260833740234,
-    "z": "3edf77d7.add3c",
+    "x": 5193.183853149414,
+    "y": 1456.426025390625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1fe6b234.c7fd7e",
+    "id": "83b24a05.2f8a",
     "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": 5200.566909790039,
-    "y": 1186.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5142.566909790039,
+    "y": 1208.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f445a11a.71bc2",
-        "1ca051d1.62d8c6",
-        "b5779702.ec152"
+        "713c5be.b2c37a4",
+        "d56276.26041588",
+        "196389ff.ab755e"
       ]
     ]
   },
   {
-    "id": "713d1c50.32082c",
+    "id": "845ac8fd.748f28",
     "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": 5230.566909790039,
-    "y": 1134.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5172.566909790039,
+    "y": 1156.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f445a11a.71bc2",
+    "id": "713c5be.b2c37a4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5410.566909790039,
-    "y": 1177.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5352.566909790039,
+    "y": 1199.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "97cfd71c.893b9"
+        "d0702051.0907f"
       ]
     ]
   },
   {
-    "id": "1ca051d1.62d8c6",
+    "id": "d56276.26041588",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5402.566909790039,
-    "y": 1232.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5344.566909790039,
+    "y": 1254.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f71936fa.5c6ed8"
+        "8b99771a.c5d7d8"
       ]
     ]
   },
   {
-    "id": "b5779702.ec152",
+    "id": "196389ff.ab755e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5407.566909790039,
-    "y": 1289.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5349.566909790039,
+    "y": 1311.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2f95de59.c21562"
+        "a51c05da.8af508"
       ]
     ]
   },
   {
-    "id": "2f95de59.c21562",
+    "id": "a51c05da.8af508",
     "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": 5559.566909790039,
-    "y": 1290.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5501.566909790039,
+    "y": 1312.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f71936fa.5c6ed8",
+    "id": "8b99771a.c5d7d8",
     "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": 5570.566909790039,
-    "y": 1235.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5512.566909790039,
+    "y": 1257.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "97cfd71c.893b9",
+    "id": "d0702051.0907f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5554.949234008789,
-    "y": 1174.941421508789,
-    "z": "3edf77d7.add3c",
+    "x": 5496.949234008789,
+    "y": 1196.7413635253906,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3725abc9.8fe81c"
+        "2f7031d3.9cf0ee"
       ]
     ]
   },
   {
-    "id": "1d2757a1.42bf3",
+    "id": "56b33693.b47598",
     "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": 5123.566909790039,
-    "y": 1271.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5065.566909790039,
+    "y": 1293.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3725abc9.8fe81c",
+    "id": "2f7031d3.9cf0ee",
     "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": 5741.566909790039,
-    "y": 1171.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5683.566909790039,
+    "y": 1193.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "67aa7525.7bae1c",
+    "id": "f189d378.846e88",
     "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": 4382.566177368164,
-    "y": 406.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4324.566177368164,
+    "y": 428.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "18cc69a3.9aa206",
+    "id": "b971caad.98e088",
     "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": 4373.566177368164,
-    "y": 504.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4315.566177368164,
+    "y": 526.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "47912c0e.49beac",
+    "id": "7ce464fa.676414",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4207.566177368164,
-    "y": 412.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4149.566177368164,
+    "y": 434.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8d16f671.5b9d4",
-        "67aa7525.7bae1c"
+        "69d167e5.40c62",
+        "f189d378.846e88"
       ]
     ]
   },
   {
-    "id": "eb199d13.e7038",
+    "id": "6bd6b0d9.b558a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4213.566177368164,
-    "y": 476.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4155.566177368164,
+    "y": 498.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5b74c380.dcc8d4",
-        "18cc69a3.9aa206"
+        "e079feb5.4893f8",
+        "b971caad.98e088"
       ]
     ]
   },
   {
-    "id": "ab328b3c.b23248",
+    "id": "6918e709.d57e78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4227.565933227539,
-    "y": 640.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4169.565933227539,
+    "y": 662.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "142c8c33.b05574",
-        "53d3049.af6e8fc"
+        "81aa5c4a.edfc28",
+        "94706e58.1662e"
       ]
     ]
   },
   {
-    "id": "4b33e71e.9ca98",
+    "id": "688d98a0.dbdc1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4230.565933227539,
-    "y": 693.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4172.565933227539,
+    "y": 715.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fadd6db5.8e746",
-        "2cd10454.6fd4ec"
+        "3e901a8b.2e5bae",
+        "fa86abe3.b1432"
       ]
     ]
   },
   {
-    "id": "53d3049.af6e8fc",
+    "id": "94706e58.1662e",
     "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": 4449.565933227539,
-    "y": 707.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4391.565933227539,
+    "y": 729.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2cd10454.6fd4ec",
+    "id": "fa86abe3.b1432",
     "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": 4452.565933227539,
-    "y": 798.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4394.565933227539,
+    "y": 820.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4fd998b7.acd798",
+    "id": "86d40228.e6791",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3608.566665649414,
-    "y": 1744.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3550.566665649414,
+    "y": 1766.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "de0c38ee.f76ef8",
-        "25935580.28bbea"
+        "6a32c154.ba6f4",
+        "1782aa9f.237955"
       ]
     ]
   },
   {
-    "id": "170f6ee1.76ff39",
+    "id": "9ec80efb.c2577",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3435.900161743164,
-    "y": 1745.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3377.900161743164,
+    "y": 1767.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4fd998b7.acd798"
+        "86d40228.e6791"
       ]
     ]
   },
   {
-    "id": "6aad81bd.cb4268",
+    "id": "43e3fed6.1297b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3445.391128540039,
-    "y": 1787.8597869873047,
-    "z": "3edf77d7.add3c",
+    "x": 3387.391128540039,
+    "y": 1809.6597290039062,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "54bd0023.9501c8"
+        "334a1379.e9843c"
       ]
     ]
   },
   {
-    "id": "e02aca99.393958",
+    "id": "1f47b68f.a8eef1",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3433.900161743164,
-    "y": 1834.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3375.900161743164,
+    "y": 1856.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "20e4fbbc.46dd64"
+        "5bb133ac.e78e0c"
       ]
     ]
   },
   {
-    "id": "54bd0023.9501c8",
+    "id": "334a1379.e9843c",
     "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": 3598.9625396728516,
-    "y": 1791.145523071289,
-    "z": "3edf77d7.add3c",
+    "x": 3540.9625396728516,
+    "y": 1812.9454650878906,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "20e4fbbc.46dd64",
+    "id": "5bb133ac.e78e0c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3602.900161743164,
-    "y": 1835.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3544.900161743164,
+    "y": 1857.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "de0c38ee.f76ef8",
+    "id": "6a32c154.ba6f4",
     "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": 3894.900161743164,
-    "y": 1748.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3836.900161743164,
+    "y": 1770.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "36c6c2be.762bee",
-        "9dad2b66.a09d3"
+        "ca43a356.ba0b08",
+        "e66d0b8d.a97b4"
       ]
     ]
   },
   {
-    "id": "9dad2b66.a09d3",
+    "id": "e66d0b8d.a97b4",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4117.900161743164,
-    "y": 1703.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4059.900161743164,
+    "y": 1725.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "36a66ce5.93da74"
+        "fd8de530.926928"
       ]
     ]
   },
   {
-    "id": "36c6c2be.762bee",
+    "id": "ca43a356.ba0b08",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4119.900161743164,
-    "y": 1767.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4061.900161743164,
+    "y": 1789.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4c6cb6f3.89667"
+        "ac8c9391.216608"
       ]
     ]
   },
   {
-    "id": "4c6cb6f3.89667",
+    "id": "ac8c9391.216608",
     "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": 4278.900161743164,
-    "y": 1786.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4220.900161743164,
+    "y": 1808.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "36a66ce5.93da74",
+    "id": "fd8de530.926928",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4282.900161743164,
-    "y": 1700.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4224.900161743164,
+    "y": 1722.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5a5e37bd.3076e",
-        "6e346008.c0c8d"
+        "23cc210e.ee0c06",
+        "6fca06b.e0d07f8"
       ]
     ]
   },
   {
-    "id": "63476979.041bd8",
+    "id": "8c4c723a.871028",
     "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": 3207.900161743164,
-    "y": 1780.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3149.900161743164,
+    "y": 1802.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "170f6ee1.76ff39",
-        "6aad81bd.cb4268",
-        "e02aca99.393958"
+        "9ec80efb.c2577",
+        "43e3fed6.1297b8",
+        "1f47b68f.a8eef1"
       ]
     ]
   },
   {
-    "id": "dbdf27a7.fc5e4",
+    "id": "24043c86.21d3b4",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3168.900161743164,
-    "y": 1724.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3110.900161743164,
+    "y": 1746.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "35531714.c0e89",
+    "id": "b53436ed.4e5d8",
     "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": 3220.900161743164,
-    "y": 1526.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3162.900161743164,
+    "y": 1548.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1026191c.92617f",
-        "af47cd19.1e85a"
+        "b0d17fd7.22179",
+        "dd9d4fb5.ef81d"
       ]
     ]
   },
   {
-    "id": "af47cd19.1e85a",
+    "id": "dd9d4fb5.ef81d",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3443.900161743164,
-    "y": 1512.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3385.900161743164,
+    "y": 1534.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "79bebb4c.23a30c"
+        "b04c1433.ec2b4"
       ]
     ]
   },
   {
-    "id": "1026191c.92617f",
+    "id": "b0d17fd7.22179",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3445.900161743164,
-    "y": 1545.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3387.900161743164,
+    "y": 1567.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f83e847f.4ec13"
+        "774ab139.4714d"
       ]
     ]
   },
   {
-    "id": "f83e847f.4ec13",
+    "id": "774ab139.4714d",
     "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": 3588.900161743164,
-    "y": 1542.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3530.900161743164,
+    "y": 1564.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "79bebb4c.23a30c",
+    "id": "b04c1433.ec2b4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3591.900161743164,
-    "y": 1505.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3533.900161743164,
+    "y": 1527.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3fb5f800.679e",
-        "4b785447.3b4bdc"
+        "1e9a896f.f9bc1f",
+        "93b99c7d.fb3988"
       ]
     ]
   },
   {
-    "id": "3fb5f800.679e",
+    "id": "1e9a896f.f9bc1f",
     "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": 3785.900161743164,
-    "y": 1508.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3727.900161743164,
+    "y": 1530.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "25935580.28bbea",
+    "id": "1782aa9f.237955",
     "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": 3838.900161743164,
-    "y": 1867.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3780.900161743164,
+    "y": 1889.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e6fe79a3.e9ea5"
+        "2e3481a6.9bb10e"
       ]
     ]
   },
   {
-    "id": "e6fe79a3.e9ea5",
+    "id": "2e3481a6.9bb10e",
     "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": 4044.900161743164,
-    "y": 1867.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3986.900161743164,
+    "y": 1889.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "122e4fb.7ae86b"
+        "6540c5f1.0a5994"
       ]
     ]
   },
   {
-    "id": "122e4fb.7ae86b",
+    "id": "6540c5f1.0a5994",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4262.185806274414,
-    "y": 1866.1075286865234,
-    "z": "3edf77d7.add3c",
+    "x": 4204.185806274414,
+    "y": 1887.907470703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "837cca48.ec2188"
+        "95bcf360.d32c3"
       ]
     ]
   },
   {
-    "id": "4b785447.3b4bdc",
+    "id": "93b99c7d.fb3988",
     "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": 3807.900161743164,
-    "y": 1576.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3749.900161743164,
+    "y": 1598.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c81ddea8.acca2",
-        "677cee1e.585708",
-        "5b3f6a5a.a599cc"
+        "56130ba2.c1cf54",
+        "ae8939cc.fc31",
+        "2a03aebc.9defb2"
       ]
     ]
   },
   {
-    "id": "c81ddea8.acca2",
+    "id": "56130ba2.c1cf54",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4003.4002838134766,
-    "y": 1528.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3945.4002838134766,
+    "y": 1550.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4e15930.1f2346c"
+        "d6a55773.4a4c"
       ]
     ]
   },
   {
-    "id": "677cee1e.585708",
+    "id": "ae8939cc.fc31",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3995.4002838134766,
-    "y": 1583.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3937.4002838134766,
+    "y": 1605.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "77c7f195.03bd88"
+        "9b459bcd.2098d"
       ]
     ]
   },
   {
-    "id": "5b3f6a5a.a599cc",
+    "id": "2a03aebc.9defb2",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4000.4002838134766,
-    "y": 1640.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3942.4002838134766,
+    "y": 1662.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "44cfcdb.eef3bb4"
+        "649fe73e.2ce088"
       ]
     ]
   },
   {
-    "id": "44cfcdb.eef3bb4",
+    "id": "649fe73e.2ce088",
     "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": 4152.400283813477,
-    "y": 1641.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4094.4002838134766,
+    "y": 1663.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "77c7f195.03bd88",
+    "id": "9b459bcd.2098d",
     "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": 4163.400283813477,
-    "y": 1586.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4105.400283813477,
+    "y": 1608.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4e15930.1f2346c",
+    "id": "d6a55773.4a4c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4147.782608032227,
-    "y": 1525.9415435791016,
-    "z": "3edf77d7.add3c",
+    "x": 4089.7826080322266,
+    "y": 1547.7414855957031,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3bb66f6b.2423e"
+        "bede9152.115d78"
       ]
     ]
   },
   {
-    "id": "5a5e37bd.3076e",
+    "id": "23cc210e.ee0c06",
     "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": 4452.900161743164,
-    "y": 1661.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4394.900161743164,
+    "y": 1683.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6e346008.c0c8d",
+    "id": "6fca06b.e0d07f8",
     "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": 4453.900161743164,
-    "y": 1766.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4395.900161743164,
+    "y": 1788.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f684cc96.93a36",
+    "id": "69bceee8.94dc1",
     "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": 4448.900161743164,
-    "y": 1715.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4390.900161743164,
+    "y": 1737.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "837cca48.ec2188",
+    "id": "95bcf360.d32c3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4469.017349243164,
-    "y": 1855.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 4411.017349243164,
+    "y": 1877.4261474609375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4370bd5a.9f5934",
-        "1bda5a20.b54946",
-        "7ecac2a.84cd6bc"
+        "d7309d49.1473f8",
+        "2eed2e93.5097fa",
+        "930eaed5.6d5ba"
       ]
     ]
   },
   {
-    "id": "4370bd5a.9f5934",
+    "id": "d7309d49.1473f8",
     "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": 4684.017349243164,
-    "y": 1817.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 4626.017349243164,
+    "y": 1839.4261474609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1bda5a20.b54946",
+    "id": "2eed2e93.5097fa",
     "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": 4681.017349243164,
-    "y": 1856.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 4623.017349243164,
+    "y": 1878.4261474609375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e1da362d.0aaf38"
+        "2f95459c.265a5a"
       ]
     ]
   },
   {
-    "id": "7ecac2a.84cd6bc",
+    "id": "930eaed5.6d5ba",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4636.517349243164,
-    "y": 1898.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 4578.517349243164,
+    "y": 1920.4261474609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e1da362d.0aaf38",
+    "id": "2f95459c.265a5a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4861.517349243164,
-    "y": 1855.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 4803.517349243164,
+    "y": 1877.4261474609375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4842e5f.6c9081c"
+        "d078b0a.68a52d"
       ]
     ]
   },
   {
-    "id": "4842e5f.6c9081c",
+    "id": "d078b0a.68a52d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5019.517349243164,
-    "y": 1855.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 4961.517349243164,
+    "y": 1877.4261474609375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d2ac7d5.8c2918"
+        "30e98951.5e07a6"
       ]
     ]
   },
   {
-    "id": "d2ac7d5.8c2918",
+    "id": "30e98951.5e07a6",
     "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": 5226.517349243164,
-    "y": 1855.626205444336,
-    "z": "3edf77d7.add3c",
+    "x": 5168.517349243164,
+    "y": 1877.4261474609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d8873c57.456df",
+    "id": "981701b9.ec871",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4729.900161743164,
-    "y": 1544.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4671.900161743164,
+    "y": 1566.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bf2c165b.0d277"
+        "d77b06b.6f4d6f8"
       ]
     ]
   },
   {
-    "id": "bf2c165b.0d277",
+    "id": "d77b06b.6f4d6f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4906.900161743164,
-    "y": 1536.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4848.900161743164,
+    "y": 1558.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7f001b92.6c2014",
-        "47ea9781.67241"
+        "3a0f923c.08de3e",
+        "973e1032.2176f8"
       ]
     ]
   },
   {
-    "id": "3bb66f6b.2423e",
+    "id": "bede9152.115d78",
     "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": 4331.900161743164,
-    "y": 1540.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4273.900161743164,
+    "y": 1562.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c9ef5f55.13159"
+        "fdc36db2.a87e28"
       ]
     ]
   },
   {
-    "id": "c9ef5f55.13159",
+    "id": "fdc36db2.a87e28",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4526.900161743164,
-    "y": 1540.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4468.900161743164,
+    "y": 1562.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d8873c57.456df",
-        "e212cfa3.d9b94"
+        "981701b9.ec871",
+        "be6d1ad1.f19078"
       ]
     ]
   },
   {
-    "id": "47ea9781.67241",
+    "id": "973e1032.2176f8",
     "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": 5114.900161743164,
-    "y": 1543.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5056.900161743164,
+    "y": 1565.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "46f5dd83.067904",
-        "97b572f2.cabba",
-        "90953f01.0039c"
+        "ca9140fb.c087c8",
+        "6d0312aa.d002b4",
+        "f05eee5.baf501"
       ]
     ]
   },
   {
-    "id": "666bc3f3.f942ac",
+    "id": "6e647d31.2d49bc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4908.900161743164,
-    "y": 1609.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4850.900161743164,
+    "y": 1631.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "af972400.78ec68"
+        "e3a19b14.5a697"
       ]
     ]
   },
   {
-    "id": "e212cfa3.d9b94",
+    "id": "be6d1ad1.f19078",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4731.900161743164,
-    "y": 1617.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4673.900161743164,
+    "y": 1639.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "666bc3f3.f942ac"
+        "6e647d31.2d49bc"
       ]
     ]
   },
   {
-    "id": "7f001b92.6c2014",
+    "id": "3a0f923c.08de3e",
     "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": 5144.900161743164,
-    "y": 1491.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5086.900161743164,
+    "y": 1513.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "af972400.78ec68",
+    "id": "e3a19b14.5a697",
     "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": 5090.900161743164,
-    "y": 1673.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5032.900161743164,
+    "y": 1695.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "46f5dd83.067904",
+    "id": "ca9140fb.c087c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5324.900161743164,
-    "y": 1534.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5266.900161743164,
+    "y": 1556.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9ccd655c.46849"
+        "b8d407f0.fa2f2"
       ]
     ]
   },
   {
-    "id": "97b572f2.cabba",
+    "id": "6d0312aa.d002b4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5316.900161743164,
-    "y": 1589.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5258.900161743164,
+    "y": 1611.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4f6c8e9e.87ef88"
+        "4b944ffd.e25418"
       ]
     ]
   },
   {
-    "id": "90953f01.0039c",
+    "id": "f05eee5.baf501",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5321.900161743164,
-    "y": 1646.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5263.900161743164,
+    "y": 1668.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5fa05e22.fdafa8"
+        "ee8e04d7.272aa8"
       ]
     ]
   },
   {
-    "id": "5fa05e22.fdafa8",
+    "id": "ee8e04d7.272aa8",
     "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": 5473.900161743164,
-    "y": 1647.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5415.900161743164,
+    "y": 1669.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4f6c8e9e.87ef88",
+    "id": "4b944ffd.e25418",
     "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": 5484.900161743164,
-    "y": 1592.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5426.900161743164,
+    "y": 1614.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9ccd655c.46849",
+    "id": "b8d407f0.fa2f2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5469.282485961914,
-    "y": 1531.9415435791016,
-    "z": "3edf77d7.add3c",
+    "x": 5411.282485961914,
+    "y": 1553.7414855957031,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9bc41fad.100098"
+        "6d9ea0b0.8eb598"
       ]
     ]
   },
   {
-    "id": "9bc41fad.100098",
+    "id": "6d9ea0b0.8eb598",
     "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": 5683.900161743164,
-    "y": 1528.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5625.900161743164,
+    "y": 1550.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "aac95e09.ab90b8",
+    "id": "af5ed41e.3d53d8",
     "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": 3272.566665649414,
-    "y": 1350.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3214.566665649414,
+    "y": 1372.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c158f2ac.9bf138",
+    "id": "8ca11cdb.f07238",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4549.566177368164,
-    "y": 490.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 4491.566177368164,
+    "y": 512.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1c9be409.368d34",
+    "id": "d8ad8c3e.d0237",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4617.565933227539,
-    "y": 692.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4559.565933227539,
+    "y": 714.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d36e02ea.349dc",
+    "id": "ad7d5348.0e5498",
     "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": 3168.566665649414,
-    "y": 1911.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3110.566665649414,
+    "y": 1933.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ad429900.4c716",
+    "id": "36740b66.98fa4c",
     "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": 3430.566665649414,
-    "y": 2824.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3372.566665649414,
+    "y": 2846.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "456e0186.bd36f8",
+    "id": "344dee20.fc9faa",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3307.566665649414,
-    "y": 2934.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3249.566665649414,
+    "y": 2956.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1a6260f2.b38e77",
-        "151ade37.c8cbba"
+        "ae20b5d5.d95098",
+        "c9495f1c.3bc2f8"
       ]
     ]
   },
   {
-    "id": "1a6260f2.b38e77",
+    "id": "ae20b5d5.d95098",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3491.566665649414,
-    "y": 2913.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3433.566665649414,
+    "y": 2935.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ba23a41e.50085"
+        "dbad0754.935cf"
       ]
     ]
   },
   {
-    "id": "151ade37.c8cbba",
+    "id": "c9495f1c.3bc2f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3027.566665649414,
-    "y": 4499.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 2969.566665649414,
+    "y": 4521.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f3de805.eee03"
+        "89fb91c7.4bd6f"
       ]
     ]
   },
   {
-    "id": "e429a394.1622b",
+    "id": "10e6ecec.11b933",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3538.566665649414,
-    "y": 5084.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3480.566665649414,
+    "y": 5106.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ee345eb7.dd48b",
-        "78110e1d.34a828",
-        "399c8052.14794",
-        "7855b68f.e847e",
-        "7a90992b.99ef7",
-        "2987a87c.d9af38"
+        "965aea89.b04fc8",
+        "f18404c6.f7135",
+        "e65dde18.8f2e28",
+        "1e648504.a919f3",
+        "518cc181.03ac48",
+        "3f0ddd6.f3f1022"
       ]
     ]
   },
   {
-    "id": "ba23a41e.50085",
+    "id": "dbad0754.935cf",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6204.566665649414,
-    "y": 1733.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6146.566665649414,
+    "y": 1755.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "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"
+        "36824bf8.d68ef4",
+        "2dc163c.5688f1c",
+        "aefc0847.3297e8",
+        "f9d64859.5035b",
+        "378565ef.1147ba",
+        "ea2b2456.c327d",
+        "41693c79.da7d5c",
+        "632a01d1.5b8d1",
+        "3ebd5a04.12a166",
+        "f08579e.3888c08",
+        "c49cd07d.45dca",
+        "64b31039.d88b18",
+        "9f309da2.930198",
+        "bc5b333d.5b219",
+        "4ee4ed66.f0512c",
+        "11738810.45add",
+        "997f20e4.966598",
+        "90ca3b9e.d9782",
+        "99bc893b.a732e",
+        "98d8658a.1dab08",
+        "d8f4cd5c.153e9",
+        "96928e3.987df7"
       ]
     ]
   },
   {
-    "id": "9ef240b6.5338",
+    "id": "3ebd5a04.12a166",
     "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": 6575.566665649414,
-    "y": 1656.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6517.566665649414,
+    "y": 1678.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "18ef4940.2cc947",
+    "id": "36824bf8.d68ef4",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 6529.566665649414,
-    "y": 1754.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6471.566665649414,
+    "y": 1776.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "10bd34b9.d586b3",
+    "id": "2dc163c.5688f1c",
     "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": 6665.566665649414,
-    "y": 1801.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6607.566665649414,
+    "y": 1823.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "577f8c89.2e206c",
+    "id": "c7f7058b.2d43",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6496.566665649414,
-    "y": 1605.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6438.566665649414,
+    "y": 1627.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "267ba619.c9af8a",
+    "id": "288fb927.99235e",
     "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": 6992.566665649414,
-    "y": 2341.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6934.566665649414,
+    "y": 2363.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c874118.0dda17",
+    "id": "aefc0847.3297e8",
     "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": 6556.566665649414,
-    "y": 2380.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6498.566665649414,
+    "y": 2402.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "e01a8555.4482f8",
+    "id": "f9d64859.5035b",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 6504.566665649414,
-    "y": 2431.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6446.566665649414,
+    "y": 2453.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "48a8a99c.f1479",
+    "id": "378565ef.1147ba",
     "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": 6640.566665649414,
-    "y": 2478.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6582.566665649414,
+    "y": 2500.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "52e24832.034e88",
+    "id": "718897ce.fb3b1",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 6497.566665649414,
-    "y": 2340.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6439.566665649414,
+    "y": 2362.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "debe9e97.cd8f",
+    "id": "42817fe0.95098",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6927.566665649414,
-    "y": 2537.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6869.566665649414,
+    "y": 2559.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "65f7f754.67c0f8",
+    "id": "ea2b2456.c327d",
     "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": 6518.566665649414,
-    "y": 2584.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6460.566665649414,
+    "y": 2606.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "85091e88.c72c7",
-        "7dba75fe.6c5c54",
-        "3df3f46e.6f2edc"
+        "7708ed16.f5264c",
+        "77c895d1.87f4a4",
+        "866d7f4e.404768"
       ]
     ]
   },
   {
-    "id": "85091e88.c72c7",
+    "id": "7708ed16.f5264c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6765.566665649414,
-    "y": 2538.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6707.566665649414,
+    "y": 2560.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "debe9e97.cd8f"
+        "42817fe0.95098"
       ]
     ]
   },
   {
-    "id": "7dba75fe.6c5c54",
+    "id": "77c895d1.87f4a4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6766.057632446289,
-    "y": 2583.8597869873047,
-    "z": "3edf77d7.add3c",
+    "x": 6708.057632446289,
+    "y": 2605.6597290039062,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3c115d7c.ba4cb2"
+        "372888d7.b266f8"
       ]
     ]
   },
   {
-    "id": "3df3f46e.6f2edc",
+    "id": "866d7f4e.404768",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6763.566665649414,
-    "y": 2627.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6705.566665649414,
+    "y": 2649.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3193d0af.6d5de8"
+        "5cb60ec5.ffb7e8"
       ]
     ]
   },
   {
-    "id": "3c115d7c.ba4cb2",
+    "id": "372888d7.b266f8",
     "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": 6928.629043579102,
-    "y": 2584.145523071289,
-    "z": "3edf77d7.add3c",
+    "x": 6870.629043579102,
+    "y": 2605.9454650878906,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3193d0af.6d5de8",
+    "id": "5cb60ec5.ffb7e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 6932.566665649414,
-    "y": 2628.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6874.566665649414,
+    "y": 2650.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "43c8a40f.539994",
+    "id": "4ee4ed66.f0512c",
     "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": 6572.566665649414,
-    "y": 2900.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6514.566665649414,
+    "y": 2922.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "b8201609.6ece6",
+    "id": "11738810.45add",
     "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": 6575.566665649414,
-    "y": 2945.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6517.566665649414,
+    "y": 2967.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "7bb73f8a.b1ab48",
+    "id": "90ca3b9e.d9782",
     "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": 6567.566665649414,
-    "y": 2699.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6509.566665649414,
+    "y": 2721.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "c917b2c2.68a8d",
+    "id": "99bc893b.a732e",
     "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": 6569.566665649414,
-    "y": 2746.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6511.566665649414,
+    "y": 2768.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "8bd704e.d0521f8",
+    "id": "ce999bfb.8752f",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 6488.566665649414,
-    "y": 2853.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6430.566665649414,
+    "y": 2875.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e06e4d85.94c0f8",
+    "id": "618f9b48.ad8ea4",
     "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": 4488.566909790039,
-    "y": 5246.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4430.566909790039,
+    "y": 5268.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ee345eb7.dd48b",
+    "id": "965aea89.b04fc8",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3753.566665649414,
-    "y": 5065.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3695.566665649414,
+    "y": 5087.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c561431f.f6e0f",
-        "49468e15.59ced"
+        "c53bf166.c2e718",
+        "936c4fdb.103588"
       ]
     ]
   },
   {
-    "id": "49468e15.59ced",
+    "id": "936c4fdb.103588",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3925.566665649414,
-    "y": 5062.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3867.566665649414,
+    "y": 5084.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "997265fa.7d7f1"
+        "8b1c5fc9.627c"
       ]
     ]
   },
   {
-    "id": "c561431f.f6e0f",
+    "id": "c53bf166.c2e718",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3877.566665649414,
-    "y": 5909.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3819.566665649414,
+    "y": 5931.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e1ebd454.f4cdb8"
+        "eab327e7.a5f748"
       ]
     ]
   },
   {
-    "id": "604349fc.e0a658",
+    "id": "3f493e72.b6d702",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3938.566665649414,
-    "y": 5032.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3880.566665649414,
+    "y": 5054.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8edd5f5.78488a",
+    "id": "4859c2db.d9b9e4",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3948.566665649414,
-    "y": 5867.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3890.566665649414,
+    "y": 5889.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a9eb431c.c27b3",
+    "id": "41693c79.da7d5c",
     "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": 6574.566665649414,
-    "y": 3079.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6516.566665649414,
+    "y": 3101.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "997265fa.7d7f1",
+    "id": "8b1c5fc9.627c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4101.566665649414,
-    "y": 5064.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4043.566665649414,
+    "y": 5086.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bcf60ed5.161338",
-        "8a063d24.55e818",
-        "27d5e3fa.d1fc64",
-        "eb431097.375ee8",
-        "146ee230.44ecc6",
-        "a86e4db4.94773",
-        "e06e4d85.94c0f8",
-        "b311bb82.023748",
-        "f2f4b1c2.9aee8"
+        "a815fc28.26a0f",
+        "8b2580e9.dc4908",
+        "63429691.f224b",
+        "2532ed2.07c3292",
+        "d070f297.71c91",
+        "d66ee6cb.59aee8",
+        "618f9b48.ad8ea4",
+        "4f6ebd11.7928d4",
+        "53cb53b2.198aa4"
       ]
     ]
   },
   {
-    "id": "5b2e4a79.26fcd4",
+    "id": "7eea77d.c16dd08",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5545.566421508789,
-    "y": 4989.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5487.566421508789,
+    "y": 5011.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bcf60ed5.161338",
+    "id": "a815fc28.26a0f",
     "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": 4347.566909790039,
-    "y": 5745.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4289.566909790039,
+    "y": 5767.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d81d981.8859c8",
+    "id": "632a01d1.5b8d1",
     "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": 6581.566665649414,
-    "y": 1995.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6523.566665649414,
+    "y": 2017.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "2ed6ffae.15a9",
+    "id": "5eff9d93.842974",
     "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": 6631.566665649414,
-    "y": 1698.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6573.566665649414,
+    "y": 1720.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "56d51e0c.3fbb48",
+    "id": "f08579e.3888c08",
     "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": 6578.566665649414,
-    "y": 1286.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6520.566665649414,
+    "y": 1308.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f1e4ada5.0d8a28",
+    "id": "c49cd07d.45dca",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 6526.566665649414,
-    "y": 1334.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6468.566665649414,
+    "y": 1356.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9aa0ecc9.b21a38",
+    "id": "64b31039.d88b18",
     "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": 6654.566665649414,
-    "y": 1381.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6596.566665649414,
+    "y": 1403.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "59c3b9a9.bee328",
+    "id": "6013e30e.dd851c",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 6491.566665649414,
-    "y": 1244.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6433.566665649414,
+    "y": 1266.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1d111c3e.37b394",
+    "id": "9f309da2.930198",
     "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`' />",
+    "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='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6488.566665649414,
-    "y": 1472.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6430.566665649414,
+    "y": 1494.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "b8b78e91.784a68",
+    "id": "bc5b333d.5b219",
     "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": 6581.566665649414,
-    "y": 1525.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6523.566665649414,
+    "y": 1547.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "b1590465.c06e9",
+    "id": "cdd019be.ce295",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 6472.566665649414,
-    "y": 1428.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6414.566665649414,
+    "y": 1450.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4fd8fae5.4af44c",
+    "id": "aeaa5a0f.0b3cf",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 6478.566665649414,
-    "y": 1878.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6420.566665649414,
+    "y": 1900.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "eb431097.375ee8",
+    "id": "2532ed2.07c3292",
     "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",
+    "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='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4414.566421508789,
-    "y": 4997.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4356.566421508789,
+    "y": 5019.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "111c6f80.d662f1",
+    "id": "3a34d279.a99216",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4398.566421508789,
-    "y": 4953.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4340.566421508789,
+    "y": 4975.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f6ae128e.43e818",
+    "id": "4c6450c4.cdb8b8",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5145.566421508789,
-    "y": 4984.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5087.566421508789,
+    "y": 5006.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "273e73f0.d7fa54",
+    "id": "d6b231ff.4e48",
     "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": 5232.566421508789,
-    "y": 5026.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5174.566421508789,
+    "y": 5048.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "78d97bc5.d96984",
+    "id": "e479d260.5097c",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 5180.566421508789,
-    "y": 5074.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5122.566421508789,
+    "y": 5096.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "464f510d.72c448",
+    "id": "c8a578a.1c83e08",
     "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": 5308.566421508789,
-    "y": 5121.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5250.566421508789,
+    "y": 5143.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a86e4db4.94773",
+    "id": "d66ee6cb.59aee8",
     "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": 4476.566909790039,
-    "y": 5288.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4418.566909790039,
+    "y": 5310.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "da1f3bba.7aa878",
+    "id": "85a1c373.0d0068",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4459.566909790039,
-    "y": 5350.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4401.566909790039,
+    "y": 5372.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8a063d24.55e818",
+    "id": "8b2580e9.dc4908",
     "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": 4570.566909790039,
-    "y": 5392.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4512.566909790039,
+    "y": 5414.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "cfd66aba.0bb4b",
+    "id": "2bc22db1.d483d2",
     "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": 5027.566421508789,
-    "y": 5563.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4969.566421508789,
+    "y": 5585.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d34f3733.82b438",
+    "id": "47c00ee.a0fdbf",
     "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": 4337.566421508789,
-    "y": 6261.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4279.566421508789,
+    "y": 6283.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a5e6b4f4.57a38",
+    "id": "afc7e373.9dd788",
     "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",
+    "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='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4270.566421508789,
-    "y": 6215.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4212.566421508789,
+    "y": 6237.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea2fb779.5cdf1",
+    "id": "13eeaed2.223169",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4219.566421508789,
-    "y": 6166.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4161.566421508789,
+    "y": 6188.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "cea8b041.47c29",
+    "id": "9fd3ad0c.c5f0a",
     "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": 5002.566665649414,
-    "y": 6372.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4944.566665649414,
+    "y": 6394.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "27d5e3fa.d1fc64",
+    "id": "63429691.f224b",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4397.566909790039,
-    "y": 5449.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4339.566909790039,
+    "y": 5471.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "76f33e89.9589e",
-        "2dcff9f1.2ed2e6"
+        "4766abce.851ac4",
+        "ca35b158.85d38"
       ]
     ]
   },
   {
-    "id": "76f33e89.9589e",
+    "id": "4766abce.851ac4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4608.566909790039,
-    "y": 5449.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4550.566909790039,
+    "y": 5471.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "53185310.1e3aac"
+        "2ab4c487.b40124"
       ]
     ]
   },
   {
-    "id": "53185310.1e3aac",
+    "id": "2ab4c487.b40124",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4764.566909790039,
-    "y": 5445.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4706.566909790039,
+    "y": 5467.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cfd66aba.0bb4b",
-        "d5527664.91c39",
-        "7871c32f.9d91cc"
+        "2bc22db1.d483d2",
+        "b27ea187.400a38",
+        "ca1c65a6.dca85"
       ]
     ]
   },
   {
-    "id": "2dcff9f1.2ed2e6",
+    "id": "ca35b158.85d38",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4604.566909790039,
-    "y": 5497.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4546.566909790039,
+    "y": 5519.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "74066864.f6923"
+        "e1bf2cff.d57f2"
       ]
     ]
   },
   {
-    "id": "74066864.f6923",
+    "id": "e1bf2cff.d57f2",
     "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": 4752.566909790039,
-    "y": 5492.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4694.566909790039,
+    "y": 5514.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3e678579.1103ca",
+    "id": "b408049f.7933a",
     "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": 5269.566421508789,
-    "y": 5192.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5211.566421508789,
+    "y": 5214.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "1902c403.6fb814",
+    "id": "4f8a0bf3.f76a6c",
     "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": 2436.566665649414,
-    "y": 151.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2378.566665649414,
+    "y": 173.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "b21e9d77.e0db",
+    "id": "6a76544b.f753cc",
     "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": 2370.566665649414,
-    "y": 187.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2312.566665649414,
+    "y": 209.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9b031e24.c71f38",
+    "id": "23b662d9.16701e",
     "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": 2555.566665649414,
-    "y": 114.28575134277344,
-    "z": "3edf77d7.add3c",
+    "x": 2497.566665649414,
+    "y": 136.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2b3dd3ef.75d514",
+    "id": "3d0b458a.f9a2a2",
     "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": 4304.566421508789,
-    "y": 6327.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4246.566421508789,
+    "y": 6349.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "44cea2e2.e10b04",
+    "id": "a3e7b437.8026b",
     "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": 4437.566421508789,
-    "y": 6375.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4379.566421508789,
+    "y": 6397.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "32da350f.e91202",
+    "id": "2ab2c1b2.c4462e",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4256.566421508789,
-    "y": 6433.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4198.566421508789,
+    "y": 6455.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5b9298a4.1ed118",
-        "7163c900.606df8"
+        "6310145f.4f2a84",
+        "deaf1bfa.406858"
       ]
     ]
   },
   {
-    "id": "5b9298a4.1ed118",
+    "id": "6310145f.4f2a84",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4449.566421508789,
-    "y": 6434.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4391.566421508789,
+    "y": 6456.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5b9bdf25.e9536"
+        "92986ec9.51c668"
       ]
     ]
   },
   {
-    "id": "5b9bdf25.e9536",
+    "id": "92986ec9.51c668",
     "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": 4605.566421508789,
-    "y": 6431.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4547.566421508789,
+    "y": 6453.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7163c900.606df8",
+    "id": "deaf1bfa.406858",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4453.566421508789,
-    "y": 6478.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4395.566421508789,
+    "y": 6500.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1fa38b13.5c2175"
+        "a4ec2716.41f19"
       ]
     ]
   },
   {
-    "id": "1fa38b13.5c2175",
+    "id": "a4ec2716.41f19",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4592.566421508789,
-    "y": 6473.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4534.566421508789,
+    "y": 6495.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "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"
+        "9fd3ad0c.c5f0a",
+        "4aae1198.db26d8",
+        "b8ff0583.7b229",
+        "35f40d66.777f92",
+        "4c2ed97e.80e7a8",
+        "1d9d64e4.a08beb",
+        "fb131710.b3fbe",
+        "fa9aa1ff.8bf6e",
+        "c8446998.29dfe",
+        "a215a7d6.657bc8",
+        "977f17a0.9f41a",
+        "5d58f01d.864e08",
+        "ecfaffd6.100b2"
       ]
     ]
   },
   {
-    "id": "2d523fb9.b5b8c8",
+    "id": "fb131710.b3fbe",
     "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": 4789.566421508789,
-    "y": 7152.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4731.566421508789,
+    "y": 7174.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "85a32ae2.fd7ca",
-        "2bd9412f.d2a736",
-        "14d3449f.8afb4b"
+        "cd8a8557.f7b3c8",
+        "49f465a0.b6d20c",
+        "5fdb4c32.46cfb4"
       ]
     ]
   },
   {
-    "id": "85a32ae2.fd7ca",
+    "id": "cd8a8557.f7b3c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4984.566635131836,
-    "y": 7128.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4926.566635131836,
+    "y": 7150.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "802d4aff.ed19c"
+        "7e4f80d.5c6488"
       ]
     ]
   },
   {
-    "id": "2bd9412f.d2a736",
+    "id": "49f465a0.b6d20c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4977.057601928711,
-    "y": 7164.859756469727,
-    "z": "3edf77d7.add3c",
+    "x": 4919.057601928711,
+    "y": 7186.659698486328,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1d4f1ec2.11c199"
+        "80117652.9958b8"
       ]
     ]
   },
   {
-    "id": "14d3449f.8afb4b",
+    "id": "5fdb4c32.46cfb4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4974.566635131836,
-    "y": 7208.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4916.566635131836,
+    "y": 7230.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1bbce323.6599c5"
+        "7193c18c.ae073"
       ]
     ]
   },
   {
-    "id": "802d4aff.ed19c",
+    "id": "7e4f80d.5c6488",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5156.566635131836,
-    "y": 7126.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 5098.566635131836,
+    "y": 7148.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "dd0eed5a.ced22"
+        "d9a6ee9f.5c31f8"
       ]
     ]
   },
   {
-    "id": "1d4f1ec2.11c199",
+    "id": "80117652.9958b8",
     "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": 5139.629013061523,
-    "y": 7165.145492553711,
-    "z": "3edf77d7.add3c",
+    "x": 5081.629013061523,
+    "y": 7186.9454345703125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1bbce323.6599c5",
+    "id": "7193c18c.ae073",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5141.566635131836,
-    "y": 7207.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 5083.566635131836,
+    "y": 7229.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "dd0eed5a.ced22",
+    "id": "d9a6ee9f.5c31f8",
     "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": 5397.566421508789,
-    "y": 7160.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5339.566421508789,
+    "y": 7182.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "315a5202.03b08e"
+        "9aea7b31.b501a8"
       ]
     ]
   },
   {
-    "id": "315a5202.03b08e",
+    "id": "9aea7b31.b501a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5634.566421508789,
-    "y": 7156.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5576.566421508789,
+    "y": 7178.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ffe78e55.58a2"
+        "686e53e3.1ad1dc"
       ]
     ]
   },
   {
-    "id": "406bc3a2.6f4c5c",
+    "id": "2df6b745.3fe8d",
     "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": 5901.566421508789,
-    "y": 7122.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5843.566421508789,
+    "y": 7144.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "efd6821.7606e8",
-        "dc64cef5.f4e71"
+        "3835a5ae.8b815a",
+        "a4db2f80.721418"
       ]
     ]
   },
   {
-    "id": "efd6821.7606e8",
+    "id": "3835a5ae.8b815a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6082.566421508789,
-    "y": 7148.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 6024.566421508789,
+    "y": 7170.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ffe78e55.58a2"
+        "686e53e3.1ad1dc"
       ]
     ]
   },
   {
-    "id": "dc64cef5.f4e71",
+    "id": "a4db2f80.721418",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6081.566421508789,
-    "y": 7101.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 6023.566421508789,
+    "y": 7123.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ffe78e55.58a2",
+    "id": "686e53e3.1ad1dc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4598.566635131836,
-    "y": 7296.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4540.566635131836,
+    "y": 7318.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b29b6e84.3ec808"
+        "a6487ee6.2cb7c"
       ]
     ]
   },
   {
-    "id": "aa51daf8.235328",
+    "id": "380ab70.5227a4a",
     "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": 5674.566421508789,
-    "y": 7328.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5616.566421508789,
+    "y": 7350.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3e921b26.a61a44",
+    "id": "a81b3e84.443f78",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4887.566635131836,
-    "y": 7064.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4829.566635131836,
+    "y": 7086.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "10882f4c.ff2cd1",
+    "id": "1d9d64e4.a08beb",
     "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": 4771.566421508789,
-    "y": 6948.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4713.566421508789,
+    "y": 6970.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "649ceff4.e9cc5",
+    "id": "b1c30fd3.1d3b28",
     "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": 5116.566421508789,
-    "y": 6779.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5058.566421508789,
+    "y": 6801.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b90f13f5.a31078"
+        "886001f.2b8eb8"
       ]
     ]
   },
   {
-    "id": "b90f13f5.a31078",
+    "id": "886001f.2b8eb8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5336.566421508789,
-    "y": 6785.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5278.566421508789,
+    "y": 6807.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4aedc9d4.9239e8"
+        "7a4c6acb.556084"
       ]
     ]
   },
   {
-    "id": "4aedc9d4.9239e8",
+    "id": "7a4c6acb.556084",
     "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": 5521.566421508789,
-    "y": 6784.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5463.566421508789,
+    "y": 6806.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8b4beaf0.bd49c8"
+        "801921d3.c16518"
       ]
     ]
   },
   {
-    "id": "8b4beaf0.bd49c8",
+    "id": "801921d3.c16518",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5713.566421508789,
-    "y": 6787.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5655.566421508789,
+    "y": 6809.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "67fe9740.178f68"
+        "a260b342.bdfc38"
       ]
     ]
   },
   {
-    "id": "67fe9740.178f68",
+    "id": "a260b342.bdfc38",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5922.566421508789,
-    "y": 6785.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5864.566421508789,
+    "y": 6807.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "54f95ba1.fd5b14",
+    "id": "fa9aa1ff.8bf6e",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4823.566421508789,
-    "y": 6773.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4765.566421508789,
+    "y": 6795.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "649ceff4.e9cc5"
+        "b1c30fd3.1d3b28"
       ]
     ]
   },
   {
-    "id": "bec4134.89e1d7",
+    "id": "b8ff0583.7b229",
     "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": 4831.566421508789,
-    "y": 6666.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4773.566421508789,
+    "y": 6688.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "88715119.2c7c68",
-        "d632295f.b3442",
-        "973f1048.6edbb"
+        "be4d0129.981f9",
+        "ca7acc4e.a2f178",
+        "e6834a18.c1bb18"
       ]
     ]
   },
   {
-    "id": "88715119.2c7c68",
+    "id": "be4d0129.981f9",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5067.566421508789,
-    "y": 6649.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5009.566421508789,
+    "y": 6671.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "d632295f.b3442",
+    "id": "ca7acc4e.a2f178",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5064.566421508789,
-    "y": 6690.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5006.566421508789,
+    "y": 6712.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "973f1048.6edbb",
+    "id": "e6834a18.c1bb18",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5078.566421508789,
-    "y": 6730.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5020.566421508789,
+    "y": 6752.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "93569c40.48d5d8",
+    "id": "35f40d66.777f92",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4767.566421508789,
-    "y": 6825.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4709.566421508789,
+    "y": 6847.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "21f4d700.883112",
+    "id": "4c2ed97e.80e7a8",
     "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": 4775.566421508789,
-    "y": 6883.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4717.566421508789,
+    "y": 6905.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ab589b66.44dca",
+    "id": "4aae1198.db26d8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4780.566421508789,
-    "y": 6623.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4722.566421508789,
+    "y": 6645.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9ae90ae.274be78",
+    "id": "3d77fed3.ca6eba",
     "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": 4895.566421508789,
-    "y": 6575.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4837.566421508789,
+    "y": 6597.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b29b6e84.3ec808",
+    "id": "a6487ee6.2cb7c",
     "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": 4888.566635131836,
-    "y": 7291.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4830.566635131836,
+    "y": 7313.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ce3c2be3.503e38",
-        "f854c5fa.9550e8"
+        "ae63bb37.54dac",
+        "b4511f5d.149aa8"
       ]
     ]
   },
   {
-    "id": "ce3c2be3.503e38",
+    "id": "ae63bb37.54dac",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5144.566635131836,
-    "y": 7263.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 5086.566635131836,
+    "y": 7285.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "eb8749e3.22de7"
+        "81398bf4.473028"
       ]
     ]
   },
   {
-    "id": "f854c5fa.9550e8",
+    "id": "b4511f5d.149aa8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5144.566635131836,
-    "y": 7312.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 5086.566635131836,
+    "y": 7334.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "268cfed4.3ed072",
+    "id": "7de65a32.2588c4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5410.566635131836,
-    "y": 7304.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 5352.566635131836,
+    "y": 7326.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "acce766e.9c38a",
-        "aa51daf8.235328",
-        "f459d871.345a18"
+        "f817cc8b.d031a",
+        "380ab70.5227a4a",
+        "c6c09e71.9092c"
       ]
     ]
   },
   {
-    "id": "2f1cf9f0.50adbe",
+    "id": "1d61af20.5c7829",
     "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": 5802.566421508789,
-    "y": 7382.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5744.566421508789,
+    "y": 7404.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f459d871.345a18",
+    "id": "c6c09e71.9092c",
     "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": 5772.566421508789,
-    "y": 7442.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5714.566421508789,
+    "y": 7464.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "acce766e.9c38a",
+    "id": "f817cc8b.d031a",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5679.566421508789,
-    "y": 7270.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5621.566421508789,
+    "y": 7292.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e1ebd454.f4cdb8",
+    "id": "eab327e7.a5f748",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4029.566665649414,
-    "y": 5908.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3971.566665649414,
+    "y": 5930.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a5e6b4f4.57a38",
-        "2b3dd3ef.75d514",
-        "44cea2e2.e10b04",
-        "32da350f.e91202",
-        "d34f3733.82b438"
+        "afc7e373.9dd788",
+        "3d0b458a.f9a2a2",
+        "a3e7b437.8026b",
+        "2ab2c1b2.c4462e",
+        "47c00ee.a0fdbf"
       ]
     ]
   },
   {
-    "id": "6a9fab50.2b8dbc",
+    "id": "b8d2a9f2.b00c88",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4772.566421508789,
-    "y": 6723.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4714.566421508789,
+    "y": 6745.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b2a13863.b94908",
+    "id": "c8446998.29dfe",
     "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": 4895.566665649414,
-    "y": 6453.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4837.566665649414,
+    "y": 6475.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "eedbe7ee.2e17",
+    "id": "13d35835.cdbb2",
     "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": 5032.566665649414,
-    "y": 6403.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4974.566665649414,
+    "y": 6425.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6d3e15fd.90249c",
+    "id": "997f20e4.966598",
     "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",
+    "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='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6494.566665649414,
-    "y": 1937.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6436.566665649414,
+    "y": 1959.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "74dbf9c4.a2cac",
+    "id": "5c8518bd.0a436",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3760.566665649414,
-    "y": 1331.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3702.566665649414,
+    "y": 1353.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "691659c.355b428",
+    "id": "53a463ea.1b0834",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3898.566665649414,
-    "y": 1819.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3840.566665649414,
+    "y": 1841.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b49b44ed.34c0f",
+    "id": "53592f4d.08ea8",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 6455.566665649414,
-    "y": 2649.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 6397.566665649414,
+    "y": 2671.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "78110e1d.34a828",
+    "id": "f18404c6.f7135",
     "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": 3747.566665649414,
-    "y": 4925.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3689.566665649414,
+    "y": 4947.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "399c8052.14794",
+    "id": "e65dde18.8f2e28",
     "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": 3880.566665649414,
-    "y": 4973.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3822.566665649414,
+    "y": 4995.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "146ee230.44ecc6",
+    "id": "d070f297.71c91",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4425.566421508789,
-    "y": 5053.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4367.566421508789,
+    "y": 5075.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "939f1799.36d378",
-        "a646c5c3.cf3a8"
+        "dbaff1f0.67394",
+        "46c5a5e9.bca6a4"
       ]
     ]
   },
   {
-    "id": "939f1799.36d378",
+    "id": "dbaff1f0.67394",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4618.566421508789,
-    "y": 5054.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4560.566421508789,
+    "y": 5076.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bace55c5.99f12"
+        "df79a6f0.9fe378"
       ]
     ]
   },
   {
-    "id": "a646c5c3.cf3a8",
+    "id": "46c5a5e9.bca6a4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4622.566421508789,
-    "y": 5098.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4564.566421508789,
+    "y": 5120.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4039180c.15981"
+        "6414d7e3.ee4fd8"
       ]
     ]
   },
   {
-    "id": "4039180c.15981",
+    "id": "6414d7e3.ee4fd8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4761.566421508789,
-    "y": 5093.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4703.566421508789,
+    "y": 5115.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7ef13e15.cc2028",
-        "de57bd6c.da094",
-        "2e1e6c02.39beec"
+        "49c135f9.c35534",
+        "bf0f6300.a67238",
+        "fa0dda8.0253328"
       ]
     ]
   },
   {
-    "id": "bace55c5.99f12",
+    "id": "df79a6f0.9fe378",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4761.566421508789,
-    "y": 5050.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 4703.566421508789,
+    "y": 5072.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "273e73f0.d7fa54",
-        "78d97bc5.d96984",
-        "464f510d.72c448",
-        "3e678579.1103ca"
+        "d6b231ff.4e48",
+        "e479d260.5097c",
+        "c8a578a.1c83e08",
+        "b408049f.7933a"
       ]
     ]
   },
   {
-    "id": "7ef13e15.cc2028",
+    "id": "49c135f9.c35534",
     "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": 5155.566421508789,
-    "y": 5344.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5097.566421508789,
+    "y": 5366.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e4f0f550.01eee8",
+    "id": "f2d57861.b7d18",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5162.566421508789,
-    "y": 5298.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5104.566421508789,
+    "y": 5320.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8b96c2fb.4933a8",
+    "id": "a215a7d6.657bc8",
     "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": 4952.566635131836,
-    "y": 7013.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4894.566635131836,
+    "y": 7035.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "de57bd6c.da094",
+    "id": "bf0f6300.a67238",
     "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": 5274.566421508789,
-    "y": 5397.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5216.566421508789,
+    "y": 5419.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "d5527664.91c39",
+    "id": "b27ea187.400a38",
     "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": 5156.566421508789,
-    "y": 5615.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 5098.566421508789,
+    "y": 5637.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9e36b46b.83aaa",
+    "id": "737e14df.0bf7ac",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3702.566665649414,
-    "y": 4374.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3644.566665649414,
+    "y": 4396.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "dba3b4ab.601e58",
+    "id": "fe6ea6fb.83ee2",
     "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": 4036.566665649414,
-    "y": 4557.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3978.566665649414,
+    "y": 4579.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "7855b68f.e847e",
+    "id": "1e648504.a919f3",
     "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": 3648.566665649414,
-    "y": 4424.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3590.566665649414,
+    "y": 4446.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "27b19c0a.0b96bc",
-        "3755d72e.8ad5d8",
-        "e7a32b57.4d11"
+        "dc9ef631.89f33",
+        "9e45960a.d8b928",
+        "febbc6eb.2448e"
       ]
     ]
   },
   {
-    "id": "3755d72e.8ad5d8",
+    "id": "9e45960a.d8b928",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3876.057632446289,
-    "y": 4396.859725952148,
-    "z": "3edf77d7.add3c",
+    "x": 3818.057632446289,
+    "y": 4418.65966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8db24f9.ca62db"
+        "5d25632c.1d5374"
       ]
     ]
   },
   {
-    "id": "e7a32b57.4d11",
+    "id": "febbc6eb.2448e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3871.566665649414,
-    "y": 4441.285690307617,
-    "z": "3edf77d7.add3c",
+    "x": 3813.566665649414,
+    "y": 4463.085632324219,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c7878375.542c6"
+        "e99a952e.00d7c"
       ]
     ]
   },
   {
-    "id": "8db24f9.ca62db",
+    "id": "5d25632c.1d5374",
     "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": 4038.629165649414,
-    "y": 4396.145431518555,
-    "z": "3edf77d7.add3c",
+    "x": 3980.629165649414,
+    "y": 4417.945373535156,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c7878375.542c6",
+    "id": "e99a952e.00d7c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4039.566665649414,
-    "y": 4441.285690307617,
-    "z": "3edf77d7.add3c",
+    "x": 3981.566665649414,
+    "y": 4463.085632324219,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "32e0d279.a6eca6",
+    "id": "1d77f10f.5baf67",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3824.566665649414,
-    "y": 4514.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3766.566665649414,
+    "y": 4536.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a8a8e968.d6c638",
-        "dba3b4ab.601e58"
+        "35c9f98a.610e5e",
+        "fe6ea6fb.83ee2"
       ]
     ]
   },
   {
-    "id": "27b19c0a.0b96bc",
+    "id": "dc9ef631.89f33",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3655.566665649414,
-    "y": 4514.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3597.566665649414,
+    "y": 4536.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "32e0d279.a6eca6"
+        "1d77f10f.5baf67"
       ]
     ]
   },
   {
-    "id": "a8a8e968.d6c638",
+    "id": "35c9f98a.610e5e",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4013.566665649414,
-    "y": 4506.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3955.566665649414,
+    "y": 4528.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7a90992b.99ef7",
+    "id": "518cc181.03ac48",
     "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": 3855.566665649414,
-    "y": 4801.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3797.566665649414,
+    "y": 4823.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "258c7b31.2a3584",
+    "id": "5a5e18e8.ffce08",
     "type": "comment",
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",
     "info": "",
     "comments": "",
-    "x": 3638.566665649414,
-    "y": 2884.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3580.566665649414,
+    "y": 2906.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5517fa40.8d63c4",
+    "id": "47f11a92.b8ee4c",
     "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": 2843.566665649414,
-    "y": 4446.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 2785.566665649414,
+    "y": 4468.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "872d6ff1.04a5b8",
+    "id": "a9808de.46ae97",
     "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": 3266.566665649414,
-    "y": 4719.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3208.566665649414,
+    "y": 4741.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "99cdf1e3.76daa8",
-        "8ce192f6.43321"
+        "8236161f.361ec",
+        "f42c8ef.5dab47"
       ]
     ]
   },
   {
-    "id": "f3de805.eee03",
+    "id": "89fb91c7.4bd6f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3098.566665649414,
-    "y": 4722.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3040.566665649414,
+    "y": 4744.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "872d6ff1.04a5b8"
+        "a9808de.46ae97"
       ]
     ]
   },
   {
-    "id": "8ce192f6.43321",
+    "id": "f42c8ef.5dab47",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3429.566665649414,
-    "y": 4738.285751342773,
-    "z": "3edf77d7.add3c",
+    "x": 3371.566665649414,
+    "y": 4760.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e429a394.1622b"
+        "10e6ecec.11b933"
       ]
     ]
   },
   {
-    "id": "99cdf1e3.76daa8",
+    "id": "8236161f.361ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3465.566665649414,
-    "y": 3345.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3407.566665649414,
+    "y": 3367.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "45ad7f75.acf2c"
+        "ac1b2d90.391b98"
       ]
     ]
   },
   {
-    "id": "894a7fb9.0e7198",
+    "id": "f9e3f20c.6b5eb8",
     "type": "switchNode",
     "name": "switch leafuni.data-source == gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3814.566665649414,
-    "y": 3187.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3756.566665649414,
+    "y": 3209.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fc9baa20.3cffe",
-        "9e39c7e6.dd8a38"
+        "872bd81a.d26528",
+        "9b2249c8.bc9018"
       ]
     ]
   },
   {
-    "id": "fc9baa20.3cffe",
+    "id": "872bd81a.d26528",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4019.566665649414,
-    "y": 3183.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3961.566665649414,
+    "y": 3205.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9e39c7e6.dd8a38",
+    "id": "9b2249c8.bc9018",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4021.566665649414,
-    "y": 3233.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3963.566665649414,
+    "y": 3255.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d198772b.5f2b"
+        "dff51b02.8733d8"
       ]
     ]
   },
   {
-    "id": "d198772b.5f2b",
+    "id": "dff51b02.8733d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4177.566665649414,
-    "y": 3239.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4119.566665649414,
+    "y": 3261.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "23f5cc1d.41fbe4",
-        "fed6a907.2b3e28",
-        "fdf1da6c.032aa",
-        "51c677f3.cc82f"
+        "5f4129be.00541",
+        "7f1b37a2.172688",
+        "71ab4f0e.2a007",
+        "8aeeffc.718ae8"
       ]
     ]
   },
   {
-    "id": "23f5cc1d.41fbe4",
+    "id": "5f4129be.00541",
     "type": "set",
     "name": "set bwModified",
     "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 4403.566909790039,
-    "y": 2980.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4345.566909790039,
+    "y": 3002.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "84e42d5e.8f28b8",
+    "id": "d8ea64.968cf5a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4902.566390991211,
-    "y": 4277.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4844.566390991211,
+    "y": 4299.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7591914.05111f",
-        "4f3fe980.0cfee8"
+        "140b25e4.abc76a",
+        "c4a242e7.6ad35"
       ]
     ]
   },
   {
-    "id": "4f3fe980.0cfee8",
+    "id": "c4a242e7.6ad35",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5104.566146850586,
-    "y": 4244.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 5046.566146850586,
+    "y": 4266.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7cabc91f.298798",
+    "id": "f3c554f9.aa8de8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4788.566635131836,
-    "y": 4454.28547668457,
-    "z": "3edf77d7.add3c",
+    "x": 4730.566635131836,
+    "y": 4476.085418701172,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6e8a6a19.d50624",
+    "id": "a2deddc2.51b4b8",
     "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": 4785.628768920898,
-    "y": 4403.145492553711,
-    "z": "3edf77d7.add3c",
+    "x": 4727.628768920898,
+    "y": 4424.9454345703125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "83166069.2f46b",
+    "id": "2a1af9c0.1651de",
     "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": 4368.566390991211,
-    "y": 4277.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4310.566390991211,
+    "y": 4299.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b23ac34.b9f8bc"
+        "6645febe.81a0d"
       ]
     ]
   },
   {
-    "id": "b23ac34.b9f8bc",
+    "id": "6645febe.81a0d",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4573.566390991211,
-    "y": 4277.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4515.566390991211,
+    "y": 4299.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "37a61cf7.b75674"
+        "1ad63798.bccb8"
       ]
     ]
   },
   {
-    "id": "37a61cf7.b75674",
+    "id": "1ad63798.bccb8",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4739.566390991211,
-    "y": 4277.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4681.566390991211,
+    "y": 4299.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "84e42d5e.8f28b8"
+        "d8ea64.968cf5a"
       ]
     ]
   },
   {
-    "id": "7591914.05111f",
+    "id": "140b25e4.abc76a",
     "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": 4411.566390991211,
-    "y": 4355.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4353.566390991211,
+    "y": 4377.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4b066055.dca1d",
-        "4c3bb63f.abb268",
-        "afaed0ec.37401"
+        "d5aa2b23.abf14",
+        "b25d8065.0eeb5",
+        "2e5be567.2683ca"
       ]
     ]
   },
   {
-    "id": "4b066055.dca1d",
+    "id": "d5aa2b23.abf14",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4622.566390991211,
-    "y": 4357.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4564.566390991211,
+    "y": 4379.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7a2986e1.36d518"
+        "dbaf0410.536798"
       ]
     ]
   },
   {
-    "id": "4c3bb63f.abb268",
+    "id": "b25d8065.0eeb5",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4623.057357788086,
-    "y": 4402.859756469727,
-    "z": "3edf77d7.add3c",
+    "x": 4565.057357788086,
+    "y": 4424.659698486328,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6e8a6a19.d50624"
+        "a2deddc2.51b4b8"
       ]
     ]
   },
   {
-    "id": "afaed0ec.37401",
+    "id": "2e5be567.2683ca",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620.566390991211,
-    "y": 4446.285720825195,
-    "z": "3edf77d7.add3c",
+    "x": 4562.566390991211,
+    "y": 4468.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7cabc91f.298798"
+        "f3c554f9.aa8de8"
       ]
     ]
   },
   {
-    "id": "45ad7f75.acf2c",
+    "id": "ac1b2d90.391b98",
     "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": 3688.566665649414,
-    "y": 3030.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3630.566665649414,
+    "y": 3052.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "77412c28.93cabc",
-        "a9cae5b1.bd79",
-        "fb412e94.ff6ef8"
+        "518020a8.e5908",
+        "2f37bf62.6d766",
+        "1d68f74a.0ce429"
       ]
     ]
   },
   {
-    "id": "a9cae5b1.bd79",
+    "id": "2f37bf62.6d766",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3916.057632446289,
-    "y": 3002.8597259521484,
-    "z": "3edf77d7.add3c",
+    "x": 3858.057632446289,
+    "y": 3024.65966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a9cc314f.91999"
+        "a23311e6.197e98"
       ]
     ]
   },
   {
-    "id": "fb412e94.ff6ef8",
+    "id": "1d68f74a.0ce429",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3911.566665649414,
-    "y": 3047.285690307617,
-    "z": "3edf77d7.add3c",
+    "x": 3853.566665649414,
+    "y": 3069.0856323242188,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7c451252.08c29c"
+        "1f7edc05.06419c"
       ]
     ]
   },
   {
-    "id": "a9cc314f.91999",
+    "id": "a23311e6.197e98",
     "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": 4078.629165649414,
-    "y": 3002.1454315185547,
-    "z": "3edf77d7.add3c",
+    "x": 4020.629165649414,
+    "y": 3023.9453735351562,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7c451252.08c29c",
+    "id": "1f7edc05.06419c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4079.566665649414,
-    "y": 3047.285690307617,
-    "z": "3edf77d7.add3c",
+    "x": 4021.566665649414,
+    "y": 3069.0856323242188,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "77412c28.93cabc",
+    "id": "518020a8.e5908",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3923.566665649414,
-    "y": 3097.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3865.566665649414,
+    "y": 3119.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "894a7fb9.0e7198"
+        "f9e3f20c.6b5eb8"
       ]
     ]
   },
   {
-    "id": "22440324.4f2fcc",
+    "id": "3597d7fb.9d9fd",
     "type": "comment",
     "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",
     "info": "",
     "comments": "",
-    "x": 3813.449996948242,
-    "y": 3288.1690826416016,
-    "z": "3edf77d7.add3c",
+    "x": 3755.449996948242,
+    "y": 3309.969024658203,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e0dae0e2.18c628",
+    "id": "8b55165.21410e8",
     "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": 3795.166763305664,
-    "y": 3849.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 3737.166763305664,
+    "y": 3871.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6f17d5e2.9b03b4",
+    "id": "d35d1b04.286b5",
     "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": 3933.166763305664,
-    "y": 3907.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 3875.166763305664,
+    "y": 3929.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "fed6a907.2b3e28",
+    "id": "7f1b37a2.172688",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3511.166763305664,
-    "y": 3589.3690032958984,
-    "z": "3edf77d7.add3c",
+    "x": 3453.166763305664,
+    "y": 3611.1689453125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "db019ae8.f69e68",
-        "cb5f4cbc.1262b8",
-        "ca40fb3f.0ddd08"
+        "2d37a713.1c4278",
+        "c7b27212.2f5b88",
+        "aaa5f9ec.d9ed6"
       ]
     ]
   },
   {
-    "id": "a1e56d0c.c484e8",
+    "id": "26c98beb.9e8714",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3752.166763305664,
-    "y": 4017.7691497802734,
-    "z": "3edf77d7.add3c",
+    "x": 3694.166763305664,
+    "y": 4039.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "25e879f6.3e709e",
-        "8478688.57aab18"
+        "757df358.1ab404",
+        "46ca33dc.1a72ec"
       ]
     ]
   },
   {
-    "id": "25e879f6.3e709e",
+    "id": "757df358.1ab404",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3945.166763305664,
-    "y": 4018.7691497802734,
-    "z": "3edf77d7.add3c",
+    "x": 3887.166763305664,
+    "y": 4040.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2c016cde.6263ac"
+        "43e4ef70.2c83f"
       ]
     ]
   },
   {
-    "id": "8478688.57aab18",
+    "id": "46ca33dc.1a72ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3949.166763305664,
-    "y": 4062.7691497802734,
-    "z": "3edf77d7.add3c",
+    "x": 3891.166763305664,
+    "y": 4084.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f613ca73.1c6bb8"
+        "7ecc7e99.a8f718"
       ]
     ]
   },
   {
-    "id": "f613ca73.1c6bb8",
+    "id": "7ecc7e99.a8f718",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4088.166763305664,
-    "y": 4057.7691497802734,
-    "z": "3edf77d7.add3c",
+    "x": 4030.166763305664,
+    "y": 4079.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "83166069.2f46b"
+        "2a1af9c0.1651de"
       ]
     ]
   },
   {
-    "id": "2c016cde.6263ac",
+    "id": "43e4ef70.2c83f",
     "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": 4089.166763305664,
-    "y": 4014.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 4031.166763305664,
+    "y": 4036.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fdf1da6c.032aa",
+    "id": "71ab4f0e.2a007",
     "type": "switchNode",
     "name": "switch leafuni.data-source > gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4437.283706665039,
-    "y": 3236.5691986083984,
-    "z": "3edf77d7.add3c",
+    "x": 4379.283706665039,
+    "y": 3258.369140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "624fa50f.6c863c",
-        "2cbb1141.892c6e"
+        "e5e20266.b6ad18",
+        "fa7ec0d3.484e4"
       ]
     ]
   },
   {
-    "id": "624fa50f.6c863c",
+    "id": "e5e20266.b6ad18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4636.450698852539,
-    "y": 3303.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 4578.450698852539,
+    "y": 3324.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "dec3e17a.4aeb5"
+        "c400bc3c.ac5968"
       ]
     ]
   },
   {
-    "id": "2cbb1141.892c6e",
+    "id": "fa7ec0d3.484e4",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4658.450698852539,
-    "y": 3148.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 4600.450698852539,
+    "y": 3169.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "591bc18f.862f3"
+        "f79a9470.53a4c8"
       ]
     ]
   },
   {
-    "id": "51c677f3.cc82f",
+    "id": "8aeeffc.718ae8",
     "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",
+    "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='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4436.283706665039,
-    "y": 3091.7691497802734,
-    "z": "3edf77d7.add3c",
+    "x": 4378.283706665039,
+    "y": 3113.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "84a6fa88.639cd8",
+    "id": "b6c5ddb8.eb856",
     "type": "comment",
     "name": "update LEAF UNI with the new bw",
     "info": "",
     "comments": "",
-    "x": 4452.450698852539,
-    "y": 3045.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 4394.450698852539,
+    "y": 3066.968994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "281d0553.9e5102",
+    "id": "ab07d3e7.b0f788",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5007.216567993164,
-    "y": 2500.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 4949.216567993164,
+    "y": 2521.968994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e4f725a7.1779b8",
+    "id": "6a6aa672.a79588",
     "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": 5609.216567993164,
-    "y": 2605.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5551.216567993164,
+    "y": 2626.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e1b1c4e.72c2bc",
+    "id": "cbbe95bb.3b672",
     "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": 4999.216323852539,
-    "y": 2546.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 4941.216323852539,
+    "y": 2567.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d8429e74.2e1a2",
-        "e4667648.c01938",
-        "4ea5d18f.5a2f38"
+        "29f0d39b.7868dc",
+        "a9cdc9f3.565c48",
+        "bb4a2538.1336f8"
       ]
     ]
   },
   {
-    "id": "e4667648.c01938",
+    "id": "a9cdc9f3.565c48",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5226.707290649414,
-    "y": 2518.7430267333984,
-    "z": "3edf77d7.add3c",
+    "x": 5168.707290649414,
+    "y": 2540.54296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1f89164b.95601a"
+        "1908939b.bd4034"
       ]
     ]
   },
   {
-    "id": "4ea5d18f.5a2f38",
+    "id": "bb4a2538.1336f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5222.216323852539,
-    "y": 2563.168991088867,
-    "z": "3edf77d7.add3c",
+    "x": 5164.216323852539,
+    "y": 2584.9689331054688,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "88705cd9.03d55"
+        "92667393.c53a48"
       ]
     ]
   },
   {
-    "id": "1f89164b.95601a",
+    "id": "1908939b.bd4034",
     "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": 5389.278823852539,
-    "y": 2518.0287322998047,
-    "z": "3edf77d7.add3c",
+    "x": 5331.278823852539,
+    "y": 2539.8286743164062,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "88705cd9.03d55",
+    "id": "92667393.c53a48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5390.216323852539,
-    "y": 2563.168991088867,
-    "z": "3edf77d7.add3c",
+    "x": 5332.216323852539,
+    "y": 2584.9689331054688,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2e8d1bdd.85c644",
+    "id": "881aa049.c716c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5387.216323852539,
-    "y": 2613.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5329.216323852539,
+    "y": 2634.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f78dc911.45f94",
-        "e4f725a7.1779b8"
+        "462dc669.256da8",
+        "6a6aa672.a79588"
       ]
     ]
   },
   {
-    "id": "d8429e74.2e1a2",
+    "id": "29f0d39b.7868dc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5218.216323852539,
-    "y": 2613.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5160.216323852539,
+    "y": 2634.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2e8d1bdd.85c644"
+        "881aa049.c716c"
       ]
     ]
   },
   {
-    "id": "f78dc911.45f94",
+    "id": "462dc669.256da8",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",
     "comments": "",
-    "x": 5569.217056274414,
-    "y": 2555.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5511.217056274414,
+    "y": 2576.968994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d33826b1.ef8f58",
+    "id": "cf90a66f.fda158",
     "type": "comment",
     "name": "bw+ has increased ",
     "info": "",
     "comments": "",
-    "x": 4650.449996948242,
-    "y": 3110.1690826416016,
-    "z": "3edf77d7.add3c",
+    "x": 4592.449996948242,
+    "y": 3131.969024658203,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "84f3d20e.4f91a8",
+    "id": "55a0d7dc.286418",
     "type": "comment",
     "name": "bw- has decreased",
     "info": "",
     "comments": "",
-    "x": 4649.283706665039,
-    "y": 3266.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 4591.283706665039,
+    "y": 3288.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "48adb9de.8dd8c8",
+    "id": "4d5920d6.13a668",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5098.282974243164,
-    "y": 2839.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 5040.282974243164,
+    "y": 2861.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ccc0529e.d89b08",
+    "id": "88d6c65c.cf7f08",
     "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": 5700.282974243164,
-    "y": 2944.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 5642.282974243164,
+    "y": 2966.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "337b01b3.8933a6",
+    "id": "d0b2cf41.bca298",
     "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": 5090.282730102539,
-    "y": 2885.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 5032.282730102539,
+    "y": 2907.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "799a0808.a03288",
-        "b771a02d.8b4ba",
-        "6a9817e4.946118"
+        "8d492b8.9c23958",
+        "7af8c9ac.4fdff",
+        "8f5e4c1.c47c63"
       ]
     ]
   },
   {
-    "id": "b771a02d.8b4ba",
+    "id": "7af8c9ac.4fdff",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5317.773696899414,
-    "y": 2858.5430755615234,
-    "z": "3edf77d7.add3c",
+    "x": 5259.773696899414,
+    "y": 2880.343017578125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6b02c11a.d4f898"
+        "a556ac9c.f99378"
       ]
     ]
   },
   {
-    "id": "6a9817e4.946118",
+    "id": "8f5e4c1.c47c63",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5313.282730102539,
-    "y": 2902.969039916992,
-    "z": "3edf77d7.add3c",
+    "x": 5255.282730102539,
+    "y": 2924.7689819335938,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "130a98d8.a059e7"
+        "fb5f5c18.d85868"
       ]
     ]
   },
   {
-    "id": "6b02c11a.d4f898",
+    "id": "a556ac9c.f99378",
     "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": 5480.345230102539,
-    "y": 2857.8287811279297,
-    "z": "3edf77d7.add3c",
+    "x": 5422.345230102539,
+    "y": 2879.6287231445312,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "130a98d8.a059e7",
+    "id": "fb5f5c18.d85868",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5481.282730102539,
-    "y": 2902.969039916992,
-    "z": "3edf77d7.add3c",
+    "x": 5423.282730102539,
+    "y": 2924.7689819335938,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ff63a7c4.86cf08",
+    "id": "1055bce3.28f203",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5478.282730102539,
-    "y": 2952.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 5420.282730102539,
+    "y": 2974.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "871b9cd5.ec522",
-        "ccc0529e.d89b08"
+        "67fafdaf.ff6be4",
+        "88d6c65c.cf7f08"
       ]
     ]
   },
   {
-    "id": "799a0808.a03288",
+    "id": "8d492b8.9c23958",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5309.282730102539,
-    "y": 2952.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 5251.282730102539,
+    "y": 2974.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ff63a7c4.86cf08"
+        "1055bce3.28f203"
       ]
     ]
   },
   {
-    "id": "871b9cd5.ec522",
+    "id": "67fafdaf.ff6be4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",
     "comments": "",
-    "x": 5660.283462524414,
-    "y": 2894.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 5602.283462524414,
+    "y": 2916.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "dce7c6b5.af48e",
+    "id": "16d60a9.8d32af5",
     "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": 5015.282730102539,
-    "y": 2798.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 4957.282730102539,
+    "y": 2820.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "dec3e17a.4aeb5",
+    "id": "c400bc3c.ac5968",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4808.449996948242,
-    "y": 3292.1690826416016,
-    "z": "3edf77d7.add3c",
+    "x": 4750.449996948242,
+    "y": 3313.969024658203,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "dce7c6b5.af48e",
-        "337b01b3.8933a6",
-        "9c79a60.2e838d8"
+        "16d60a9.8d32af5",
+        "d0b2cf41.bca298",
+        "8414e4a1.38b9c8"
       ]
     ]
   },
   {
-    "id": "591bc18f.862f3",
+    "id": "f79a9470.53a4c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4829.183364868164,
-    "y": 3118.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 4771.183364868164,
+    "y": 3140.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c0c09747.1b1be",
-        "1e1b1c4e.72c2bc",
-        "615783e8.7114bc"
+        "117ea4ef.18b79b",
+        "cbbe95bb.3b672",
+        "ba199ac4.fb848"
       ]
     ]
   },
   {
-    "id": "c0c09747.1b1be",
+    "id": "117ea4ef.18b79b",
     "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": 4964.016128540039,
-    "y": 2424.7691497802734,
-    "z": "3edf77d7.add3c",
+    "x": 4906.016128540039,
+    "y": 2446.569091796875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1fd4804f.571bd8",
+    "id": "c54ad09e.8bf3a",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4423.333267211914,
-    "y": 3191.9691009521484,
-    "z": "3edf77d7.add3c",
+    "x": 4365.333267211914,
+    "y": 3213.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "793c3d11.91f2fc",
+    "id": "2dd0c0ce.4b6dd8",
     "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": 3892.666732788086,
-    "y": 4180.769607543945,
-    "z": "3edf77d7.add3c",
+    "x": 3834.666732788086,
+    "y": 4202.569549560547,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "334968de.3ae5d",
+    "id": "f75e3970.5d2918",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3727.666732788086,
-    "y": 4252.96955871582,
-    "z": "3edf77d7.add3c",
+    "x": 3669.666732788086,
+    "y": 4274.769500732422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "420a91d4.f005f",
-        "9e2d332a.723078"
+        "6558c3a1.aee6ec",
+        "615d888.e8de878"
       ]
     ]
   },
   {
-    "id": "420a91d4.f005f",
+    "id": "6558c3a1.aee6ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3938.666732788086,
-    "y": 4252.96955871582,
-    "z": "3edf77d7.add3c",
+    "x": 3880.666732788086,
+    "y": 4274.769500732422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "692a8c7a.fda954"
+        "dbe2bb07.4ff"
       ]
     ]
   },
   {
-    "id": "9e2d332a.723078",
+    "id": "615d888.e8de878",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3934.666732788086,
-    "y": 4300.96955871582,
-    "z": "3edf77d7.add3c",
+    "x": 3876.666732788086,
+    "y": 4322.769500732422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6695c568.10d40c"
+        "981910a2.c0ad4"
       ]
     ]
   },
   {
-    "id": "692a8c7a.fda954",
+    "id": "dbe2bb07.4ff",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4094.666732788086,
-    "y": 4248.96955871582,
-    "z": "3edf77d7.add3c",
+    "x": 4036.666732788086,
+    "y": 4270.769500732422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1378eadb.299955"
+        "d5500d79.08788"
       ]
     ]
   },
   {
-    "id": "6695c568.10d40c",
+    "id": "981910a2.c0ad4",
     "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": 4082.666732788086,
-    "y": 4295.96955871582,
-    "z": "3edf77d7.add3c",
+    "x": 4024.666732788086,
+    "y": 4317.769500732422,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "42d7c1e3.70d63",
+    "id": "3bc11366.fbbc34",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4935.632827758789,
-    "y": 4563.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4877.632827758789,
+    "y": 4584.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "48aa49b9.b94898",
-        "9faa5f11.a8b628"
+        "dd06399c.007818",
+        "d4fdd67a.a817c8"
       ]
     ]
   },
   {
-    "id": "9faa5f11.a8b628",
+    "id": "d4fdd67a.a817c8",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5178.633071899414,
-    "y": 4532.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 5120.633071899414,
+    "y": 4553.96826171875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6b7d6b27.bf3f6c",
+    "id": "2be00ed8.b483fa",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4795.632827758789,
-    "y": 4673.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4737.632827758789,
+    "y": 4694.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8f38170c.15c52"
+        "97d72fe9.69bac8"
       ]
     ]
   },
   {
-    "id": "e53eb8db.b4de68",
+    "id": "91c8662a.32a768",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4783.633071899414,
-    "y": 4766.168563842773,
-    "z": "3edf77d7.add3c",
+    "x": 4725.633071899414,
+    "y": 4787.968505859375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8d6af4a3.13c21",
+    "id": "d203ac94.87b14",
     "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": 4785.695205688477,
-    "y": 4721.028091430664,
-    "z": "3edf77d7.add3c",
+    "x": 4727.695205688477,
+    "y": 4742.828033447266,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1378eadb.299955",
+    "id": "d5500d79.08788",
     "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": 4401.632827758789,
-    "y": 4563.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4343.632827758789,
+    "y": 4584.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b83aa531.8a6d18"
+        "c8667f42.17971"
       ]
     ]
   },
   {
-    "id": "b83aa531.8a6d18",
+    "id": "c8667f42.17971",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4606.632827758789,
-    "y": 4563.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4548.632827758789,
+    "y": 4584.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a88f4eb0.5f047"
+        "459caa2c.0e6e04"
       ]
     ]
   },
   {
-    "id": "a88f4eb0.5f047",
+    "id": "459caa2c.0e6e04",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4772.632827758789,
-    "y": 4563.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4714.632827758789,
+    "y": 4584.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "42d7c1e3.70d63"
+        "3bc11366.fbbc34"
       ]
     ]
   },
   {
-    "id": "48aa49b9.b94898",
+    "id": "dd06399c.007818",
     "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": 4411.632827758789,
-    "y": 4673.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4353.632827758789,
+    "y": 4694.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7a79979c.8eea88",
-        "442b3988.19bc",
-        "5c729d6c.56aa94"
+        "bdef323e.2e743",
+        "8bfc1c1b.2feb4",
+        "6eeff3cb.d5d2dc"
       ]
     ]
   },
   {
-    "id": "7a79979c.8eea88",
+    "id": "bdef323e.2e743",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4622.632827758789,
-    "y": 4675.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4564.632827758789,
+    "y": 4696.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6b7d6b27.bf3f6c"
+        "2be00ed8.b483fa"
       ]
     ]
   },
   {
-    "id": "442b3988.19bc",
+    "id": "8bfc1c1b.2feb4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4623.123794555664,
-    "y": 4720.74235534668,
-    "z": "3edf77d7.add3c",
+    "x": 4565.123794555664,
+    "y": 4742.542297363281,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8d6af4a3.13c21"
+        "d203ac94.87b14"
       ]
     ]
   },
   {
-    "id": "5c729d6c.56aa94",
+    "id": "6eeff3cb.d5d2dc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620.632827758789,
-    "y": 4764.168319702148,
-    "z": "3edf77d7.add3c",
+    "x": 4562.632827758789,
+    "y": 4785.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e53eb8db.b4de68"
+        "91c8662a.32a768"
       ]
     ]
   },
   {
-    "id": "4e4fb9a1.270b08",
+    "id": "b4556ca5.203ec",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 6031.449722290039,
-    "y": 7062.369247436523,
-    "z": "3edf77d7.add3c",
+    "x": 5973.449722290039,
+    "y": 7084.169189453125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "16ba58e8.574907",
+    "id": "5b30bbfe.71d1cc",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5299.916732788086,
-    "y": 4293.568923950195,
-    "z": "3edf77d7.add3c",
+    "x": 5241.916732788086,
+    "y": 4315.368865966797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7a2986e1.36d518",
+    "id": "dbaf0410.536798",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4801.916976928711,
-    "y": 4359.568923950195,
-    "z": "3edf77d7.add3c",
+    "x": 4743.916976928711,
+    "y": 4381.368865966797,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f1d3809d.7253c8",
+    "id": "817a92f2.d780d",
     "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": 5332.916732788086,
-    "y": 4361.568923950195,
-    "z": "3edf77d7.add3c",
+    "x": 5274.916732788086,
+    "y": 4383.368865966797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2b6629f8.8ae99e",
-        "6b873c45.812654"
+        "9dfe7d9b.36f16",
+        "6633e166.0ef198"
       ]
     ]
   },
   {
-    "id": "2b6629f8.8ae99e",
+    "id": "9dfe7d9b.36f16",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5457.916732788086,
-    "y": 4259.56867980957,
-    "z": "3edf77d7.add3c",
+    "x": 5399.916732788086,
+    "y": 4281.368621826172,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "575e916.aaad5f"
+        "bef4e32d.a8f0f"
       ]
     ]
   },
   {
-    "id": "6b873c45.812654",
+    "id": "6633e166.0ef198",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5576.916763305664,
-    "y": 4333.568710327148,
-    "z": "3edf77d7.add3c",
+    "x": 5518.916763305664,
+    "y": 4355.36865234375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "1440683a.de744",
+    "id": "13e3cfc5.6c211",
     "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": 4545.599868774414,
-    "y": 3905.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4487.599868774414,
+    "y": 3927.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c9d5b018.f8051",
+    "id": "c04b322f.90f188",
     "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": 4890.599868774414,
-    "y": 3767.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4832.599868774414,
+    "y": 3789.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "74718a63.36de84"
+        "641a94ad.cf9a7c"
       ]
     ]
   },
   {
-    "id": "55284001.8f5b08",
+    "id": "cb16b3c1.554ca8",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4597.599868774414,
-    "y": 3761.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4539.599868774414,
+    "y": 3783.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c9d5b018.f8051"
+        "c04b322f.90f188"
       ]
     ]
   },
   {
-    "id": "75332f13.262108",
+    "id": "61a224f4.1490f4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4852.599868774414,
-    "y": 3718.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4794.599868774414,
+    "y": 3740.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "1dffa908.5b5767",
+    "id": "79714250.d2dcd4",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4541.599868774414,
-    "y": 3813.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4483.599868774414,
+    "y": 3835.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2247e7bb.aa6698",
+    "id": "accca5a7.e8bcb",
     "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": 4549.599868774414,
-    "y": 3858.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4491.599868774414,
+    "y": 3880.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "766a8bc6.9fb0cc",
+    "id": "4917ab18.c68984",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4546.599868774414,
-    "y": 3711.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4488.599868774414,
+    "y": 3733.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "74718a63.36de84",
+    "id": "641a94ad.cf9a7c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4799.599868774414,
-    "y": 3835.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4741.599868774414,
+    "y": 3857.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "238ee53c.904a6a"
+        "a41b4c9c.8533c8"
       ]
     ]
   },
   {
-    "id": "238ee53c.904a6a",
+    "id": "a41b4c9c.8533c8",
     "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": 4984.599868774414,
-    "y": 3834.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4926.599868774414,
+    "y": 3856.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7de620b3.3d3198"
+        "16d0f836.5619d"
       ]
     ]
   },
   {
-    "id": "7de620b3.3d3198",
+    "id": "16d0f836.5619d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5176.599868774414,
-    "y": 3837.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5118.599868774414,
+    "y": 3859.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f9ce03fd.3df508"
+        "645ca090.154ad8"
       ]
     ]
   },
   {
-    "id": "f9ce03fd.3df508",
+    "id": "645ca090.154ad8",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5348.599868774414,
-    "y": 3833.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 5290.599868774414,
+    "y": 3855.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d48247ca.056eb",
+    "id": "67efef93.94a62",
     "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": 4724.599868774414,
-    "y": 3948.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4666.599868774414,
+    "y": 3970.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "db019ae8.f69e68",
+    "id": "2d37a713.1c4278",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4241.599868774414,
-    "y": 3733.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4183.599868774414,
+    "y": 3755.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d62659b6.160db8",
-        "cf64723d.dfeea8",
-        "1dffa908.5b5767",
-        "2247e7bb.aa6698",
-        "1440683a.de744",
-        "55284001.8f5b08",
-        "d48247ca.056eb"
+        "fc1ea1ac.e5e448",
+        "e72f0644.170c1",
+        "79714250.d2dcd4",
+        "accca5a7.e8bcb",
+        "13e3cfc5.6c211",
+        "cb16b3c1.554ca8",
+        "67efef93.94a62"
       ]
     ]
   },
   {
-    "id": "1fb81d61.c0c6c3",
+    "id": "9d25224b.2344f8",
     "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": 4226.599868774414,
-    "y": 3667.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4168.599868774414,
+    "y": 3689.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "cf64723d.dfeea8",
+    "id": "e72f0644.170c1",
     "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": 4605.599868774414,
-    "y": 3654.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4547.599868774414,
+    "y": 3676.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "61f8c12d.7ec188",
-        "b0224d35.db0ba",
-        "75332f13.262108"
+        "e651547d.d99b88",
+        "9ee7d7c1.7baf1",
+        "61a224f4.1490f4"
       ]
     ]
   },
   {
-    "id": "61f8c12d.7ec188",
+    "id": "e651547d.d99b88",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4841.599868774414,
-    "y": 3637.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4783.599868774414,
+    "y": 3659.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "b0224d35.db0ba",
+    "id": "9ee7d7c1.7baf1",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4838.599868774414,
-    "y": 3678.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4780.599868774414,
+    "y": 3700.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "d62659b6.160db8",
+    "id": "fc1ea1ac.e5e448",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4554.599868774414,
-    "y": 3611.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 4496.599868774414,
+    "y": 3633.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "cbd695e8.8ce3",
+    "id": "7b5e5ce4.837894",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5283.999771118164,
-    "y": 4660.685653686523,
-    "z": "3edf77d7.add3c",
+    "x": 5225.999771118164,
+    "y": 4682.485595703125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8f38170c.15c52",
+    "id": "97d72fe9.69bac8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5072.999771118164,
-    "y": 4722.685653686523,
-    "z": "3edf77d7.add3c",
+    "x": 5014.999771118164,
+    "y": 4744.485595703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "eec0ed64.666e3"
+        "9a139c6f.7e9338"
       ]
     ]
   },
   {
-    "id": "eec0ed64.666e3",
+    "id": "9a139c6f.7e9338",
     "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": 5316.999771118164,
-    "y": 4728.685653686523,
-    "z": "3edf77d7.add3c",
+    "x": 5258.999771118164,
+    "y": 4750.485595703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "da15375d.9b0ee8",
-        "3ee187ea.cd5be8"
+        "f77309ba.c91088",
+        "14cb90c5.a4f8ff"
       ]
     ]
   },
   {
-    "id": "da15375d.9b0ee8",
+    "id": "f77309ba.c91088",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5547.999771118164,
-    "y": 4706.685653686523,
-    "z": "3edf77d7.add3c",
+    "x": 5489.999771118164,
+    "y": 4728.485595703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7e1ed8b0.7851f"
+        "d9be22a0.00a98"
       ]
     ]
   },
   {
-    "id": "3ee187ea.cd5be8",
+    "id": "14cb90c5.a4f8ff",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5552.999771118164,
-    "y": 4773.685653686523,
-    "z": "3edf77d7.add3c",
+    "x": 5494.999771118164,
+    "y": 4795.485595703125,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "33a4fd6a.f05cf2",
+    "id": "414056d.7db8ba8",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5801.883529663086,
-    "y": 4271.36799621582,
-    "z": "3edf77d7.add3c",
+    "x": 5743.883529663086,
+    "y": 4293.167938232422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e619571d.07b27",
-        "7e5b3b13.527164"
+        "7fdfcb8f.16a5bc",
+        "c3a97bf3.cec48"
       ]
     ]
   },
   {
-    "id": "e619571d.07b27",
+    "id": "7fdfcb8f.16a5bc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5956.883560180664,
-    "y": 4199.368270874023,
-    "z": "3edf77d7.add3c",
+    "x": 5898.883560180664,
+    "y": 4221.168212890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a419c34.20a76c"
+        "b797878.bae0cf8"
       ]
     ]
   },
   {
-    "id": "7e5b3b13.527164",
+    "id": "c3a97bf3.cec48",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5957.883560180664,
-    "y": 4332.368270874023,
-    "z": "3edf77d7.add3c",
+    "x": 5899.883560180664,
+    "y": 4354.168212890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8b03748e.6511"
+        "e250ecc5.35ab28"
       ]
     ]
   },
   {
-    "id": "a419c34.20a76c",
+    "id": "b797878.bae0cf8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6101.883560180664,
-    "y": 4199.368515014648,
-    "z": "3edf77d7.add3c",
+    "x": 6043.883560180664,
+    "y": 4221.16845703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e331e060.96ce2",
-        "f02eaafa.80f4b"
+        "424fa95d.ed7fe",
+        "75e1d3fe.929f74"
       ]
     ]
   },
   {
-    "id": "e331e060.96ce2",
+    "id": "424fa95d.ed7fe",
     "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": 6394.883560180664,
-    "y": 4177.368270874023,
-    "z": "3edf77d7.add3c",
+    "x": 6336.883560180664,
+    "y": 4199.168212890625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f02eaafa.80f4b",
+    "id": "75e1d3fe.929f74",
     "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": 6346.533462524414,
-    "y": 4224.685165405273,
-    "z": "3edf77d7.add3c",
+    "x": 6288.533462524414,
+    "y": 4246.485107421875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "fac6e0eb.b7e5e8",
+    "id": "5dd8867f.439e3",
     "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": 6419.883529663086,
-    "y": 4126.36799621582,
-    "z": "3edf77d7.add3c",
+    "x": 6361.883529663086,
+    "y": 4148.167938232422,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8b03748e.6511",
+    "id": "e250ecc5.35ab28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6113.883560180664,
-    "y": 4331.368515014648,
-    "z": "3edf77d7.add3c",
+    "x": 6055.883560180664,
+    "y": 4353.16845703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7cde89b.f9cde78",
-        "44d5eb8e.8b5a7c"
+        "417900a8.821de",
+        "be5a71f5.125bd8"
       ]
     ]
   },
   {
-    "id": "7cde89b.f9cde78",
+    "id": "417900a8.821de",
     "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": 6406.883560180664,
-    "y": 4309.368270874023,
-    "z": "3edf77d7.add3c",
+    "x": 6348.883560180664,
+    "y": 4331.168212890625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "44d5eb8e.8b5a7c",
+    "id": "be5a71f5.125bd8",
     "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": 6358.533462524414,
-    "y": 4356.685165405273,
-    "z": "3edf77d7.add3c",
+    "x": 6300.533462524414,
+    "y": 4378.485107421875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "8783d256.dfbee8",
+    "id": "a603f2dd.a46cd8",
     "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": 6430.883560180664,
-    "y": 4270.368270874023,
-    "z": "3edf77d7.add3c",
+    "x": 6372.883560180664,
+    "y": 4292.168212890625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7e1ed8b0.7851f",
+    "id": "d9be22a0.00a98",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5753.116470336914,
-    "y": 4713.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5695.116470336914,
+    "y": 4735.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cf050a6d.dffd88",
-        "15aed249.cbc52e"
+        "c2b73899.5086",
+        "f61c39ed.e925c8"
       ]
     ]
   },
   {
-    "id": "cf050a6d.dffd88",
+    "id": "c2b73899.5086",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5948.116470336914,
-    "y": 4641.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5890.116470336914,
+    "y": 4663.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5ed50abf.ff9d7c"
+        "d6c79c19.937aa"
       ]
     ]
   },
   {
-    "id": "15aed249.cbc52e",
+    "id": "f61c39ed.e925c8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5949.116470336914,
-    "y": 4774.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5891.116470336914,
+    "y": 4796.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2100e232.b11cce"
+        "4edaf13a.b4d9f"
       ]
     ]
   },
   {
-    "id": "5ed50abf.ff9d7c",
+    "id": "d6c79c19.937aa",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6093.116470336914,
-    "y": 4641.569198608398,
-    "z": "3edf77d7.add3c",
+    "x": 6035.116470336914,
+    "y": 4663.369140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e4e29811.e1048",
-        "e58be206.dcc488"
+        "d6b8ba93.8ff92",
+        "f1f742e0.7a641"
       ]
     ]
   },
   {
-    "id": "e4e29811.e1048",
+    "id": "d6b8ba93.8ff92",
     "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": 6386.116470336914,
-    "y": 4619.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 6328.116470336914,
+    "y": 4641.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "e58be206.dcc488",
+    "id": "f1f742e0.7a641",
     "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": 6337.766372680664,
-    "y": 4666.885848999023,
-    "z": "3edf77d7.add3c",
+    "x": 6279.766372680664,
+    "y": 4688.685791015625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "fa3f6ab4.8ef07",
+    "id": "d36450e6.6d57c8",
     "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": 6410.116470336914,
-    "y": 4580.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 6352.116470336914,
+    "y": 4602.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2100e232.b11cce",
+    "id": "4edaf13a.b4d9f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6105.116470336914,
-    "y": 4773.569198608398,
-    "z": "3edf77d7.add3c",
+    "x": 6047.116470336914,
+    "y": 4795.369140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8a653803.fc1f6",
-        "4431f46f.b3008c"
+        "7a3b5a2.2e1f624",
+        "1ba425ad.b54daa"
       ]
     ]
   },
   {
-    "id": "8a653803.fc1f6",
+    "id": "7a3b5a2.2e1f624",
     "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": 6398.116470336914,
-    "y": 4751.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 6340.116470336914,
+    "y": 4773.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4431f46f.b3008c",
+    "id": "1ba425ad.b54daa",
     "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": 6349.766372680664,
-    "y": 4798.885848999023,
-    "z": "3edf77d7.add3c",
+    "x": 6291.766372680664,
+    "y": 4820.685791015625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "bbeeae4d.bca708",
+    "id": "22900b75.03f974",
     "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": 6422.116470336914,
-    "y": 4712.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 6364.116470336914,
+    "y": 4734.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "aea70ead.9836b8",
+    "id": "ef554fdd.c7de28",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5160.966567993164,
-    "y": 5453.769149780273,
-    "z": "3edf77d7.add3c",
+    "x": 5102.966567993164,
+    "y": 5475.569091796875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2e1e6c02.39beec",
+    "id": "fa0dda8.0253328",
     "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": 5158.749771118164,
-    "y": 5493.969345092773,
-    "z": "3edf77d7.add3c",
+    "x": 5100.749771118164,
+    "y": 5515.769287109375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a8fe1a2c.71b3c8",
+    "id": "f06e1df.64a1e6",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5034.000015258789,
-    "y": 5678.452255249023,
-    "z": "3edf77d7.add3c",
+    "x": 4976.000015258789,
+    "y": 5700.252197265625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7871c32f.9d91cc",
+    "id": "ca1c65a6.dca85",
     "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": 5031.783218383789,
-    "y": 5718.652450561523,
-    "z": "3edf77d7.add3c",
+    "x": 4973.783218383789,
+    "y": 5740.452392578125,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "685061c3.01675",
+    "id": "a99f468d.7b18e",
     "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": 5131.116470336914,
-    "y": 6002.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5073.116470336914,
+    "y": 6024.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "29335c50.b3bc5c",
+    "id": "8488a4f2.44d84",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4958.116470336914,
-    "y": 6059.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 4900.116470336914,
+    "y": 6081.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a0a30ce1.826348",
-        "8ce5c005.55e608"
+        "7fa62708.b47fb8",
+        "8128360f.d5f0f8"
       ]
     ]
   },
   {
-    "id": "a0a30ce1.826348",
+    "id": "7fa62708.b47fb8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5169.116470336914,
-    "y": 6059.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5111.116470336914,
+    "y": 6081.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "590e11da.6a5d5"
+        "7522288d.71e8f8"
       ]
     ]
   },
   {
-    "id": "8ce5c005.55e608",
+    "id": "8128360f.d5f0f8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5165.116470336914,
-    "y": 6107.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5107.116470336914,
+    "y": 6129.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ceea008c.a129b"
+        "fb9502dd.0e71b"
       ]
     ]
   },
   {
-    "id": "590e11da.6a5d5",
+    "id": "7522288d.71e8f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5325.116470336914,
-    "y": 6055.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5267.116470336914,
+    "y": 6077.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "755f894f.dc414",
-        "2f6a3eee.3c813a",
-        "d68f19c9.00e6c"
+        "9f8e58e7.89aac",
+        "d14d9fb3.031c",
+        "ade8b0f8.453b68"
       ]
     ]
   },
   {
-    "id": "ceea008c.a129b",
+    "id": "fb9502dd.0e71b",
     "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": 5313.116470336914,
-    "y": 6102.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5255.116470336914,
+    "y": 6124.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "692d5d8e.91da94",
+    "id": "482690e8.af77d8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5591.000259399414,
-    "y": 6155.452255249023,
-    "z": "3edf77d7.add3c",
+    "x": 5533.000259399414,
+    "y": 6177.252197265625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d68f19c9.00e6c",
+    "id": "ade8b0f8.453b68",
     "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": 5588.783462524414,
-    "y": 6195.652450561523,
-    "z": "3edf77d7.add3c",
+    "x": 5530.783462524414,
+    "y": 6217.452392578125,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f6a3eee.3c813a",
+    "id": "d14d9fb3.031c",
     "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": 5708.116470336914,
-    "y": 6107.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5650.116470336914,
+    "y": 6129.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "755f894f.dc414",
+    "id": "9f8e58e7.89aac",
     "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": 5579.116470336914,
-    "y": 6055.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 5521.116470336914,
+    "y": 6077.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e084ba5b.54a44",
+    "id": "b5ec42e6.8d4a38",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5020.116470336914,
-    "y": 5960.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 4962.116470336914,
+    "y": 5982.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ac6c48.3b961bb8",
+    "id": "977f17a0.9f41a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4667.449478149414,
-    "y": 6047.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 4609.449478149414,
+    "y": 6069.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "685061c3.01675",
-        "29335c50.b3bc5c",
-        "2fa7a2c0.97e2e6",
-        "ed4e275a.a600a"
+        "a99f468d.7b18e",
+        "8488a4f2.44d84",
+        "9cfb7864.e0e548",
+        "98761b9f.ff6118"
       ]
     ]
   },
   {
-    "id": "f3a1ad9d.6eb4a8",
+    "id": "5d58f01d.864e08",
     "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": 5011.199966430664,
-    "y": 6516.568954467773,
-    "z": "3edf77d7.add3c",
+    "x": 4953.199966430664,
+    "y": 6538.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "d3bca3b6.20d5e8",
+    "id": "b7ab7670.8f5828",
     "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": 3716.567123413086,
-    "y": 3793.2857208251953,
-    "z": "3edf77d7.add3c",
+    "x": 3658.567123413086,
+    "y": 3815.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "cb5f4cbc.1262b8",
+    "id": "c7b27212.2f5b88",
     "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": 4469.100326538086,
-    "y": 4067.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 4411.100326538086,
+    "y": 4089.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e967ddfe.3a6e28",
-        "90c367c2.c3898",
-        "a6021f01.4f12a"
+        "88440014.089508",
+        "6850bc1b.9b439c",
+        "ea9e63cb.45924"
       ]
     ]
   },
   {
-    "id": "1401df85.96017",
+    "id": "46e39fd1.0b23",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4577.100570678711,
-    "y": 4023.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 4519.100570678711,
+    "y": 4045.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e967ddfe.3a6e28",
+    "id": "88440014.089508",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4674.100326538086,
-    "y": 4064.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 4616.100326538086,
+    "y": 4086.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "358ef01b.aa0e8"
+        "94bd21f9.ba5e08"
       ]
     ]
   },
   {
-    "id": "90c367c2.c3898",
+    "id": "6850bc1b.9b439c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4657.591293334961,
-    "y": 4125.976455688477,
-    "z": "3edf77d7.add3c",
+    "x": 4599.591293334961,
+    "y": 4147.776397705078,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e4912ec.a7606d"
+        "c061eff6.efec1"
       ]
     ]
   },
   {
-    "id": "a6021f01.4f12a",
+    "id": "ea9e63cb.45924",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4655.100326538086,
-    "y": 4169.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4597.100326538086,
+    "y": 4191.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ac2440d8.b536c"
+        "302c462f.876b7a"
       ]
     ]
   },
   {
-    "id": "358ef01b.aa0e8",
+    "id": "94bd21f9.ba5e08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4842.100570678711,
-    "y": 4059.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 4784.100570678711,
+    "y": 4081.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f658df6.9a7612"
+        "72fd3d1f.5c9734"
       ]
     ]
   },
   {
-    "id": "e4912ec.a7606d",
+    "id": "c061eff6.efec1",
     "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": 4820.162704467773,
-    "y": 4126.262191772461,
-    "z": "3edf77d7.add3c",
+    "x": 4762.162704467773,
+    "y": 4148.0621337890625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ac2440d8.b536c",
+    "id": "302c462f.876b7a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4822.100326538086,
-    "y": 4168.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4764.100326538086,
+    "y": 4190.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f658df6.9a7612",
+    "id": "72fd3d1f.5c9734",
     "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": 5080.100570678711,
-    "y": 4064.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5022.100570678711,
+    "y": 4086.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d609729e.4f23e"
+        "e265f5c.115d288"
       ]
     ]
   },
   {
-    "id": "d609729e.4f23e",
+    "id": "e265f5c.115d288",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5314.100326538086,
-    "y": 4071.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5256.100326538086,
+    "y": 4093.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f1d3809d.7253c8"
+        "817a92f2.d780d"
       ]
     ]
   },
   {
-    "id": "ca40fb3f.0ddd08",
+    "id": "aaa5f9ec.d9ed6",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4447.800033569336,
-    "y": 3993.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 4389.800033569336,
+    "y": 4015.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1e5e2cd.ecb6453",
+    "id": "4e4373ae.4e8254",
     "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": 5730.949935913086,
-    "y": 4081.9854278564453,
-    "z": "3edf77d7.add3c",
+    "x": 5672.949935913086,
+    "y": 4103.785369873047,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "960f8364.63d43"
+        "8eac4849.2274f8"
       ]
     ]
   },
   {
-    "id": "960f8364.63d43",
+    "id": "8eac4849.2274f8",
     "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": 5922.949935913086,
-    "y": 4070.9856719970703,
-    "z": "3edf77d7.add3c",
+    "x": 5864.949935913086,
+    "y": 4092.785614013672,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f97c2bb4.e56a"
+        "a232365.4dda248"
       ]
     ]
   },
   {
-    "id": "f97c2bb4.e56a",
+    "id": "a232365.4dda248",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6104.949935913086,
-    "y": 4049.9856719970703,
-    "z": "3edf77d7.add3c",
+    "x": 6046.949935913086,
+    "y": 4071.785614013672,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b79d4999.d7cb98"
+        "992af4aa.8e2b6"
       ]
     ]
   },
   {
-    "id": "b79d4999.d7cb98",
+    "id": "992af4aa.8e2b6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 6266.949935913086,
-    "y": 4038.9856719970703,
-    "z": "3edf77d7.add3c",
+    "x": 6208.949935913086,
+    "y": 4060.785614013672,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "722e24a9.0c2c14",
-        "e69b5880.065b08"
+        "1e9c08fd.18a337",
+        "74b54acc.d82234"
       ]
     ]
   },
   {
-    "id": "722e24a9.0c2c14",
+    "id": "1e9c08fd.18a337",
     "type": "set",
     "name": "unset tmp.the-connectivity",
     "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
     "comments": "",
-    "x": 6463.949935913086,
-    "y": 3967.9856719970703,
-    "z": "3edf77d7.add3c",
+    "x": 6405.949935913086,
+    "y": 3989.785614013672,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ee3fdd91.33b3e8",
+    "id": "b0ee6567.2e3a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5637.900131225586,
-    "y": 4196.985427856445,
-    "z": "3edf77d7.add3c",
+    "x": 5579.900131225586,
+    "y": 4218.785369873047,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "33a4fd6a.f05cf2",
-        "1e5e2cd.ecb6453",
-        "126e49f8.4ace7e",
-        "fdd429d6.294198"
+        "414056d.7db8ba8",
+        "4e4373ae.4e8254",
+        "1071a614.4e5e12",
+        "8f9726f3.06c69"
       ]
     ]
   },
   {
-    "id": "126e49f8.4ace7e",
+    "id": "1071a614.4e5e12",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5769.466537475586,
-    "y": 3972.2024688720703,
-    "z": "3edf77d7.add3c",
+    "x": 5711.466537475586,
+    "y": 3994.002410888672,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fdd429d6.294198",
+    "id": "8f9726f3.06c69",
     "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": 5761.466537475586,
-    "y": 4021.2024688720703,
-    "z": "3edf77d7.add3c",
+    "x": 5703.466537475586,
+    "y": 4043.002410888672,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e69b5880.065b08",
+    "id": "74b54acc.d82234",
     "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": 6469.416732788086,
-    "y": 4077.2024688720703,
-    "z": "3edf77d7.add3c",
+    "x": 6411.416732788086,
+    "y": 4099.002410888672,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bca47127.d5cfd8",
+    "id": "7fff9c38.345784",
     "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": 5762.683334350586,
-    "y": 3795.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5704.683334350586,
+    "y": 3817.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "16b26942.410c5f",
+    "id": "aaa5e7eb.47b75",
     "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": 5916.683334350586,
-    "y": 3847.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5858.683334350586,
+    "y": 3869.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "575e916.aaad5f",
+    "id": "bef4e32d.a8f0f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5507.683334350586,
-    "y": 3914.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5449.683334350586,
+    "y": 3936.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "16b26942.410c5f",
-        "4e79a048.28ceb8",
-        "bca47127.d5cfd8"
+        "aaa5e7eb.47b75",
+        "1d5352b7.2fb14d",
+        "7fff9c38.345784"
       ]
     ]
   },
   {
-    "id": "4e79a048.28ceb8",
+    "id": "1d5352b7.2fb14d",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5761.683334350586,
-    "y": 3902.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5703.683334350586,
+    "y": 3924.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d6032421.ea99d8"
+        "894732f.a692a5"
       ]
     ]
   },
   {
-    "id": "d6032421.ea99d8",
+    "id": "894732f.a692a5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5940.683334350586,
-    "y": 3901.4024200439453,
-    "z": "3edf77d7.add3c",
+    "x": 5882.683334350586,
+    "y": 3923.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ee3fdd91.33b3e8"
+        "b0ee6567.2e3a8"
       ]
     ]
   },
   {
-    "id": "eb8749e3.22de7",
+    "id": "81398bf4.473028",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4638.683334350586,
-    "y": 7419.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4580.683334350586,
+    "y": 7441.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "aa8c3669.88cdf8",
-        "fad2776b.9a9d28",
-        "2612fef6.812a92"
+        "6a1836f0.9e7b08",
+        "edfac497.39017",
+        "e285b49b.2789f8"
       ]
     ]
   },
   {
-    "id": "2612fef6.812a92",
+    "id": "e285b49b.2789f8",
     "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": 4861.683334350586,
-    "y": 7363.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4803.683334350586,
+    "y": 7385.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "aa8c3669.88cdf8",
+    "id": "6a1836f0.9e7b08",
     "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": 5040.683334350586,
-    "y": 7406.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4982.683334350586,
+    "y": 7428.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "fad2776b.9a9d28",
+    "id": "edfac497.39017",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4885.683334350586,
-    "y": 7461.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4827.683334350586,
+    "y": 7483.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2437b1d5.2f95e6"
+        "d5b486b.df173f8"
       ]
     ]
   },
   {
-    "id": "2437b1d5.2f95e6",
+    "id": "d5b486b.df173f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5064.683334350586,
-    "y": 7460.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 5006.683334350586,
+    "y": 7482.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "268cfed4.3ed072"
+        "7de65a32.2588c4"
       ]
     ]
   },
   {
-    "id": "f140933b.8acec",
+    "id": "ecfaffd6.100b2",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4795.683334350586,
-    "y": 7099.402420043945,
-    "z": "3edf77d7.add3c",
+    "x": 4737.683334350586,
+    "y": 7121.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c1a83ef0.efb158",
+    "id": "4b552ff.dab62d",
     "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": 3361.2999420166016,
-    "y": 493.85240173339844,
-    "z": "3edf77d7.add3c",
+    "x": 3303.2999420166016,
+    "y": 515.65234375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "30c464f6.21891c",
+    "id": "3dcf3da2.14e88a",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4136.399429321289,
-    "y": 554.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 4078.399429321289,
+    "y": 576.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "92681273.ecf0b8"
+        "bfde7d38.fed19"
       ]
     ]
   },
   {
-    "id": "92681273.ecf0b8",
+    "id": "bfde7d38.fed19",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4305.399429321289,
-    "y": 551.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 4247.399429321289,
+    "y": 573.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c003a5ba.a5cd",
-        "f6645586.4c0b38"
+        "30447223.2437ce",
+        "12dff897.0ce0bf"
       ]
     ]
   },
   {
-    "id": "c003a5ba.a5cd",
+    "id": "30447223.2437ce",
     "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": 4529.399429321289,
-    "y": 584.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 4471.399429321289,
+    "y": 606.65234375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f6645586.4c0b38",
+    "id": "12dff897.0ce0bf",
     "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": 4475.399429321289,
-    "y": 624.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 4417.399429321289,
+    "y": 646.65234375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "513e1ab4.43497c",
+    "id": "f46ebe04.450d9",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4101.399917602539,
-    "y": 754.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 4043.399917602539,
+    "y": 775.8523559570312,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b7c1f5eb.1c0428"
+        "3c9b9865.e5691"
       ]
     ]
   },
   {
-    "id": "b7c1f5eb.1c0428",
+    "id": "3c9b9865.e5691",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4266.399185180664,
-    "y": 759.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 4208.399185180664,
+    "y": 780.8523559570312,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8d3bba48.eab118",
-        "ecf8bfe7.1b0ad8"
+        "4bcd87c1.d1b",
+        "63ed5150.d5d24"
       ]
     ]
   },
   {
-    "id": "8d3bba48.eab118",
+    "id": "4bcd87c1.d1b",
     "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": 4513.399429321289,
-    "y": 841.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 4455.399429321289,
+    "y": 862.8523559570312,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ecf8bfe7.1b0ad8",
+    "id": "63ed5150.d5d24",
     "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": 4459.399429321289,
-    "y": 881.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 4401.399429321289,
+    "y": 902.8523559570312,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8429e2be.11d098",
+    "id": "76a3b118.862498",
     "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": 3344.399917602539,
-    "y": 893.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 3286.399917602539,
+    "y": 914.8523559570312,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ad35aa48.056498",
-        "881c5027.ef1da8",
-        "c8b7bc97.b40ba"
+        "7adb4c8f.c682bc",
+        "7eb8fd1a.3f3194",
+        "b860a47d.f11fd8"
       ]
     ]
   },
   {
-    "id": "ad35aa48.056498",
+    "id": "7adb4c8f.c682bc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3586.399917602539,
-    "y": 886.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 3528.399917602539,
+    "y": 907.8523559570312,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "881c5027.ef1da8",
+    "id": "7eb8fd1a.3f3194",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3581.908981323242,
-    "y": 928.4784698486328,
-    "z": "3edf77d7.add3c",
+    "x": 3523.908981323242,
+    "y": 950.2784118652344,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "c8b7bc97.b40ba",
+    "id": "b860a47d.f11fd8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3585.908950805664,
-    "y": 976.4784393310547,
-    "z": "3edf77d7.add3c",
+    "x": 3527.908950805664,
+    "y": 998.2783813476562,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9ce363a2.dd0398"
+        "a6ff06d4.331218"
       ]
     ]
   },
   {
-    "id": "9ce363a2.dd0398",
+    "id": "a6ff06d4.331218",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3747.399917602539,
-    "y": 917.0524139404297,
-    "z": "3edf77d7.add3c",
+    "x": 3689.399917602539,
+    "y": 938.8523559570312,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "411baca6.4afa04"
+        "32bc585c.c7728"
       ]
     ]
   },
   {
-    "id": "411baca6.4afa04",
+    "id": "32bc585c.c7728",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3918.399917602539,
-    "y": 917.0525970458984,
-    "z": "3edf77d7.add3c",
+    "x": 3860.399917602539,
+    "y": 938.8525390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d6c02163.09f2f",
-        "26b7eb30.1a16a4",
-        "96d019f1.51b6c"
+        "e312a504.c3346",
+        "450f492a.7498d8",
+        "e7c48999.96bb5"
       ]
     ]
   },
   {
-    "id": "d6c02163.09f2f",
+    "id": "e312a504.c3346",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4085.399673461914,
-    "y": 827.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4027.399673461914,
+    "y": 848.8524780273438,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a0fe031a.dea47"
+        "e34d64db.7a9328"
       ]
     ]
   },
   {
-    "id": "26b7eb30.1a16a4",
+    "id": "450f492a.7498d8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4087.399673461914,
-    "y": 881.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4029.399673461914,
+    "y": 902.8524780273438,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "229f8aa8.94f7fe"
+        "f1b929a4.9c9ce"
       ]
     ]
   },
   {
-    "id": "a0fe031a.dea47",
+    "id": "e34d64db.7a9328",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4213.399673461914,
-    "y": 827.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4155.399673461914,
+    "y": 848.8524780273438,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4f78be1b.93fa4",
-        "f44f2336.c1f56"
+        "d0297dd0.c50e68",
+        "9996be1d.2ba6f"
       ]
     ]
   },
   {
-    "id": "229f8aa8.94f7fe",
+    "id": "f1b929a4.9c9ce",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4216.399673461914,
-    "y": 880.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4158.399673461914,
+    "y": 901.8524780273438,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a67f23a8.85781",
-        "587a77f8.86931"
+        "55ecdb35.0e00cc",
+        "c088cd20.720bd8"
       ]
     ]
   },
   {
-    "id": "f44f2336.c1f56",
+    "id": "9996be1d.2ba6f",
     "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": 4459.399429321289,
-    "y": 966.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4401.399429321289,
+    "y": 987.8524780273438,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a67f23a8.85781",
+    "id": "55ecdb35.0e00cc",
     "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": 4476.399429321289,
-    "y": 1008.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4418.399429321289,
+    "y": 1029.8524780273438,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "587a77f8.86931",
+    "id": "c088cd20.720bd8",
     "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": 4461.399429321289,
-    "y": 1046.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4403.399429321289,
+    "y": 1067.8524780273438,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4f78be1b.93fa4",
+    "id": "d0297dd0.c50e68",
     "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": 4473.399429321289,
-    "y": 926.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4415.399429321289,
+    "y": 947.8524780273438,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fcadc9d5.a748f8",
+    "id": "5eec7036.1519e8",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4638.399429321289,
-    "y": 942.0525360107422,
-    "z": "3edf77d7.add3c",
+    "x": 4580.399429321289,
+    "y": 963.8524780273438,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "96d019f1.51b6c",
+    "id": "e7c48999.96bb5",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4026.399917602539,
-    "y": 972.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 3968.399917602539,
+    "y": 993.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "af991ebb.5e627"
+        "6b81c811.85e0f8"
       ]
     ]
   },
   {
-    "id": "af991ebb.5e627",
+    "id": "6b81c811.85e0f8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4200.399917602539,
-    "y": 967.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 4142.399917602539,
+    "y": 988.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f09b675e.f8da7",
-        "2dc559.0e4fdaa8"
+        "2495f2a4.688896",
+        "9470a6af.62de2"
       ]
     ]
   },
   {
-    "id": "2dc559.0e4fdaa8",
+    "id": "9470a6af.62de2",
     "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": 4433.399429321289,
-    "y": 1136.0522918701172,
-    "z": "3edf77d7.add3c",
+    "x": 4375.399429321289,
+    "y": 1157.8522338867188,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f09b675e.f8da7",
+    "id": "2495f2a4.688896",
     "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": 4487.399429321289,
-    "y": 1096.0522918701172,
-    "z": "3edf77d7.add3c",
+    "x": 4429.399429321289,
+    "y": 1117.8522338867188,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5c549048.27d988",
+    "id": "b6c93789.479408",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4601.399429321289,
-    "y": 1121.0522918701172,
-    "z": "3edf77d7.add3c",
+    "x": 4543.399429321289,
+    "y": 1142.8522338867188,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f87c2434.973ea",
+    "id": "c1d74161.be2c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3602.066665649414,
-    "y": 2201.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3544.066665649414,
+    "y": 2223.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5b1e0335.2e861c",
-        "c761c99f.075528"
+        "855df0cd.9bb95",
+        "434e1396.d595c4"
       ]
     ]
   },
   {
-    "id": "7e1476f1.6750f8",
+    "id": "d130bfb5.a4da88",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3429.400161743164,
-    "y": 2202.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3371.400161743164,
+    "y": 2224.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f87c2434.973ea"
+        "c1d74161.be2c8"
       ]
     ]
   },
   {
-    "id": "6c010aa3.624334",
+    "id": "bba37dac.291368",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3438.891128540039,
-    "y": 2244.8597869873047,
-    "z": "3edf77d7.add3c",
+    "x": 3380.891128540039,
+    "y": 2266.6597290039062,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "72d07b8a.849984",
+    "id": "730fab1.8beaed4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3427.400161743164,
-    "y": 2291.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3369.400161743164,
+    "y": 2313.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "5b1e0335.2e861c",
+    "id": "855df0cd.9bb95",
     "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": 3888.400161743164,
-    "y": 2205.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3830.400161743164,
+    "y": 2227.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "279a9ed1.bf6a32",
-        "e13b8d61.77167"
+        "55a8020a.690a64",
+        "326effaf.bc448"
       ]
     ]
   },
   {
-    "id": "e13b8d61.77167",
+    "id": "326effaf.bc448",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4111.400161743164,
-    "y": 2160.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4053.400161743164,
+    "y": 2182.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "76113157.988ef"
+        "ab5c47c3.fcb968"
       ]
     ]
   },
   {
-    "id": "279a9ed1.bf6a32",
+    "id": "55a8020a.690a64",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4113.400161743164,
-    "y": 2224.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4055.400161743164,
+    "y": 2246.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "26da469d.16a06a"
+        "af7cae04.ba78a"
       ]
     ]
   },
   {
-    "id": "d7f7c5fa.4c43d8",
+    "id": "fbc065ad.333e38",
     "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": 3201.400161743164,
-    "y": 2237.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3143.400161743164,
+    "y": 2259.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7e1476f1.6750f8",
-        "6c010aa3.624334",
-        "72d07b8a.849984"
+        "d130bfb5.a4da88",
+        "bba37dac.291368",
+        "730fab1.8beaed4"
       ]
     ]
   },
   {
-    "id": "1989a06e.d4f03",
+    "id": "a720f331.1ff0f",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3162.400161743164,
-    "y": 2181.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3104.400161743164,
+    "y": 2203.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "334ad959.cb8dd6",
+    "id": "62eac021.71055",
     "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": 3221.400161743164,
-    "y": 1977.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3163.400161743164,
+    "y": 1999.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "52bf5f88.b043b",
-        "50b4842f.e69cbc"
+        "de7e4f57.82469",
+        "33097b2f.e0f6dc"
       ]
     ]
   },
   {
-    "id": "50b4842f.e69cbc",
+    "id": "33097b2f.e0f6dc",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3444.400161743164,
-    "y": 1963.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3386.400161743164,
+    "y": 1985.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a9726b2d.fccd7"
+        "55022710.99c7b"
       ]
     ]
   },
   {
-    "id": "52bf5f88.b043b",
+    "id": "de7e4f57.82469",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3446.400161743164,
-    "y": 1996.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3388.400161743164,
+    "y": 2018.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a9726b2d.fccd7",
+    "id": "55022710.99c7b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3592.400161743164,
-    "y": 1956.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3534.400161743164,
+    "y": 1978.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5ee377e.4e34b08",
-        "eb05f6d8.e8b8d8"
+        "225a6795.34ae6",
+        "605cb253.51882c"
       ]
     ]
   },
   {
-    "id": "5ee377e.4e34b08",
+    "id": "225a6795.34ae6",
     "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": 3786.400161743164,
-    "y": 1959.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3728.400161743164,
+    "y": 1981.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c761c99f.075528",
+    "id": "434e1396.d595c4",
     "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": 3839.400131225586,
-    "y": 2328.2857208251953,
-    "z": "3edf77d7.add3c",
+    "x": 3781.400131225586,
+    "y": 2350.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "82e8744d.2f169"
+        "6aeddc31.02af0c"
       ]
     ]
   },
   {
-    "id": "82e8744d.2f169",
+    "id": "6aeddc31.02af0c",
     "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": 4045.400131225586,
-    "y": 2328.2857208251953,
-    "z": "3edf77d7.add3c",
+    "x": 3987.400131225586,
+    "y": 2350.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fde94d7a.1c1f78"
+        "1d98ffa3.9dac18"
       ]
     ]
   },
   {
-    "id": "eb05f6d8.e8b8d8",
+    "id": "605cb253.51882c",
     "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": 3808.400161743164,
-    "y": 2027.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3750.400161743164,
+    "y": 2049.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4c08dffc.53f9b",
-        "367fe0d1.441908",
-        "e6dd27d7.84d748"
+        "da783639.0ff76",
+        "86ac0aff.5f3f28",
+        "cebbe4ca.ee77e"
       ]
     ]
   },
   {
-    "id": "4c08dffc.53f9b",
+    "id": "da783639.0ff76",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4003.9002838134766,
-    "y": 1979.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3945.9002838134766,
+    "y": 2001.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "335d38ec.2d1a38"
+        "812fa062.6dc7c"
       ]
     ]
   },
   {
-    "id": "367fe0d1.441908",
+    "id": "86ac0aff.5f3f28",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3995.9002838134766,
-    "y": 2034.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3937.9002838134766,
+    "y": 2056.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d6efed88.7d53"
+        "8d0439b3.358a8"
       ]
     ]
   },
   {
-    "id": "e6dd27d7.84d748",
+    "id": "cebbe4ca.ee77e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4000.9002838134766,
-    "y": 2091.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 3942.9002838134766,
+    "y": 2113.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "177f57a1.3eb1f8"
+        "ca5c6f17.cf3a7"
       ]
     ]
   },
   {
-    "id": "177f57a1.3eb1f8",
+    "id": "ca5c6f17.cf3a7",
     "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": 4152.900283813477,
-    "y": 2092.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4094.9002838134766,
+    "y": 2114.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "335d38ec.2d1a38",
+    "id": "812fa062.6dc7c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4148.282608032227,
-    "y": 1976.9415435791016,
-    "z": "3edf77d7.add3c",
+    "x": 4090.2826080322266,
+    "y": 1998.7414855957031,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6ad02bf1.79a934"
+        "ad74d99d.0df72"
       ]
     ]
   },
   {
-    "id": "4bfd3207.06ef5c",
+    "id": "28bc0683.b68302",
     "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": 3224.066665649414,
-    "y": 2316.2857513427734,
-    "z": "3edf77d7.add3c",
+    "x": 3166.066665649414,
+    "y": 2338.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7f049b99.392e44",
+    "id": "9656dd17.9b3ad",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3899.066635131836,
-    "y": 2280.2857208251953,
-    "z": "3edf77d7.add3c",
+    "x": 3841.066635131836,
+    "y": 2302.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "26da469d.16a06a",
+    "id": "af7cae04.ba78a",
     "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": 4272.400161743164,
-    "y": 2243.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4214.400161743164,
+    "y": 2265.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "76113157.988ef",
+    "id": "ab5c47c3.fcb968",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4276.400161743164,
-    "y": 2157.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4218.400161743164,
+    "y": 2179.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9aa2a686.be54a8",
-        "433203.bfdcb5fc"
+        "9a6b61ac.f8e22",
+        "26968708.bf0a2"
       ]
     ]
   },
   {
-    "id": "fde94d7a.1c1f78",
+    "id": "1d98ffa3.9dac18",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4262.685775756836,
-    "y": 2327.1074981689453,
-    "z": "3edf77d7.add3c",
+    "x": 4204.685775756836,
+    "y": 2348.907440185547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2950d492.5666c4"
+        "e0a8c937.0da4d"
       ]
     ]
   },
   {
-    "id": "d6efed88.7d53",
+    "id": "8d0439b3.358a8",
     "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": 4163.900283813477,
-    "y": 2037.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4105.900283813477,
+    "y": 2059.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9aa2a686.be54a8",
+    "id": "9a6b61ac.f8e22",
     "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": 4446.400161743164,
-    "y": 2118.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4388.400161743164,
+    "y": 2140.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "433203.bfdcb5fc",
+    "id": "26968708.bf0a2",
     "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": 4447.400161743164,
-    "y": 2223.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4389.400161743164,
+    "y": 2245.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "279b9c4d.6439cc",
+    "id": "826c48fa.181fa",
     "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": 4442.400161743164,
-    "y": 2172.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4384.400161743164,
+    "y": 2194.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2950d492.5666c4",
+    "id": "e0a8c937.0da4d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4469.517318725586,
-    "y": 2316.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 4411.517318725586,
+    "y": 2338.4261169433594,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "27d287be.22449",
-        "54646993.252b48",
-        "ce1fcbcf.439b7"
+        "e11a9a35.e1ef78",
+        "a5abc378.a6c95",
+        "e2067ae4.4ae0a8"
       ]
     ]
   },
   {
-    "id": "27d287be.22449",
+    "id": "e11a9a35.e1ef78",
     "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": 4684.517318725586,
-    "y": 2278.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 4626.517318725586,
+    "y": 2300.4261169433594,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "54646993.252b48",
+    "id": "a5abc378.a6c95",
     "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": 4681.517318725586,
-    "y": 2317.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 4623.517318725586,
+    "y": 2339.4261169433594,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4c6f5d99.cc2504"
+        "153d06ec.f14b19"
       ]
     ]
   },
   {
-    "id": "ce1fcbcf.439b7",
+    "id": "e2067ae4.4ae0a8",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4637.017318725586,
-    "y": 2359.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 4579.017318725586,
+    "y": 2381.4261169433594,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "20c12f13.f01e2",
+    "id": "ff2bf803.a9fa88",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4730.400161743164,
-    "y": 1995.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4672.400161743164,
+    "y": 2017.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2b8eec9f.d7eabc"
+        "a1443a9c.9bc758"
       ]
     ]
   },
   {
-    "id": "6ad02bf1.79a934",
+    "id": "ad74d99d.0df72",
     "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": 4332.400161743164,
-    "y": 1991.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4274.400161743164,
+    "y": 2013.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "656e6085.f2c5b8"
+        "aec2208e.63a7a"
       ]
     ]
   },
   {
-    "id": "656e6085.f2c5b8",
+    "id": "aec2208e.63a7a",
     "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": 4527.400161743164,
-    "y": 1991.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4469.400161743164,
+    "y": 2013.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "20c12f13.f01e2",
-        "f43b8884.ec34f"
+        "ff2bf803.a9fa88",
+        "8efacaf4.128aa8"
       ]
     ]
   },
   {
-    "id": "f43b8884.ec34f",
+    "id": "8efacaf4.128aa8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4732.400161743164,
-    "y": 2068.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4674.400161743164,
+    "y": 2090.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "16e499c4.79bb2e"
+        "2140dc16.b34c34"
       ]
     ]
   },
   {
-    "id": "4c6f5d99.cc2504",
+    "id": "153d06ec.f14b19",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4862.017318725586,
-    "y": 2316.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 4804.017318725586,
+    "y": 2338.4261169433594,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "955e8579.618ad8"
+        "dc9300dc.915278"
       ]
     ]
   },
   {
-    "id": "955e8579.618ad8",
+    "id": "dc9300dc.915278",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5020.017318725586,
-    "y": 2316.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 4962.017318725586,
+    "y": 2338.4261169433594,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7f2dc653.30af1"
+        "1236d7b2.067398"
       ]
     ]
   },
   {
-    "id": "7f2dc653.30af1",
+    "id": "1236d7b2.067398",
     "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": 5227.017318725586,
-    "y": 2316.626174926758,
-    "z": "3edf77d7.add3c",
+    "x": 5169.017318725586,
+    "y": 2338.4261169433594,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2b8eec9f.d7eabc",
+    "id": "a1443a9c.9bc758",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4907.400161743164,
-    "y": 1987.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4849.400161743164,
+    "y": 2009.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6743bfb3.fe491",
-        "f129d672.d83d38"
+        "206cd74a.090e9",
+        "743406a2.17f9a"
       ]
     ]
   },
   {
-    "id": "f129d672.d83d38",
+    "id": "743406a2.17f9a",
     "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": 5115.400161743164,
-    "y": 1994.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5057.400161743164,
+    "y": 2016.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2fcdf070.6eea68",
-        "1f831cdc.092a93",
-        "38d0f9ee.3ac5f6"
+        "c6f1bea4.57dda",
+        "1229be89.7bda19",
+        "b62eac2a.e73c5"
       ]
     ]
   },
   {
-    "id": "16e499c4.79bb2e",
+    "id": "2140dc16.b34c34",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4909.400161743164,
-    "y": 2060.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 4851.400161743164,
+    "y": 2082.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7af0e2e8.47fa2c"
+        "348e5ae6.fa6196"
       ]
     ]
   },
   {
-    "id": "6743bfb3.fe491",
+    "id": "206cd74a.090e9",
     "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": 5145.400161743164,
-    "y": 1942.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5087.400161743164,
+    "y": 1964.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7af0e2e8.47fa2c",
+    "id": "348e5ae6.fa6196",
     "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": 5144.400161743164,
-    "y": 2184.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5086.400161743164,
+    "y": 2206.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2fcdf070.6eea68",
+    "id": "c6f1bea4.57dda",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5325.400161743164,
-    "y": 1985.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5267.400161743164,
+    "y": 2007.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c8f2d024.71cdc8"
+        "55a3e51f.c94c6c"
       ]
     ]
   },
   {
-    "id": "1f831cdc.092a93",
+    "id": "1229be89.7bda19",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5317.400161743164,
-    "y": 2040.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5259.400161743164,
+    "y": 2062.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "67195fbd.2c818"
+        "dd96fb81.a1be5"
       ]
     ]
   },
   {
-    "id": "38d0f9ee.3ac5f6",
+    "id": "b62eac2a.e73c5",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5322.400161743164,
-    "y": 2097.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5264.400161743164,
+    "y": 2119.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a92d2828.f616b8"
+        "367deba0.342ae4"
       ]
     ]
   },
   {
-    "id": "a92d2828.f616b8",
+    "id": "367deba0.342ae4",
     "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": 5474.400161743164,
-    "y": 2098.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5416.400161743164,
+    "y": 2120.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "67195fbd.2c818",
+    "id": "dd96fb81.a1be5",
     "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": 5485.400161743164,
-    "y": 2043.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5427.400161743164,
+    "y": 2065.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c8f2d024.71cdc8",
+    "id": "55a3e51f.c94c6c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5469.782485961914,
-    "y": 1982.9415435791016,
-    "z": "3edf77d7.add3c",
+    "x": 5411.782485961914,
+    "y": 2004.7414855957031,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2e63be54.b089ca"
+        "37dd91fc.28526e"
       ]
     ]
   },
   {
-    "id": "2e63be54.b089ca",
+    "id": "37dd91fc.28526e",
     "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": 5684.400161743164,
-    "y": 1979.285873413086,
-    "z": "3edf77d7.add3c",
+    "x": 5626.400161743164,
+    "y": 2001.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7237f1d4.deff98",
+    "id": "d0d8e8f0.a69bb8",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 5713.900161743164,
-    "y": 2102.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 5655.900161743164,
+    "y": 2123.852294921875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f8b29c6c.19b2e8",
+    "id": "98d8658a.1dab08",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5686.016860961914,
-    "y": 2151.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5628.016860961914,
+    "y": 2172.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6fed43d1.51eac4"
+        "420f2345.5b5d34"
       ]
     ]
   },
   {
-    "id": "6fed43d1.51eac4",
+    "id": "420f2345.5b5d34",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5877.016860961914,
-    "y": 2155.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5819.016860961914,
+    "y": 2176.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "419e36dc.a0f56"
+        "661df626.a6b8e8"
       ]
     ]
   },
   {
-    "id": "419e36dc.a0f56",
+    "id": "661df626.a6b8e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6004.016860961914,
-    "y": 2154.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5946.016860961914,
+    "y": 2175.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "38e4a1b4.0b7b5e",
-        "e98accf8.e7a08"
+        "329453e7.3a09dc",
+        "8b47742b.726f38"
       ]
     ]
   },
   {
-    "id": "e98accf8.e7a08",
+    "id": "8b47742b.726f38",
     "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",
+    "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<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6226.016860961914,
-    "y": 2043.1690521240234,
-    "z": "3edf77d7.add3c",
+    "x": 6168.016860961914,
+    "y": 2064.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "38e4a1b4.0b7b5e",
+    "id": "329453e7.3a09dc",
     "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": 6221.900161743164,
-    "y": 2102.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6163.900161743164,
+    "y": 2123.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d45ed8c9.67af08",
-        "a74deeb1.a26ec"
+        "7670a585.4e8fa4",
+        "7f78162d.05f38"
       ]
     ]
   },
   {
-    "id": "d45ed8c9.67af08",
+    "id": "7670a585.4e8fa4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6431.900161743164,
-    "y": 2079.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6373.900161743164,
+    "y": 2100.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c2c70bd5.e2175"
+        "36156797.814718"
       ]
     ]
   },
   {
-    "id": "c2c70bd5.e2175",
+    "id": "36156797.814718",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6557.900161743164,
-    "y": 2079.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6499.900161743164,
+    "y": 2100.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b21cfff5.d8a4c8"
+        "c10b0555.a1cbe"
       ]
     ]
   },
   {
-    "id": "92db42c4.6a4d78",
+    "id": "802f927b.0dcdb",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6562.900161743164,
-    "y": 2128.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6504.900161743164,
+    "y": 2149.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a32c1047.9c5c8",
-        "eadb0235.467f7",
-        "5b398d7f.65258c",
-        "7c47a5bb.9c9814"
+        "2a6e1393.0f0b94",
+        "ec798eb.b40ea7",
+        "21b7fb79.312cdc",
+        "b8684fe1.88dea8"
       ]
     ]
   },
   {
-    "id": "a74deeb1.a26ec",
+    "id": "7f78162d.05f38",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6436.900161743164,
-    "y": 2128.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6378.900161743164,
+    "y": 2149.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "92db42c4.6a4d78"
+        "802f927b.0dcdb"
       ]
     ]
   },
   {
-    "id": "b21cfff5.d8a4c8",
+    "id": "c10b0555.a1cbe",
     "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": 6885.900161743164,
-    "y": 2076.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6827.900161743164,
+    "y": 2097.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a32c1047.9c5c8",
+    "id": "2a6e1393.0f0b94",
     "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": 6838.900161743164,
-    "y": 2167.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6780.900161743164,
+    "y": 2188.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "eadb0235.467f7",
+    "id": "ec798eb.b40ea7",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 6786.900161743164,
-    "y": 2209.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6728.900161743164,
+    "y": 2230.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "5b398d7f.65258c",
+    "id": "21b7fb79.312cdc",
     "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": 6915.900161743164,
-    "y": 2251.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6857.900161743164,
+    "y": 2272.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9878fd26.fb04",
+    "id": "9b3b3d66.43cb88",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6801.900161743164,
-    "y": 2124.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6743.900161743164,
+    "y": 2145.852294921875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7c47a5bb.9c9814",
+    "id": "b8684fe1.88dea8",
     "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": 6893.900161743164,
-    "y": 2299.0523529052734,
-    "z": "3edf77d7.add3c",
+    "x": 6835.900161743164,
+    "y": 2320.852294921875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "374c089f.fa2538",
+    "id": "d8f4cd5c.153e9",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6457.900161743164,
-    "y": 2795.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 6399.900161743164,
+    "y": 2817.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e0f14a64.4f8738"
+        "1ca77427.cfd00c"
       ]
     ]
   },
   {
-    "id": "e0f14a64.4f8738",
+    "id": "1ca77427.cfd00c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6649.900161743164,
-    "y": 2790.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 6591.900161743164,
+    "y": 2812.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "db26ab33.fe7e58"
+        "d48a28e3.978788"
       ]
     ]
   },
   {
-    "id": "db26ab33.fe7e58",
+    "id": "d48a28e3.978788",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6778.900161743164,
-    "y": 2790.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 6720.900161743164,
+    "y": 2812.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "26e82d17.b3e8e2"
+        "cd4e9669.2bbe38"
       ]
     ]
   },
   {
-    "id": "26e82d17.b3e8e2",
+    "id": "cd4e9669.2bbe38",
     "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": 7110.900161743164,
-    "y": 2788.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 7052.900161743164,
+    "y": 2810.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "c9cb4066.4924",
+    "id": "96928e3.987df7",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6042.900161743164,
-    "y": 3007.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 5984.900161743164,
+    "y": 3029.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2a720623.f2b5c2"
+        "181572ea.9107d5"
       ]
     ]
   },
   {
-    "id": "2a720623.f2b5c2",
+    "id": "181572ea.9107d5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6222.900161743164,
-    "y": 3006.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 6164.900161743164,
+    "y": 3028.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "af745266.aa6"
+        "8cd8419f.cb3a9"
       ]
     ]
   },
   {
-    "id": "af745266.aa6",
+    "id": "8cd8419f.cb3a9",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6351.900161743164,
-    "y": 3006.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 6293.900161743164,
+    "y": 3028.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "981d0119.b686c"
+        "d6cc041.8a7c3f8"
       ]
     ]
   },
   {
-    "id": "981d0119.b686c",
+    "id": "d6cc041.8a7c3f8",
     "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": 6569.783462524414,
-    "y": 3005.7357025146484,
-    "z": "3edf77d7.add3c",
+    "x": 6511.783462524414,
+    "y": 3027.53564453125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "365c0f8e.cfd0e"
+        "b0604621.14aa3"
       ]
     ]
   },
   {
-    "id": "365c0f8e.cfd0e",
+    "id": "b0604621.14aa3",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6784.783462524414,
-    "y": 3005.7357025146484,
-    "z": "3edf77d7.add3c",
+    "x": 6726.783462524414,
+    "y": 3027.53564453125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5255edd.4efb714"
+        "1b23239.265d75c"
       ]
     ]
   },
   {
-    "id": "5255edd.4efb714",
+    "id": "1b23239.265d75c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6916.783462524414,
-    "y": 3005.7357025146484,
-    "z": "3edf77d7.add3c",
+    "x": 6858.783462524414,
+    "y": 3027.53564453125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d5b5d130.3528a"
+        "e0661126.3d63c"
       ]
     ]
   },
   {
-    "id": "d5b5d130.3528a",
+    "id": "e0661126.3d63c",
     "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": 7280.900161743164,
-    "y": 3004.8524017333984,
-    "z": "3edf77d7.add3c",
+    "x": 7222.900161743164,
+    "y": 3026.65234375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "615783e8.7114bc",
+    "id": "ba199ac4.fb848",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5013.399185180664,
-    "y": 2655.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 4955.399185180664,
+    "y": 2677.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b5a2c9a9.2d0b1"
+        "3b9234ec.069ca4"
       ]
     ]
   },
   {
-    "id": "b5a2c9a9.2d0b1",
+    "id": "3b9234ec.069ca4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5193.399185180664,
-    "y": 2654.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5135.399185180664,
+    "y": 2676.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "38f8112d.6307b6"
+        "9eae322e.b63d4"
       ]
     ]
   },
   {
-    "id": "38f8112d.6307b6",
+    "id": "9eae322e.b63d4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5322.399185180664,
-    "y": 2654.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5264.399185180664,
+    "y": 2676.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "73260aa7.cfafe4"
+        "d93117f0.529c08"
       ]
     ]
   },
   {
-    "id": "3fb31c3b.d5983c",
+    "id": "eef4e51b.ad8f08",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5058.399185180664,
-    "y": 2713.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5000.399185180664,
+    "y": 2735.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "73260aa7.cfafe4",
+    "id": "d93117f0.529c08",
     "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": 5088.399185180664,
-    "y": 2746.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5030.399185180664,
+    "y": 2768.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4f61494b.d04d88",
-        "50778a9c.0e895c",
-        "979ddcd.34a972"
+        "cef39c15.c2efe8",
+        "19cfaa23.53868e",
+        "3979c231.eba74e"
       ]
     ]
   },
   {
-    "id": "50778a9c.0e895c",
+    "id": "19cfaa23.53868e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5269.890151977539,
-    "y": 2723.9932708740234,
-    "z": "3edf77d7.add3c",
+    "x": 5211.890151977539,
+    "y": 2745.793212890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "67ea0823.c7b72"
+        "11983801.6e819"
       ]
     ]
   },
   {
-    "id": "979ddcd.34a972",
+    "id": "3979c231.eba74e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5258.399185180664,
-    "y": 2763.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5200.399185180664,
+    "y": 2785.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c80cb8af.ac2d48"
+        "df1ec346.4539a"
       ]
     ]
   },
   {
-    "id": "67ea0823.c7b72",
+    "id": "11983801.6e819",
     "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": 5429.461685180664,
-    "y": 2722.2789154052734,
-    "z": "3edf77d7.add3c",
+    "x": 5371.461685180664,
+    "y": 2744.078857421875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c80cb8af.ac2d48",
+    "id": "df1ec346.4539a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5419.399185180664,
-    "y": 2764.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5361.399185180664,
+    "y": 2786.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4f61494b.d04d88",
+    "id": "cef39c15.c2efe8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5263.399185180664,
-    "y": 2800.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5205.399185180664,
+    "y": 2822.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ef6cfd54.d63cb8"
+        "ce54950d.a0123"
       ]
     ]
   },
   {
-    "id": "ef6cfd54.d63cb8",
+    "id": "ce54950d.a0123",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5421.399185180664,
-    "y": 2808.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5363.399185180664,
+    "y": 2830.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d727e5a5.b31118",
-        "c17b79a.0f49c88"
+        "f7f8d3b0.147e88",
+        "b341778e.b63ef8"
       ]
     ]
   },
   {
-    "id": "d727e5a5.b31118",
+    "id": "f7f8d3b0.147e88",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 5582.399185180664,
-    "y": 2740.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5524.399185180664,
+    "y": 2762.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c17b79a.0f49c88",
+    "id": "b341778e.b63ef8",
     "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": 5624.399185180664,
-    "y": 2812.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5566.399185180664,
+    "y": 2834.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9c79a60.2e838d8",
+    "id": "8414e4a1.38b9c8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5100.399185180664,
-    "y": 3013.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5042.399185180664,
+    "y": 3035.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c138ef39.513f8"
+        "671d16b.b80a7e8"
       ]
     ]
   },
   {
-    "id": "c138ef39.513f8",
+    "id": "671d16b.b80a7e8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5280.399185180664,
-    "y": 3012.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5222.399185180664,
+    "y": 3034.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8ad866ac.595d58"
+        "119e2009.a17608"
       ]
     ]
   },
   {
-    "id": "8ad866ac.595d58",
+    "id": "119e2009.a17608",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5409.399185180664,
-    "y": 3012.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5351.399185180664,
+    "y": 3034.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "17191cff.7c3d3b"
+        "473f5087.37a1e8"
       ]
     ]
   },
   {
-    "id": "2bf187fb.3634e8",
+    "id": "5e936e89.558fa8",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5145.399185180664,
-    "y": 3071.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5087.399185180664,
+    "y": 3093.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "17191cff.7c3d3b",
+    "id": "473f5087.37a1e8",
     "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": 5175.399185180664,
-    "y": 3104.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5117.399185180664,
+    "y": 3126.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e2951a5a.6753c8",
-        "f24616d3.430fb8",
-        "57d651f0.348b08"
+        "d9f85915.dda38",
+        "24241f4e.c44408",
+        "225969a9.a7207e"
       ]
     ]
   },
   {
-    "id": "f24616d3.430fb8",
+    "id": "24241f4e.c44408",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5356.890151977539,
-    "y": 3081.9932708740234,
-    "z": "3edf77d7.add3c",
+    "x": 5298.890151977539,
+    "y": 3103.793212890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c95458c9.25b988"
+        "96c74d33.8dbf8"
       ]
     ]
   },
   {
-    "id": "57d651f0.348b08",
+    "id": "225969a9.a7207e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5345.399185180664,
-    "y": 3121.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5287.399185180664,
+    "y": 3143.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "59776330.9b2ecc"
+        "591af841.3626"
       ]
     ]
   },
   {
-    "id": "c95458c9.25b988",
+    "id": "96c74d33.8dbf8",
     "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": 5516.461685180664,
-    "y": 3080.2789154052734,
-    "z": "3edf77d7.add3c",
+    "x": 5458.461685180664,
+    "y": 3102.078857421875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "59776330.9b2ecc",
+    "id": "591af841.3626",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5506.399185180664,
-    "y": 3122.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5448.399185180664,
+    "y": 3144.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e2951a5a.6753c8",
+    "id": "d9f85915.dda38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5350.399185180664,
-    "y": 3158.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5292.399185180664,
+    "y": 3180.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1f0787c1.98ffc"
+        "211d205d.25f7f"
       ]
     ]
   },
   {
-    "id": "1f0787c1.98ffc",
+    "id": "211d205d.25f7f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5508.399185180664,
-    "y": 3166.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5450.399185180664,
+    "y": 3188.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4ff50da8.51bbec",
-        "fc471e6.a2d406"
+        "d0bfd54a.d36bc8",
+        "7dc2fca0.94494c"
       ]
     ]
   },
   {
-    "id": "4ff50da8.51bbec",
+    "id": "d0bfd54a.d36bc8",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 5669.399185180664,
-    "y": 3098.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5611.399185180664,
+    "y": 3120.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fc471e6.a2d406",
+    "id": "7dc2fca0.94494c",
     "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": 5711.399185180664,
-    "y": 3170.4190521240234,
-    "z": "3edf77d7.add3c",
+    "x": 5653.399185180664,
+    "y": 3192.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "2987a87c.d9af38",
+    "id": "3f0ddd6.f3f1022",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3582.066665649414,
-    "y": 4595.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3524.066665649414,
+    "y": 4617.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "101679fa.cd8636"
+        "358e9751.c712f"
       ]
     ]
   },
   {
-    "id": "101679fa.cd8636",
+    "id": "358e9751.c712f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3762.066665649414,
-    "y": 4594.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3704.066665649414,
+    "y": 4616.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a4d69355.b5e7f8"
+        "6884e019.44294"
       ]
     ]
   },
   {
-    "id": "a4d69355.b5e7f8",
+    "id": "6884e019.44294",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3891.066665649414,
-    "y": 4594.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3833.066665649414,
+    "y": 4616.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "42187454.b3e72c"
+        "5116cf4b.8d29a"
       ]
     ]
   },
   {
-    "id": "8dc12596.0dad2",
+    "id": "bd6b4020.6dbe8",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3627.066665649414,
-    "y": 4653.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3569.066665649414,
+    "y": 4675.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "42187454.b3e72c",
+    "id": "5116cf4b.8d29a",
     "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": 3657.066665649414,
-    "y": 4686.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3599.066665649414,
+    "y": 4708.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "53201291.0789d4",
-        "6de03a2b.1543fc",
-        "13099433.0c6bc4"
+        "2e2530b5.6396c8",
+        "a3a43577.5b69d",
+        "ed68f855.e91bf8"
       ]
     ]
   },
   {
-    "id": "6de03a2b.1543fc",
+    "id": "a3a43577.5b69d",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3838.557632446289,
-    "y": 4663.993270874023,
-    "z": "3edf77d7.add3c",
+    "x": 3780.557632446289,
+    "y": 4685.793212890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "328b19c8.a304fe"
+        "86842579.52f86"
       ]
     ]
   },
   {
-    "id": "13099433.0c6bc4",
+    "id": "ed68f855.e91bf8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3827.066665649414,
-    "y": 4703.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3769.066665649414,
+    "y": 4725.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "693d642a.e0385c"
+        "73eac34a.dab10c"
       ]
     ]
   },
   {
-    "id": "328b19c8.a304fe",
+    "id": "86842579.52f86",
     "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": 3998.129165649414,
-    "y": 4662.278915405273,
-    "z": "3edf77d7.add3c",
+    "x": 3940.129165649414,
+    "y": 4684.078857421875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "693d642a.e0385c",
+    "id": "73eac34a.dab10c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3988.066665649414,
-    "y": 4704.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3930.066665649414,
+    "y": 4726.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "53201291.0789d4",
+    "id": "2e2530b5.6396c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3832.066665649414,
-    "y": 4740.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3774.066665649414,
+    "y": 4762.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "def4b54e.65d1b"
+        "744d2f9d.2ccba"
       ]
     ]
   },
   {
-    "id": "def4b54e.65d1b",
+    "id": "744d2f9d.2ccba",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3990.066665649414,
-    "y": 4748.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 3932.066665649414,
+    "y": 4770.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c5033189.07a6e8",
-        "bea5279c.558ed8"
+        "e108af78.2fc248",
+        "9bbc731d.e00988"
       ]
     ]
   },
   {
-    "id": "c5033189.07a6e8",
+    "id": "e108af78.2fc248",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4151.066665649414,
-    "y": 4680.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4093.066665649414,
+    "y": 4702.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bea5279c.558ed8",
+    "id": "9bbc731d.e00988",
     "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": 4193.066665649414,
-    "y": 4752.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4135.066665649414,
+    "y": 4774.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "be749200.95b238",
+    "id": "75777f0a.fb1b9",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4273.733657836914,
-    "y": 5550.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4215.733657836914,
+    "y": 5572.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b311bb82.023748",
+    "id": "4f6ebd11.7928d4",
     "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": 4428.733657836914,
-    "y": 5591.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4370.733657836914,
+    "y": 5613.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f2f4b1c2.9aee8",
+    "id": "53cb53b2.198aa4",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4244.733657836914,
-    "y": 5649.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4186.733657836914,
+    "y": 5671.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7d42099c.1673f8",
-        "afcc0a1f.ae4ca8"
+        "7b1794a5.b1fc24",
+        "60cb3386.52366c"
       ]
     ]
   },
   {
-    "id": "7d42099c.1673f8",
+    "id": "7b1794a5.b1fc24",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4480.733657836914,
-    "y": 5633.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4422.733657836914,
+    "y": 5655.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1db6f77.6e57a09"
+        "d1b5ec1f.66461"
       ]
     ]
   },
   {
-    "id": "afcc0a1f.ae4ca8",
+    "id": "60cb3386.52366c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4479.733657836914,
-    "y": 5681.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4421.733657836914,
+    "y": 5703.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "1db6f77.6e57a09",
+    "id": "d1b5ec1f.66461",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4624.733657836914,
-    "y": 5635.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4566.733657836914,
+    "y": 5657.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "435458de.d8d258",
-        "fe506663.263e38",
-        "7c36c2be.89228c"
+        "2e676cc9.ce26a4",
+        "6e286f3d.8e0a28",
+        "e2964af9.ec57d8"
       ]
     ]
   },
   {
-    "id": "435458de.d8d258",
+    "id": "2e676cc9.ce26a4",
     "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": 5036.733901977539,
-    "y": 5770.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4978.733901977539,
+    "y": 5792.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fe506663.263e38",
+    "id": "6e286f3d.8e0a28",
     "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": 5157.733901977539,
-    "y": 5817.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5099.733901977539,
+    "y": 5839.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a2e81b2.7cd548",
+    "id": "a459d12f.16fa1",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5040.617691040039,
-    "y": 5861.302352905273,
-    "z": "3edf77d7.add3c",
+    "x": 4982.617691040039,
+    "y": 5883.102294921875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7c36c2be.89228c",
+    "id": "e2964af9.ec57d8",
     "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": 5039.400894165039,
-    "y": 5902.502548217773,
-    "z": "3edf77d7.add3c",
+    "x": 4981.400894165039,
+    "y": 5924.302490234375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4c09fba5.801644",
+    "id": "f2f8d85f.c68ad8",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4900.066665649414,
-    "y": 6156.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4842.066665649414,
+    "y": 6178.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2fa7a2c0.97e2e6",
+    "id": "9cfb7864.e0e548",
     "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": 5066.066665649414,
-    "y": 6195.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5008.066665649414,
+    "y": 6217.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ed4e275a.a600a",
+    "id": "98761b9f.ff6118",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4905.066665649414,
-    "y": 6245.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 4847.066665649414,
+    "y": 6267.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5ed92a8d.935c6c",
-        "3b32d9b.10ad726"
+        "ebc03603.139de",
+        "22cd6c36.3aa1dc"
       ]
     ]
   },
   {
-    "id": "5ed92a8d.935c6c",
+    "id": "ebc03603.139de",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5138.066665649414,
-    "y": 6239.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5080.066665649414,
+    "y": 6261.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4b8f3c41.8b089c"
+        "3bf7ac87.926a04"
       ]
     ]
   },
   {
-    "id": "3b32d9b.10ad726",
+    "id": "22cd6c36.3aa1dc",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5139.066665649414,
-    "y": 6289.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5081.066665649414,
+    "y": 6311.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4b8f3c41.8b089c",
+    "id": "3bf7ac87.926a04",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5285.066665649414,
-    "y": 6247.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5227.066665649414,
+    "y": 6269.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "980344cd.e7e958",
-        "6a19d23d.0e42e4",
-        "b0adad9f.731368"
+        "7682c7bc.9b0958",
+        "fc925053.188248",
+        "d17759a6.e157b"
       ]
     ]
   },
   {
-    "id": "980344cd.e7e958",
+    "id": "7682c7bc.9b0958",
     "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": 5532.066665649414,
-    "y": 6235.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5474.066665649414,
+    "y": 6257.218994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6a19d23d.0e42e4",
+    "id": "fc925053.188248",
     "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": 5653.066665649414,
-    "y": 6282.419052124023,
-    "z": "3edf77d7.add3c",
+    "x": 5595.066665649414,
+    "y": 6304.218994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "351a146f.cf6ee4",
+    "id": "a868892a.829a98",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5535.950454711914,
-    "y": 6326.302352905273,
-    "z": "3edf77d7.add3c",
+    "x": 5477.950454711914,
+    "y": 6348.102294921875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b0adad9f.731368",
+    "id": "d17759a6.e157b",
     "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": 5534.733657836914,
-    "y": 6367.502548217773,
-    "z": "3edf77d7.add3c",
+    "x": 5476.733657836914,
+    "y": 6389.302490234375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "62fdede4.849824",
+    "id": "b6de4106.8135",
     "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": 3662.066665649414,
-    "y": 6140.852645874023,
-    "z": "3edf77d7.add3c",
+    "x": 3604.066665649414,
+    "y": 6162.652587890625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "dfc7a62b.53e19",
+    "id": "37dc60ca.62221",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2999.316665649414,
-    "y": 6139.102645874023,
-    "z": "3edf77d7.add3c",
+    "x": 2941.316665649414,
+    "y": 6160.902587890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4e06d40d.0d98f4",
-        "2df2f3f0.950c74"
+        "196d7b7.c07cd85",
+        "bc377eb3.be507"
       ]
     ]
   },
   {
-    "id": "4e06d40d.0d98f4",
+    "id": "196d7b7.c07cd85",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3190.316665649414,
-    "y": 6143.102645874023,
-    "z": "3edf77d7.add3c",
+    "x": 3132.316665649414,
+    "y": 6164.902587890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7ac2dc81.94449c"
+        "65fedbab.47a65c"
       ]
     ]
   },
   {
-    "id": "7ac2dc81.94449c",
+    "id": "65fedbab.47a65c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3317.316665649414,
-    "y": 6142.102645874023,
-    "z": "3edf77d7.add3c",
+    "x": 3259.316665649414,
+    "y": 6163.902587890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "62fdede4.849824"
+        "b6de4106.8135"
       ]
     ]
   },
   {
-    "id": "2df2f3f0.950c74",
+    "id": "bc377eb3.be507",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3186.316665649414,
-    "y": 6213.102645874023,
-    "z": "3edf77d7.add3c",
+    "x": 3128.316665649414,
+    "y": 6234.902587890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4a8e4e30.44e1e8"
+        "e0efce2f.f6bfe"
       ]
     ]
   },
   {
-    "id": "717a4778.c8606",
+    "id": "7ecde40.b1b951c",
     "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": 3735.816665649414,
-    "y": 6212.186141967773,
-    "z": "3edf77d7.add3c",
+    "x": 3677.816665649414,
+    "y": 6233.986083984375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a8e4e30.44e1e8",
+    "id": "e0efce2f.f6bfe",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3319.816665649414,
-    "y": 6215.186141967773,
-    "z": "3edf77d7.add3c",
+    "x": 3261.816665649414,
+    "y": 6236.986083984375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "717a4778.c8606"
+        "7ecde40.b1b951c"
       ]
     ]
   }