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=2e4b6b66ab696855ab33bec839a4d800e57376a8;hb=22d596935f2edeefbe3f0d5acc72cf39e27e17aa;hp=ad56b54472e028a221ab5e9c21827a942f0d31d9;hpb=b7cd528f9b720b4f820ac5eb38f01df2b16c9817;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 ad56b544..2e4b6b66 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": "d60c3cf9.321a6",
+    "id": "781e35fa.f2e1d4",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 205.88333129882812,
-    "y": 156.88333129882812,
-    "z": "7062000.f761",
+    "x": 173.88333129882812,
+    "y": 149.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cce5e3d9.59223"
+        "9e11530a.17bcb"
       ]
     ]
   },
   {
-    "id": "cce5e3d9.59223",
+    "id": "9e11530a.17bcb",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,7912 +22,8076 @@
     "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": 490.1690216064453,
-    "y": 218.12143993377686,
-    "z": "7062000.f761",
+    "x": 458.1690216064453,
+    "y": 211.12143993377686,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "73cbe8fd.7b7b"
+        "2b94c108.46c67e"
       ]
     ]
   },
   {
-    "id": "73cbe8fd.7b7b",
+    "id": "2b94c108.46c67e",
     "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": 496.3119354248047,
-    "y": 302.88336181640625,
-    "z": "7062000.f761",
+    "x": 464.3119354248047,
+    "y": 295.88336181640625,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b5475b4e.9dc8a"
+        "fc45d9d.aa25928"
       ]
     ]
   },
   {
-    "id": "b5475b4e.9dc8a",
+    "id": "fc45d9d.aa25928",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 845.8833312988281,
-    "y": 361.8833312988281,
-    "z": "7062000.f761",
+    "x": 813.8833312988281,
+    "y": 354.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "bacceb8f.95926",
-        "e0024e9e.57e7f8",
-        "6d19a9bc.4fa958"
+        "5f20119b.1c25f",
+        "440015de.6e018c",
+        "7415bdce.bb1424"
       ]
     ]
   },
   {
-    "id": "bacceb8f.95926",
+    "id": "5f20119b.1c25f",
     "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": 1147.2168273925781,
-    "y": 632.8136291503906,
-    "z": "7062000.f761",
+    "x": 1115.2168273925781,
+    "y": 625.8136291503906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e0024e9e.57e7f8",
+    "id": "440015de.6e018c",
     "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": 1168.6452941894531,
-    "y": 335.2166442871094,
-    "z": "7062000.f761",
+    "x": 1136.6452941894531,
+    "y": 328.2166442871094,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "dc9a92d7.7dd0c",
-        "68404646.133ac8",
-        "f6dee010.98fcd"
+        "12c8110b.ec9bd7",
+        "bbd39d34.8832e",
+        "23fc32e8.f22086"
       ]
     ]
   },
   {
-    "id": "dc9a92d7.7dd0c",
+    "id": "12c8110b.ec9bd7",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1393.6452941894531,
-    "y": 193.21664428710938,
-    "z": "7062000.f761",
+    "x": 1361.6452941894531,
+    "y": 186.21664428710938,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d1be34ef.26139"
+        "61f16e51.c24158"
       ]
     ]
   },
   {
-    "id": "68404646.133ac8",
+    "id": "bbd39d34.8832e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1389.1362609863281,
-    "y": 262.7906799316406,
-    "z": "7062000.f761",
+    "x": 1357.1362609863281,
+    "y": 255.79067993164062,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c39ebb83.790b68"
+        "47248fa2.17d9d"
       ]
     ]
   },
   {
-    "id": "f6dee010.98fcd",
+    "id": "23fc32e8.f22086",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1377.6452941894531,
-    "y": 309.2166442871094,
-    "z": "7062000.f761",
+    "x": 1345.6452941894531,
+    "y": 302.2166442871094,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f8b91686.4a47a8"
+        "cdbbe291.f3553"
       ]
     ]
   },
   {
-    "id": "6c16fe1b.61251",
+    "id": "493ce64.5d5d418",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1147.6452941894531,
-    "y": 223.21664428710938,
-    "z": "7062000.f761",
+    "x": 1115.6452941894531,
+    "y": 216.21664428710938,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "6d19a9bc.4fa958",
+    "id": "7415bdce.bb1424",
     "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": 1135.6452941894531,
-    "y": 275.2166442871094,
-    "z": "7062000.f761",
+    "x": 1103.6452941894531,
+    "y": 268.2166442871094,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "d1be34ef.26139",
+    "id": "61f16e51.c24158",
     "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": 1633.8833312988281,
-    "y": 189.88333129882812,
-    "z": "7062000.f761",
+    "x": 1601.8833312988281,
+    "y": 182.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "74daedf5.b00d34",
-        "3ddd8ea0.9d48e2"
+        "58e97c67.87accc",
+        "d2e64d43.49ac68"
       ]
     ]
   },
   {
-    "id": "c39ebb83.790b68",
+    "id": "47248fa2.17d9d",
     "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": 1543.9457092285156,
-    "y": 265.74310302734375,
-    "z": "7062000.f761",
+    "x": 1511.9457092285156,
+    "y": 258.74310302734375,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f8b91686.4a47a8",
+    "id": "cdbbe291.f3553",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1547.8833312988281,
-    "y": 309.8833312988281,
-    "z": "7062000.f761",
+    "x": 1515.8833312988281,
+    "y": 302.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "74daedf5.b00d34",
+    "id": "58e97c67.87accc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1838.8833312988281,
-    "y": 226.88333129882812,
-    "z": "7062000.f761",
+    "x": 1806.8833312988281,
+    "y": 219.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "50897ba7.acdc24"
+        "c54a8c68.c345e"
       ]
     ]
   },
   {
-    "id": "3ddd8ea0.9d48e2",
+    "id": "d2e64d43.49ac68",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1848.8833312988281,
-    "y": 153.88333129882812,
-    "z": "7062000.f761",
+    "x": 1816.8833312988281,
+    "y": 146.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "50897ba7.acdc24",
+    "id": "c54a8c68.c345e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1831.8833312988281,
-    "y": 301.8833312988281,
-    "z": "7062000.f761",
+    "x": 1799.8833312988281,
+    "y": 294.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "25219f6c.9cf818",
-        "166df7f7.8cb52",
-        "35f1defb.605572",
-        "f67d2f30.77ecd8",
-        "2530e84c.0abb78"
+        "27adf24c.af1566",
+        "31a766ce.e0455a",
+        "7436fd76.690054",
+        "2b9d3039.23a428",
+        "2f2ed9c0.e0663e"
       ]
     ]
   },
   {
-    "id": "e3fc1b13.141158",
+    "id": "d2a449e8.f07b58",
     "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": 2317.883331298828,
-    "y": 352.8833312988281,
-    "z": "7062000.f761",
+    "x": 2285.883331298828,
+    "y": 345.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "792e0cb6.295efc",
-        "9cda4258.33c028",
-        "8ec312be.acb358"
+        "41c867c6.b55cd8",
+        "84c1b468.c04558",
+        "621effb3.a9e918"
       ]
     ]
   },
   {
-    "id": "792e0cb6.295efc",
+    "id": "41c867c6.b55cd8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2533.883331298828,
-    "y": 419.8833312988281,
-    "z": "7062000.f761",
+    "x": 2501.883331298828,
+    "y": 412.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d2a1ae9f.45e878"
+        "821dc5ef.6d3aa8"
       ]
     ]
   },
   {
-    "id": "9cda4258.33c028",
+    "id": "84c1b468.c04558",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2534.374298095703,
-    "y": 319.4573059082031,
-    "z": "7062000.f761",
+    "x": 2502.374298095703,
+    "y": 312.4573059082031,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5f00fc5b.612da4"
+        "4a81091b.110a38"
       ]
     ]
   },
   {
-    "id": "8ec312be.acb358",
+    "id": "621effb3.a9e918",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2529.883331298828,
-    "y": 368.8833312988281,
-    "z": "7062000.f761",
+    "x": 2497.883331298828,
+    "y": 361.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "24485e5a.4004d2"
+        "6269ae05.e67ee8"
       ]
     ]
   },
   {
-    "id": "25219f6c.9cf818",
+    "id": "27adf24c.af1566",
     "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": 2034.8833312988281,
-    "y": 333.8833312988281,
-    "z": "7062000.f761",
+    "x": 2002.8833312988281,
+    "y": 326.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e97f59ea.8d55",
-        "e3fc1b13.141158",
-        "dca67cc5.30d2f8",
-        "ce64f5e6.94469"
+        "2c28c5a4.c9fc4a",
+        "d2a449e8.f07b58",
+        "42097510.f58b64",
+        "7a55e6a1.70e4b"
       ]
     ]
   },
   {
-    "id": "e97f59ea.8d55",
+    "id": "2c28c5a4.c9fc4a",
     "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": 2314.883331298828,
-    "y": 271.8833312988281,
-    "z": "7062000.f761",
+    "x": 2282.883331298828,
+    "y": 264.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f67d2f30.77ecd8",
+    "id": "2b9d3039.23a428",
     "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": 2008.8833312988281,
-    "y": 283.8833312988281,
-    "z": "7062000.f761",
+    "x": 1976.8833312988281,
+    "y": 276.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "166df7f7.8cb52",
+    "id": "31a766ce.e0455a",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2051.883331298828,
-    "y": 142.88333129882812,
-    "z": "7062000.f761",
+    "x": 2019.8833312988281,
+    "y": 135.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "35f1defb.605572",
+    "id": "7436fd76.690054",
     "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": 2063.883331298828,
-    "y": 183.88333129882812,
-    "z": "7062000.f761",
+    "x": 2031.8833312988281,
+    "y": 176.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "2302212a.18d7a6",
+    "id": "e57021b1.8566f8",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2088.883331298828,
-    "y": 95.88333129882812,
-    "z": "7062000.f761",
+    "x": 2056.883331298828,
+    "y": 88.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "67aae728.5fece",
+    "id": "f75cee20.f52e5",
     "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": 2008.8833312988281,
-    "y": 229.88333129882812,
-    "z": "7062000.f761",
+    "x": 1976.8833312988281,
+    "y": 222.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5f00fc5b.612da4",
+    "id": "4a81091b.110a38",
     "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": 2712.883331298828,
-    "y": 321.8833312988281,
-    "z": "7062000.f761",
+    "x": 2680.883331298828,
+    "y": 314.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "24485e5a.4004d2",
+    "id": "6269ae05.e67ee8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2712.820831298828,
-    "y": 371.0235900878906,
-    "z": "7062000.f761",
+    "x": 2680.820831298828,
+    "y": 364.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d2a1ae9f.45e878",
+    "id": "821dc5ef.6d3aa8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2714.820831298828,
-    "y": 422.0235900878906,
-    "z": "7062000.f761",
+    "x": 2682.820831298828,
+    "y": 415.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "61c50290.a54bf4"
+        "2337e3a2.faa61c"
       ]
     ]
   },
   {
-    "id": "61c50290.a54bf4",
+    "id": "2337e3a2.faa61c",
     "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": 3007.820831298828,
-    "y": 369.0235900878906,
-    "z": "7062000.f761",
+    "x": 2975.820831298828,
+    "y": 362.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d79412d7.a6c38",
-        "3f6fbc64.721af4",
-        "a6250e3f.f36fa"
+        "cccd155c.90e07",
+        "b9a7ac6e.7fea5",
+        "73057b22.08e1dc"
       ]
     ]
   },
   {
-    "id": "3f6fbc64.721af4",
+    "id": "b9a7ac6e.7fea5",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3281.311798095703,
-    "y": 261.5975646972656,
-    "z": "7062000.f761",
+    "x": 3249.311798095703,
+    "y": 254.59756469726562,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "16afc6a3.6b5401"
+        "e5cee345.1eaae"
       ]
     ]
   },
   {
-    "id": "16afc6a3.6b5401",
+    "id": "e5cee345.1eaae",
     "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": 3458.883331298828,
-    "y": 261.8833312988281,
-    "z": "7062000.f761",
+    "x": 3426.883331298828,
+    "y": 254.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a6250e3f.f36fa",
+    "id": "73057b22.08e1dc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3276.820831298828,
-    "y": 311.0235900878906,
-    "z": "7062000.f761",
+    "x": 3244.820831298828,
+    "y": 304.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5cebea40.e205d4"
+        "f16a75f9.e23598"
       ]
     ]
   },
   {
-    "id": "5cebea40.e205d4",
+    "id": "f16a75f9.e23598",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3458.820831298828,
-    "y": 311.0235900878906,
-    "z": "7062000.f761",
+    "x": 3426.820831298828,
+    "y": 304.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d79412d7.a6c38",
+    "id": "cccd155c.90e07",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3280.820831298828,
-    "y": 362.0235900878906,
-    "z": "7062000.f761",
+    "x": 3248.820831298828,
+    "y": 355.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9ae7a072.d1e518"
+        "e05a51c3.eb7208"
       ]
     ]
   },
   {
-    "id": "9ae7a072.d1e518",
+    "id": "e05a51c3.eb7208",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3460.820831298828,
-    "y": 362.0235900878906,
-    "z": "7062000.f761",
+    "x": 3428.820831298828,
+    "y": 355.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "360b8115.051b46"
+        "a185fcaa.c01b7"
       ]
     ]
   },
   {
-    "id": "360b8115.051b46",
+    "id": "a185fcaa.c01b7",
     "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": 3026.883331298828,
-    "y": 496.8833312988281,
-    "z": "7062000.f761",
+    "x": 2994.883331298828,
+    "y": 489.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "28ab4f33.316c8",
-        "e49a7d12.f127b"
+        "64dc3552.29da24",
+        "1cf4e379.2b6355"
       ]
     ]
   },
   {
-    "id": "e49a7d12.f127b",
+    "id": "1cf4e379.2b6355",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3336.883331298828,
-    "y": 503.8833312988281,
-    "z": "7062000.f761",
+    "x": 3304.883331298828,
+    "y": 496.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "28ab4f33.316c8",
+    "id": "64dc3552.29da24",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3335.883331298828,
-    "y": 557.8833312988281,
-    "z": "7062000.f761",
+    "x": 3303.883331298828,
+    "y": 550.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "32ff3e84.f9f78a"
+        "49cf9d82.f3816c"
       ]
     ]
   },
   {
-    "id": "ac20a1c4.b5d88",
+    "id": "61811a9.92ccce4",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.883331298828,
-    "y": 511.8833312988281,
-    "z": "7062000.f761",
+    "x": 4048.883331298828,
+    "y": 504.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "eb5b39ae.c0eb7"
+        "5422df0.13119a"
       ]
     ]
   },
   {
-    "id": "eb5b39ae.c0eb7",
+    "id": "5422df0.13119a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4257.883209228516,
-    "y": 504.8832092285156,
-    "z": "7062000.f761",
+    "x": 4225.883209228516,
+    "y": 497.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c3ea0a96.012838",
-        "42443b39.66d044"
+        "cc385253.b8fbd",
+        "2cd49ffd.326448"
       ]
     ]
   },
   {
-    "id": "32ff3e84.f9f78a",
+    "id": "49cf9d82.f3816c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3499.883331298828,
-    "y": 483.8833312988281,
-    "z": "7062000.f761",
+    "x": 3467.883331298828,
+    "y": 476.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "6034bf74.a356a8",
-        "cf462c55.82"
+        "f69edc6a.996158",
+        "7412251.16d085c"
       ]
     ]
   },
   {
-    "id": "6034bf74.a356a8",
+    "id": "f69edc6a.996158",
     "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": 3780.883331298828,
-    "y": 439.8833312988281,
-    "z": "7062000.f761",
+    "x": 3748.883331298828,
+    "y": 432.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "6ceb7138.15694"
+        "ed2a485c.4e373"
       ]
     ]
   },
   {
-    "id": "6ceb7138.15694",
+    "id": "ed2a485c.4e373",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4042.883331298828,
-    "y": 439.8833312988281,
-    "z": "7062000.f761",
+    "x": 4010.883331298828,
+    "y": 432.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ac20a1c4.b5d88"
+        "61811a9.92ccce4"
       ]
     ]
   },
   {
-    "id": "c3ea0a96.012838",
+    "id": "cc385253.b8fbd",
     "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": 4500.883209228516,
-    "y": 461.8832092285156,
-    "z": "7062000.f761",
+    "x": 4468.883209228516,
+    "y": 454.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "42443b39.66d044",
+    "id": "2cd49ffd.326448",
     "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": 4489.883209228516,
-    "y": 516.8832092285156,
-    "z": "7062000.f761",
+    "x": 4457.883209228516,
+    "y": 509.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cb5892f8.a134a",
-        "3110dc42.56e8b4",
-        "b948b2e1.478978"
+        "9972e623.c70578",
+        "34812087.cb8a98",
+        "1b373493.bb5393"
       ]
     ]
   },
   {
-    "id": "b948b2e1.478978",
+    "id": "1b373493.bb5393",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4742.883331298828,
-    "y": 402.8833312988281,
-    "z": "7062000.f761",
+    "x": 4710.883331298828,
+    "y": 395.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f1bf9a6a.1a4ef8"
+        "f7f40cf5.3f9508"
       ]
     ]
   },
   {
-    "id": "f1bf9a6a.1a4ef8",
+    "id": "f7f40cf5.3f9508",
     "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": 4891.454864501953,
-    "y": 403.1690979003906,
-    "z": "7062000.f761",
+    "x": 4859.454864501953,
+    "y": 396.1690979003906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e719bcf6.a15758",
+    "id": "a22797f6.37b0d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4890.392364501953,
-    "y": 447.3093566894531,
-    "z": "7062000.f761",
+    "x": 4858.392364501953,
+    "y": 440.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3110dc42.56e8b4",
+    "id": "34812087.cb8a98",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4731.392364501953,
-    "y": 447.3093566894531,
-    "z": "7062000.f761",
+    "x": 4699.392364501953,
+    "y": 440.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e719bcf6.a15758"
+        "a22797f6.37b0d8"
       ]
     ]
   },
   {
-    "id": "cb5892f8.a134a",
+    "id": "9972e623.c70578",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4738.392364501953,
-    "y": 526.3093566894531,
-    "z": "7062000.f761",
+    "x": 4706.392364501953,
+    "y": 519.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f905d5a0.4b001"
+        "2ecc1ca4.45238c"
       ]
     ]
   },
   {
-    "id": "f905d5a0.4b001",
+    "id": "2ecc1ca4.45238c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4877.392364501953,
-    "y": 526.3093566894531,
-    "z": "7062000.f761",
+    "x": 4845.392364501953,
+    "y": 519.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "abc9ac08.900428",
-        "808b62f7.887bc"
+        "4189f313.1a9cd4",
+        "b78697ee.5ce55"
       ]
     ]
   },
   {
-    "id": "abc9ac08.900428",
+    "id": "4189f313.1a9cd4",
     "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": 5082.883331298828,
-    "y": 523.8833312988281,
-    "z": "7062000.f761",
+    "x": 5050.883331298828,
+    "y": 516.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "808b62f7.887bc",
+    "id": "b78697ee.5ce55",
     "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": 5081.883331298828,
-    "y": 569.8833312988281,
-    "z": "7062000.f761",
+    "x": 5049.883331298828,
+    "y": 562.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "cf462c55.82",
+    "id": "7412251.16d085c",
     "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": 3597.883331298828,
-    "y": 555.8833312988281,
-    "z": "7062000.f761",
+    "x": 3565.883331298828,
+    "y": 548.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d512c83a.b4f08"
+        "6604e9c7.0c6c6"
       ]
     ]
   },
   {
-    "id": "d512c83a.b4f08",
+    "id": "6604e9c7.0c6c6",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3877.883331298828,
-    "y": 555.8833312988281,
-    "z": "7062000.f761",
+    "x": 3845.883331298828,
+    "y": 548.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7f3fc2f9.da6f6c"
+        "85f44348.40e85"
       ]
     ]
   },
   {
-    "id": "7f3fc2f9.da6f6c",
+    "id": "85f44348.40e85",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2290.8834533691406,
-    "y": 808.8834533691406,
-    "z": "7062000.f761",
+    "x": 2258.8834533691406,
+    "y": 801.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c5194935.bd2228"
+        "4b9c1fcb.91dc9"
       ]
     ]
   },
   {
-    "id": "c5194935.bd2228",
+    "id": "4b9c1fcb.91dc9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2467.883331298828,
-    "y": 801.8833312988281,
-    "z": "7062000.f761",
+    "x": 2435.883331298828,
+    "y": 794.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d3179b9f.9873a8",
-        "b976f3f3.6f7998"
+        "27f44efc.6f6d32",
+        "c7edfd64.b3753"
       ]
     ]
   },
   {
-    "id": "d3179b9f.9873a8",
+    "id": "27f44efc.6f6d32",
     "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": 2710.883331298828,
-    "y": 758.8833312988281,
-    "z": "7062000.f761",
+    "x": 2678.883331298828,
+    "y": 751.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "b976f3f3.6f7998",
+    "id": "c7edfd64.b3753",
     "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": 2699.883331298828,
-    "y": 813.8833312988281,
-    "z": "7062000.f761",
+    "x": 2667.883331298828,
+    "y": 806.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "78ac5925.ecf5a8",
-        "b7b22856.252df8",
-        "ac6d9ce2.b2e9e"
+        "24ace19f.75b966",
+        "ac0fada7.2237a",
+        "7d46d2c9.4b5f9c"
       ]
     ]
   },
   {
-    "id": "78ac5925.ecf5a8",
+    "id": "24ace19f.75b966",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2991.374298095703,
-    "y": 792.4573059082031,
-    "z": "7062000.f761",
+    "x": 2959.374298095703,
+    "y": 785.4573059082031,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cd49934.02e89f"
+        "d7ebe78c.3ec37"
       ]
     ]
   },
   {
-    "id": "b7b22856.252df8",
+    "id": "ac0fada7.2237a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2979.883331298828,
-    "y": 836.8833312988281,
-    "z": "7062000.f761",
+    "x": 2947.883331298828,
+    "y": 829.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ed06d18.02143b"
+        "77d529f.fb28458"
       ]
     ]
   },
   {
-    "id": "cd49934.02e89f",
+    "id": "d7ebe78c.3ec37",
     "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": 3139.945831298828,
-    "y": 792.7430725097656,
-    "z": "7062000.f761",
+    "x": 3107.945831298828,
+    "y": 785.7430725097656,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "ed06d18.02143b",
+    "id": "77d529f.fb28458",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3138.883331298828,
-    "y": 836.8833312988281,
-    "z": "7062000.f761",
+    "x": 3106.883331298828,
+    "y": 829.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "ac6d9ce2.b2e9e",
+    "id": "7d46d2c9.4b5f9c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2986.883331298828,
-    "y": 915.8833312988281,
-    "z": "7062000.f761",
+    "x": 2954.883331298828,
+    "y": 908.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "87f4e9d.ba71598"
+        "265410a7.36ec88"
       ]
     ]
   },
   {
-    "id": "87f4e9d.ba71598",
+    "id": "265410a7.36ec88",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3125.883331298828,
-    "y": 915.8833312988281,
-    "z": "7062000.f761",
+    "x": 3093.883331298828,
+    "y": 908.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c2cb656b.4adff",
-        "148d0b0c.712fa5",
-        "d89221fb.e3072",
-        "ea9aeb3f.7f8c98",
-        "11e605d7.ecd0fa",
-        "104f2b87.41fe14",
-        "1a00d4a4.ff98a3",
-        "59b35d49.e5c194",
-        "52e7c1a.b628dc",
-        "cdada9b0.2f3a48",
-        "850e2800.badf2",
-        "2b1064a0.eade7c",
-        "a5bcbd5b.23b83",
-        "23879b91.f9cdd4"
+        "98c1de20.9fd92",
+        "22cf748c.dba294",
+        "6d145189.478b8",
+        "8cce98e.0c8f3e8",
+        "d4009f69.0bc89",
+        "9190bf27.d61b08",
+        "1fa44b37.7a7c65",
+        "1ebd0160.929687",
+        "f7e98987.293918",
+        "6b01ec04.e8e8dc",
+        "ce90c6ec.193398",
+        "323cec2c.88d45c",
+        "fba2883c.72d2",
+        "abd6e7f0.9745e8"
       ]
     ]
   },
   {
-    "id": "f8061145.abbc7",
+    "id": "ec511c6.7493e6",
     "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": 3439.883331298828,
-    "y": 721.8833312988281,
-    "z": "7062000.f761",
+    "x": 3407.883331298828,
+    "y": 714.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "c2cb656b.4adff",
+    "id": "98c1de20.9fd92",
     "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": 3420.883331298828,
-    "y": 771.8833312988281,
-    "z": "7062000.f761",
+    "x": 3388.883331298828,
+    "y": 764.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "23879b91.f9cdd4",
+    "id": "abd6e7f0.9745e8",
     "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": 3377.883331298828,
-    "y": 816.8833312988281,
-    "z": "7062000.f761",
+    "x": 3345.883331298828,
+    "y": 809.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "148d0b0c.712fa5",
+    "id": "22cf748c.dba294",
     "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": 3352.883331298828,
-    "y": 879.8833312988281,
-    "z": "7062000.f761",
+    "x": 3320.883331298828,
+    "y": 872.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d89221fb.e3072",
+    "id": "6d145189.478b8",
     "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": 3353.883331298828,
-    "y": 934.8833312988281,
-    "z": "7062000.f761",
+    "x": 3321.883331298828,
+    "y": 927.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "ea9aeb3f.7f8c98",
+    "id": "8cce98e.0c8f3e8",
     "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": 3369.883331298828,
-    "y": 982.8833312988281,
-    "z": "7062000.f761",
+    "x": 3337.883331298828,
+    "y": 975.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "842b0094.75a4a",
-        "7eb2f3df.e44f04",
-        "b07921bb.e3808"
+        "909d17c4.8ebc6",
+        "f19af18e.9ab1b8",
+        "7d20c22a.cc52a4"
       ]
     ]
   },
   {
-    "id": "11e605d7.ecd0fa",
+    "id": "d4009f69.0bc89",
     "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": 3358.883331298828,
-    "y": 1069.8832092285156,
-    "z": "7062000.f761",
+    "x": 3326.883331298828,
+    "y": 1062.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "2d5fb508.bfab52",
-        "cb29efc.c6f4b1",
-        "61b86bd0.897d5c"
+        "9444273f.3b6308",
+        "2c5b38f8.57c148",
+        "b9db8112.11ed58"
       ]
     ]
   },
   {
-    "id": "842b0094.75a4a",
+    "id": "909d17c4.8ebc6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3570.883331298828,
-    "y": 866.8833312988281,
-    "z": "7062000.f761",
+    "x": 3538.883331298828,
+    "y": 859.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "20684afd.b6d766"
+        "c14b1c12.22174"
       ]
     ]
   },
   {
-    "id": "7eb2f3df.e44f04",
+    "id": "f19af18e.9ab1b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3566.392364501953,
-    "y": 916.3093566894531,
-    "z": "7062000.f761",
+    "x": 3534.392364501953,
+    "y": 909.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d2041960.fe2c28"
+        "2b40f083.4de84"
       ]
     ]
   },
   {
-    "id": "b07921bb.e3808",
+    "id": "7d20c22a.cc52a4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3570.392364501953,
-    "y": 969.3093566894531,
-    "z": "7062000.f761",
+    "x": 3538.392364501953,
+    "y": 962.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f96f84b2.606d"
+        "aaa35683.7d2c38"
       ]
     ]
   },
   {
-    "id": "20684afd.b6d766",
+    "id": "c14b1c12.22174",
     "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": 3719.454864501953,
-    "y": 866.1690979003906,
-    "z": "7062000.f761",
+    "x": 3687.454864501953,
+    "y": 859.1690979003906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d2041960.fe2c28",
+    "id": "2b40f083.4de84",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3709.392364501953,
-    "y": 916.3093566894531,
-    "z": "7062000.f761",
+    "x": 3677.392364501953,
+    "y": 909.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "2d5fb508.bfab52",
+    "id": "9444273f.3b6308",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3581.883331298828,
-    "y": 1039.8832092285156,
-    "z": "7062000.f761",
+    "x": 3549.883331298828,
+    "y": 1032.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "96baba9a.d0e19"
+        "106ff1ef.63ffd6"
       ]
     ]
   },
   {
-    "id": "cb29efc.c6f4b1",
+    "id": "2c5b38f8.57c148",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3577.392364501953,
-    "y": 1089.3092346191406,
-    "z": "7062000.f761",
+    "x": 3545.392364501953,
+    "y": 1082.3092346191406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "1fb34f72.484a51"
+        "ce83157c.4b6778"
       ]
     ]
   },
   {
-    "id": "61b86bd0.897d5c",
+    "id": "b9db8112.11ed58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3578.392364501953,
-    "y": 1142.3092346191406,
-    "z": "7062000.f761",
+    "x": 3546.392364501953,
+    "y": 1135.3092346191406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "10c44aa8.1e2ead"
+        "a56ebadb.ee398"
       ]
     ]
   },
   {
-    "id": "96baba9a.d0e19",
+    "id": "106ff1ef.63ffd6",
     "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": 3730.454864501953,
-    "y": 1039.1689758300781,
-    "z": "7062000.f761",
+    "x": 3698.454864501953,
+    "y": 1032.1689758300781,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "1fb34f72.484a51",
+    "id": "ce83157c.4b6778",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3720.392364501953,
-    "y": 1089.3092346191406,
-    "z": "7062000.f761",
+    "x": 3688.392364501953,
+    "y": 1082.3092346191406,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f96f84b2.606d",
+    "id": "aaa35683.7d2c38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3731.883331298828,
-    "y": 968.8833312988281,
-    "z": "7062000.f761",
+    "x": 3699.883331298828,
+    "y": 961.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c276b776.1eb8a"
+        "bc98fef2.b2548"
       ]
     ]
   },
   {
-    "id": "10c44aa8.1e2ead",
+    "id": "a56ebadb.ee398",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3731.883331298828,
-    "y": 1141.8832092285156,
-    "z": "7062000.f761",
+    "x": 3699.883331298828,
+    "y": 1134.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "dfc4c0e1.407a7"
+        "80324f63.fa516"
       ]
     ]
   },
   {
-    "id": "c276b776.1eb8a",
+    "id": "bc98fef2.b2548",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3903.883331298828,
-    "y": 968.8833312988281,
-    "z": "7062000.f761",
+    "x": 3871.883331298828,
+    "y": 961.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "680276dd.9e09b8",
-        "fada4cff.fbd328"
+        "49900721.03dea8",
+        "7a97b419.9c3254"
       ]
     ]
   },
   {
-    "id": "dfc4c0e1.407a7",
+    "id": "80324f63.fa516",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3904.883331298828,
-    "y": 1141.8833312988281,
-    "z": "7062000.f761",
+    "x": 3872.883331298828,
+    "y": 1134.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "1f020e0e.66975a",
-        "a14ce01a.56f21"
+        "9dd66c65.827358",
+        "1559fb7e.bddfc5"
       ]
     ]
   },
   {
-    "id": "680276dd.9e09b8",
+    "id": "49900721.03dea8",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4079.883331298828,
-    "y": 947.8833312988281,
-    "z": "7062000.f761",
+    "x": 4047.883331298828,
+    "y": 940.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "2d74202a.0b02c"
+        "9c76efc2.c7f458"
       ]
     ]
   },
   {
-    "id": "fada4cff.fbd328",
+    "id": "7a97b419.9c3254",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4081.883331298828,
-    "y": 1001.8833312988281,
-    "z": "7062000.f761",
+    "x": 4049.883331298828,
+    "y": 994.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7e647400.994a6c"
+        "36b200ce.3626f"
       ]
     ]
   },
   {
-    "id": "1f020e0e.66975a",
+    "id": "9dd66c65.827358",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.883331298828,
-    "y": 1111.8833312988281,
-    "z": "7062000.f761",
+    "x": 4048.883331298828,
+    "y": 1104.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "45ecb3a3.4434cc"
+        "f7a8d104.b779c8"
       ]
     ]
   },
   {
-    "id": "a14ce01a.56f21",
+    "id": "1559fb7e.bddfc5",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4082.883331298828,
-    "y": 1165.8833312988281,
-    "z": "7062000.f761",
+    "x": 4050.883331298828,
+    "y": 1158.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c83b931a.caa288"
+        "2781339a.2c9d8c"
       ]
     ]
   },
   {
-    "id": "698ac3d0.bab4ec",
+    "id": "a64deb38.79c21",
     "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": 4389.883331298828,
-    "y": 899.8833312988281,
-    "z": "7062000.f761",
+    "x": 4357.883331298828,
+    "y": 892.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d12533f5.293ec",
+    "id": "d00069b9.08211",
     "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": 4382.883331298828,
-    "y": 997.8833312988281,
-    "z": "7062000.f761",
+    "x": 4350.883331298828,
+    "y": 990.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "cfe2458d.e53598",
+    "id": "e2a3248.b77d4d8",
     "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": 4382.883331298828,
-    "y": 1084.8833312988281,
-    "z": "7062000.f761",
+    "x": 4350.883331298828,
+    "y": 1077.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e0154f38.db2ba",
+    "id": "69fc971e.d1c948",
     "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": 4386.883331298828,
-    "y": 1177.8833312988281,
-    "z": "7062000.f761",
+    "x": 4354.883331298828,
+    "y": 1170.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "c5ef28c0.6623d",
+    "id": "79a28b11.e62b74",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3613.883331298828,
-    "y": 1586.8833312988281,
-    "z": "7062000.f761",
+    "x": 3581.883331298828,
+    "y": 1579.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cf149009.40de5"
+        "4a634c2c.1a75ec"
       ]
     ]
   },
   {
-    "id": "892e385b.99fcd8",
+    "id": "940be839.4c9f2",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3623.374298095703,
-    "y": 1629.4573669433594,
-    "z": "7062000.f761",
+    "x": 3591.374298095703,
+    "y": 1622.4573669433594,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "fcd9fb7.509ae08"
+        "87a8481c.69d658"
       ]
     ]
   },
   {
-    "id": "a241b92b.410968",
+    "id": "a420af0c.05d778",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3611.883331298828,
-    "y": 1675.8833312988281,
-    "z": "7062000.f761",
+    "x": 3579.883331298828,
+    "y": 1668.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3987c181.ee8c26"
+        "2583b063.d99b38"
       ]
     ]
   },
   {
-    "id": "277d69d7.fb78d6",
+    "id": "2f08f142.24c856",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3313.883331298828,
-    "y": 1548.8833312988281,
-    "z": "7062000.f761",
+    "x": 3281.883331298828,
+    "y": 1541.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "1a00d4a4.ff98a3",
+    "id": "1fa44b37.7a7c65",
     "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": 3356.883331298828,
-    "y": 1613.8833312988281,
-    "z": "7062000.f761",
+    "x": 3324.883331298828,
+    "y": 1606.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c5ef28c0.6623d",
-        "892e385b.99fcd8",
-        "a241b92b.410968"
+        "79a28b11.e62b74",
+        "940be839.4c9f2",
+        "a420af0c.05d778"
       ]
     ]
   },
   {
-    "id": "104f2b87.41fe14",
+    "id": "9190bf27.d61b08",
     "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": 3357.883331298828,
-    "y": 1283.8833312988281,
-    "z": "7062000.f761",
+    "x": 3325.883331298828,
+    "y": 1276.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a533cbf2.9ff568",
-        "84397dc4.6052e8"
+        "d3643022.187b08",
+        "f8e2bf22.0eeef"
       ]
     ]
   },
   {
-    "id": "84397dc4.6052e8",
+    "id": "f8e2bf22.0eeef",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3580.883331298828,
-    "y": 1269.8833312988281,
-    "z": "7062000.f761",
+    "x": 3548.883331298828,
+    "y": 1262.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a3186923.403f7"
+        "624eaece.91144"
       ]
     ]
   },
   {
-    "id": "a533cbf2.9ff568",
+    "id": "d3643022.187b08",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3582.883331298828,
-    "y": 1302.8833312988281,
-    "z": "7062000.f761",
+    "x": 3550.883331298828,
+    "y": 1295.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "fb4a8c19.28b8c8"
+        "c2708361.dc58a8"
       ]
     ]
   },
   {
-    "id": "cf149009.40de5",
+    "id": "4a634c2c.1a75ec",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3786.549835205078,
-    "y": 1585.8833312988281,
-    "z": "7062000.f761",
+    "x": 3754.549835205078,
+    "y": 1578.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d71c8cc2.44ee38",
-        "eeee90c0.e5cea8"
+        "a3465897.dfb6c",
+        "6701a8e7.d232d8"
       ]
     ]
   },
   {
-    "id": "fcd9fb7.509ae08",
+    "id": "87a8481c.69d658",
     "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": 3776.9457092285156,
-    "y": 1632.7431030273438,
-    "z": "7062000.f761",
+    "x": 3744.9457092285156,
+    "y": 1625.7431030273438,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3987c181.ee8c26",
+    "id": "2583b063.d99b38",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3780.883331298828,
-    "y": 1676.8833312988281,
-    "z": "7062000.f761",
+    "x": 3748.883331298828,
+    "y": 1669.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d71c8cc2.44ee38",
+    "id": "a3465897.dfb6c",
     "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": 4050.883331298828,
-    "y": 1569.8833312988281,
-    "z": "7062000.f761",
+    "x": 4018.883331298828,
+    "y": 1562.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "245c145e.ebe6e4",
-        "5de5cc75.c2e844"
+        "345ba8bf.bbff3",
+        "cd05726a.f82838"
       ]
     ]
   },
   {
-    "id": "5de5cc75.c2e844",
+    "id": "cd05726a.f82838",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4273.883331298828,
-    "y": 1524.8833312988281,
-    "z": "7062000.f761",
+    "x": 4241.883331298828,
+    "y": 1517.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a0f9be9b.313468"
+        "2d1297aa.955328"
       ]
     ]
   },
   {
-    "id": "245c145e.ebe6e4",
+    "id": "345ba8bf.bbff3",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4275.883331298828,
-    "y": 1588.8833312988281,
-    "z": "7062000.f761",
+    "x": 4243.883331298828,
+    "y": 1581.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "911806e7.142508"
+        "c1965743.4c3d48"
       ]
     ]
   },
   {
-    "id": "911806e7.142508",
+    "id": "c1965743.4c3d48",
     "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": 4437.883331298828,
-    "y": 1584.8833312988281,
-    "z": "7062000.f761",
+    "x": 4405.883331298828,
+    "y": 1577.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a0f9be9b.313468",
+    "id": "2d1297aa.955328",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4438.883331298828,
-    "y": 1521.8833312988281,
-    "z": "7062000.f761",
+    "x": 4406.883331298828,
+    "y": 1514.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e1f125c0.caa6f",
-        "a1eca114.4be78"
+        "2cdfacb5.3a35a4",
+        "3e9d9121.36c9d6"
       ]
     ]
   },
   {
-    "id": "d95b965d.c926c",
+    "id": "8deb3478.19bbc8",
     "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\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4052.883331298828,
-    "y": 1728.8833312988281,
-    "z": "7062000.f761",
+    "x": 4020.883331298828,
+    "y": 1721.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "6b95fc34.5ad8b4",
+    "id": "97704f04.65be9",
     "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": 4097.883331298828,
-    "y": 1638.8833312988281,
-    "z": "7062000.f761",
+    "x": 4065.883331298828,
+    "y": 1631.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "8335544a.4f7eb",
+    "id": "d3e16022.86087",
     "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": 4180.883331298828,
-    "y": 1776.8833312988281,
-    "z": "7062000.f761",
+    "x": 4148.883331298828,
+    "y": 1769.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "fb4a8c19.28b8c8",
+    "id": "c2708361.dc58a8",
     "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": 3725.883331298828,
-    "y": 1299.8833312988281,
-    "z": "7062000.f761",
+    "x": 3693.883331298828,
+    "y": 1292.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a3186923.403f7",
+    "id": "624eaece.91144",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3728.883331298828,
-    "y": 1262.8833312988281,
-    "z": "7062000.f761",
+    "x": 3696.883331298828,
+    "y": 1255.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "df51c615.6dea38",
-        "42564be7.1576fc"
+        "72c971d0.4048b8",
+        "afa94a20.a982b"
       ]
     ]
   },
   {
-    "id": "df51c615.6dea38",
+    "id": "72c971d0.4048b8",
     "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": 3902.883331298828,
-    "y": 1218.8833312988281,
-    "z": "7062000.f761",
+    "x": 3870.883331298828,
+    "y": 1211.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "eeee90c0.e5cea8",
+    "id": "6701a8e7.d232d8",
     "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": 4004.883331298828,
-    "y": 1853.8833312988281,
-    "z": "7062000.f761",
+    "x": 3972.883331298828,
+    "y": 1846.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "1b697bac.74bf24"
+        "db5b6ad5.7610d"
       ]
     ]
   },
   {
-    "id": "1b697bac.74bf24",
+    "id": "db5b6ad5.7610d",
     "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": 4210.883331298828,
-    "y": 1853.8833312988281,
-    "z": "7062000.f761",
+    "x": 4178.883331298828,
+    "y": 1846.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "fad81e7.f76f06"
+        "91f60d7.c7d4bf"
       ]
     ]
   },
   {
-    "id": "fad81e7.f76f06",
+    "id": "91f60d7.c7d4bf",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4426.168975830078,
-    "y": 1853.7051086425781,
-    "z": "7062000.f761",
+    "x": 4394.168975830078,
+    "y": 1846.7051086425781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f6db1963.f8cc08"
+        "f6e4c256.99ed68"
       ]
     ]
   },
   {
-    "id": "42564be7.1576fc",
+    "id": "afa94a20.a982b",
     "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": 3917.883331298828,
-    "y": 1329.8833312988281,
-    "z": "7062000.f761",
+    "x": 3885.883331298828,
+    "y": 1322.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3d26932b.7c3bc4",
-        "11ea41e8.6fef1e",
-        "60ff709f.49eb3"
+        "1979ced2.4d0299",
+        "9890a5f2.a73b18",
+        "d6c935ad.2c18"
       ]
     ]
   },
   {
-    "id": "3d26932b.7c3bc4",
+    "id": "1979ced2.4d0299",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4113.383453369141,
-    "y": 1281.8833312988281,
-    "z": "7062000.f761",
+    "x": 4081.3834533691406,
+    "y": 1274.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e66646fd.ae97a8"
+        "d4f7d32a.177f28"
       ]
     ]
   },
   {
-    "id": "11ea41e8.6fef1e",
+    "id": "9890a5f2.a73b18",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4105.383453369141,
-    "y": 1336.8833312988281,
-    "z": "7062000.f761",
+    "x": 4073.3834533691406,
+    "y": 1329.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "6bc38e9e.a8f668"
+        "4c3f3b2.6283544"
       ]
     ]
   },
   {
-    "id": "60ff709f.49eb3",
+    "id": "d6c935ad.2c18",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4110.383453369141,
-    "y": 1393.8833312988281,
-    "z": "7062000.f761",
+    "x": 4078.3834533691406,
+    "y": 1386.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "1b2700d2.65979f"
+        "13564645.a1e6da"
       ]
     ]
   },
   {
-    "id": "1b2700d2.65979f",
+    "id": "13564645.a1e6da",
     "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": 4262.383453369141,
-    "y": 1394.8833312988281,
-    "z": "7062000.f761",
+    "x": 4230.383453369141,
+    "y": 1387.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "6bc38e9e.a8f668",
+    "id": "4c3f3b2.6283544",
     "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": 4273.383453369141,
-    "y": 1339.8833312988281,
-    "z": "7062000.f761",
+    "x": 4241.383453369141,
+    "y": 1332.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e66646fd.ae97a8",
+    "id": "d4f7d32a.177f28",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4257.765777587891,
-    "y": 1279.5390014648438,
-    "z": "7062000.f761",
+    "x": 4225.765777587891,
+    "y": 1272.5390014648438,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8c7c1f5.e4db1e"
+        "755f8d33.dd06bc"
       ]
     ]
   },
   {
-    "id": "8c7c1f5.e4db1e",
+    "id": "755f8d33.dd06bc",
     "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": 4441.883331298828,
-    "y": 1293.8833312988281,
-    "z": "7062000.f761",
+    "x": 4409.883331298828,
+    "y": 1286.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9be30f1d.25d3a8"
+        "910fe315.8317e8"
       ]
     ]
   },
   {
-    "id": "a1eca114.4be78",
+    "id": "3e9d9121.36c9d6",
     "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": 4608.883331298828,
-    "y": 1479.8833312988281,
-    "z": "7062000.f761",
+    "x": 4576.883331298828,
+    "y": 1472.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e1f125c0.caa6f",
+    "id": "2cdfacb5.3a35a4",
     "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": 4609.883331298828,
-    "y": 1587.8833312988281,
-    "z": "7062000.f761",
+    "x": 4577.883331298828,
+    "y": 1580.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "b9cba76c.d9c1f8",
+    "id": "80df0a60.dec0f8",
     "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": 4610.883331298828,
-    "y": 1536.8833312988281,
-    "z": "7062000.f761",
+    "x": 4578.883331298828,
+    "y": 1529.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f6db1963.f8cc08",
+    "id": "f6e4c256.99ed68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4633.000518798828,
-    "y": 1854.2236633300781,
-    "z": "7062000.f761",
+    "x": 4601.000518798828,
+    "y": 1847.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7891783a.b17838",
-        "d094659a.049558",
-        "9c226fb0.3cc118"
+        "a4a05745.968c7",
+        "d1e00a0e.d2e56",
+        "d1a2356d.4786a8"
       ]
     ]
   },
   {
-    "id": "7891783a.b17838",
+    "id": "a4a05745.968c7",
     "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": 4848.000518798828,
-    "y": 1816.2236633300781,
-    "z": "7062000.f761",
+    "x": 4816.000518798828,
+    "y": 1809.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d094659a.049558",
+    "id": "d1e00a0e.d2e56",
     "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": 4845.000518798828,
-    "y": 1855.2236633300781,
-    "z": "7062000.f761",
+    "x": 4813.000518798828,
+    "y": 1848.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7580173.08b9968"
+        "17a4f2c1.f6b375"
       ]
     ]
   },
   {
-    "id": "9c226fb0.3cc118",
+    "id": "d1a2356d.4786a8",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4800.500518798828,
-    "y": 1897.2236633300781,
-    "z": "7062000.f761",
+    "x": 4768.500518798828,
+    "y": 1890.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "7580173.08b9968",
+    "id": "17a4f2c1.f6b375",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5025.500518798828,
-    "y": 1854.2236633300781,
-    "z": "7062000.f761",
+    "x": 4993.500518798828,
+    "y": 1847.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cbf832f4.29b03"
+        "ba138e8e.753b68"
       ]
     ]
   },
   {
-    "id": "c301ea5d.736948",
+    "id": "8d6faffb.891c08",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4839.883331298828,
-    "y": 1297.8833312988281,
-    "z": "7062000.f761",
+    "x": 4807.883331298828,
+    "y": 1290.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "82c12c36.ef82a"
+        "17552ef5.2956f9"
       ]
     ]
   },
   {
-    "id": "82c12c36.ef82a",
+    "id": "17552ef5.2956f9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5016.883331298828,
-    "y": 1289.8833312988281,
-    "z": "7062000.f761",
+    "x": 4984.883331298828,
+    "y": 1282.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "99af67bd.f0a288",
-        "27aaa5b6.e5d6a2"
+        "55d02530.edc7ec",
+        "14cede7e.dd48aa"
       ]
     ]
   },
   {
-    "id": "9be30f1d.25d3a8",
+    "id": "910fe315.8317e8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4636.883331298828,
-    "y": 1293.8833312988281,
-    "z": "7062000.f761",
+    "x": 4604.883331298828,
+    "y": 1286.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c301ea5d.736948",
-        "d642ceb0.6d61d8"
+        "8d6faffb.891c08",
+        "fe294daa.41d368"
       ]
     ]
   },
   {
-    "id": "d642ceb0.6d61d8",
+    "id": "fe294daa.41d368",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4842.883331298828,
-    "y": 1371.8833312988281,
-    "z": "7062000.f761",
+    "x": 4810.883331298828,
+    "y": 1364.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8d64b35.e02ce5"
+        "d9a2dd9b.e37c68"
       ]
     ]
   },
   {
-    "id": "8d64b35.e02ce5",
+    "id": "d9a2dd9b.e37c68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5019.883331298828,
-    "y": 1363.8833312988281,
-    "z": "7062000.f761",
+    "x": 4987.883331298828,
+    "y": 1356.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b7238960.567a78"
+        "7ccc9bf1.00634c"
       ]
     ]
   },
   {
-    "id": "cbf832f4.29b03",
+    "id": "ba138e8e.753b68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5183.500518798828,
-    "y": 1854.2236633300781,
-    "z": "7062000.f761",
+    "x": 5151.500518798828,
+    "y": 1847.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "703f7e18.3396c8"
+        "949f2da8.99048"
       ]
     ]
   },
   {
-    "id": "703f7e18.3396c8",
+    "id": "949f2da8.99048",
     "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": 5390.500518798828,
-    "y": 1854.2236633300781,
-    "z": "7062000.f761",
+    "x": 5358.500518798828,
+    "y": 1847.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "27aaa5b6.e5d6a2",
+    "id": "14cede7e.dd48aa",
     "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": 5224.883331298828,
-    "y": 1296.8833312988281,
-    "z": "7062000.f761",
+    "x": 5192.883331298828,
+    "y": 1289.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5f4852b0.deaefc",
-        "a3e152bc.1612f",
-        "6a748238.68a734"
+        "b2a3145.b7edbe8",
+        "e74729d.3422f58",
+        "409c0b0b.c89e64"
       ]
     ]
   },
   {
-    "id": "99af67bd.f0a288",
+    "id": "55d02530.edc7ec",
     "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": 5254.883331298828,
-    "y": 1244.8833312988281,
-    "z": "7062000.f761",
+    "x": 5222.883331298828,
+    "y": 1237.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5f4852b0.deaefc",
+    "id": "b2a3145.b7edbe8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5434.883331298828,
-    "y": 1287.8833312988281,
-    "z": "7062000.f761",
+    "x": 5402.883331298828,
+    "y": 1280.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "fce8f611.8c7338"
+        "4b8f6adb.6d0404"
       ]
     ]
   },
   {
-    "id": "a3e152bc.1612f",
+    "id": "e74729d.3422f58",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5426.883331298828,
-    "y": 1342.8833312988281,
-    "z": "7062000.f761",
+    "x": 5394.883331298828,
+    "y": 1335.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "23b3b244.7d6476"
+        "19136c8e.dcdfbb"
       ]
     ]
   },
   {
-    "id": "6a748238.68a734",
+    "id": "409c0b0b.c89e64",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5431.883331298828,
-    "y": 1399.8833312988281,
-    "z": "7062000.f761",
+    "x": 5399.883331298828,
+    "y": 1392.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a282f316.3a8968"
+        "e2070656.8dd03"
       ]
     ]
   },
   {
-    "id": "a282f316.3a8968",
+    "id": "e2070656.8dd03",
     "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": 5583.883331298828,
-    "y": 1400.8833312988281,
-    "z": "7062000.f761",
+    "x": 5551.883331298828,
+    "y": 1393.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "23b3b244.7d6476",
+    "id": "19136c8e.dcdfbb",
     "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": 5594.883331298828,
-    "y": 1345.8833312988281,
-    "z": "7062000.f761",
+    "x": 5562.883331298828,
+    "y": 1338.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "fce8f611.8c7338",
+    "id": "4b8f6adb.6d0404",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5579.265655517578,
-    "y": 1285.5390014648438,
-    "z": "7062000.f761",
+    "x": 5547.265655517578,
+    "y": 1278.5390014648438,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a440aece.fb083"
+        "c2a5af15.443d8"
       ]
     ]
   },
   {
-    "id": "b7238960.567a78",
+    "id": "7ccc9bf1.00634c",
     "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": 5254.883331298828,
-    "y": 1487.8833312988281,
-    "z": "7062000.f761",
+    "x": 5222.883331298828,
+    "y": 1480.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a440aece.fb083",
+    "id": "c2a5af15.443d8",
     "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": 5793.883331298828,
-    "y": 1281.8833312988281,
-    "z": "7062000.f761",
+    "x": 5761.883331298828,
+    "y": 1274.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5b9ee810.250ef",
+    "id": "4eba14c8.80a994",
     "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": 4377.883331298828,
-    "y": 935.8833312988281,
-    "z": "7062000.f761",
+    "x": 4345.883331298828,
+    "y": 928.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "8e2d81c0.4fd7e8",
+    "id": "620253a.9c2552c",
     "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": 4368.883331298828,
-    "y": 1033.8833312988281,
-    "z": "7062000.f761",
+    "x": 4336.883331298828,
+    "y": 1026.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "2d74202a.0b02c",
+    "id": "9c76efc2.c7f458",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4202.883331298828,
-    "y": 941.8833312988281,
-    "z": "7062000.f761",
+    "x": 4170.883331298828,
+    "y": 934.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "698ac3d0.bab4ec",
-        "5b9ee810.250ef"
+        "a64deb38.79c21",
+        "4eba14c8.80a994"
       ]
     ]
   },
   {
-    "id": "7e647400.994a6c",
+    "id": "36b200ce.3626f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4208.883331298828,
-    "y": 1005.8833312988281,
-    "z": "7062000.f761",
+    "x": 4176.883331298828,
+    "y": 998.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d12533f5.293ec",
-        "8e2d81c0.4fd7e8"
+        "d00069b9.08211",
+        "620253a.9c2552c"
       ]
     ]
   },
   {
-    "id": "45ecb3a3.4434cc",
+    "id": "f7a8d104.b779c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4208.883331298828,
-    "y": 1111.8833312988281,
-    "z": "7062000.f761",
+    "x": 4176.883331298828,
+    "y": 1104.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cfe2458d.e53598",
-        "1ea1c70f.8279e9"
+        "e2a3248.b77d4d8",
+        "bcbbe769.3c0e1"
       ]
     ]
   },
   {
-    "id": "c83b931a.caa288",
+    "id": "2781339a.2c9d8c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4211.883331298828,
-    "y": 1164.8833312988281,
-    "z": "7062000.f761",
+    "x": 4179.883331298828,
+    "y": 1157.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e0154f38.db2ba",
-        "85671ae.a18b1e8"
+        "69fc971e.d1c948",
+        "6070cd17.b28d74"
       ]
     ]
   },
   {
-    "id": "1ea1c70f.8279e9",
+    "id": "bcbbe769.3c0e1",
     "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": 4368.883331298828,
-    "y": 1124.8833312988281,
-    "z": "7062000.f761",
+    "x": 4336.883331298828,
+    "y": 1117.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "85671ae.a18b1e8",
+    "id": "6070cd17.b28d74",
     "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": 4371.883331298828,
-    "y": 1215.8833312988281,
-    "z": "7062000.f761",
+    "x": 4339.883331298828,
+    "y": 1208.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "7278edf2.b8b58c",
+    "id": "ef6aaa0a.46635",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3743.883331298828,
-    "y": 2425.883331298828,
-    "z": "7062000.f761",
+    "x": 3711.883331298828,
+    "y": 2418.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3fae525c.90658e",
-        "13c312d5.234edd"
+        "a10bbf1c.524bd",
+        "27427337.3be9a4"
       ]
     ]
   },
   {
-    "id": "2fa6509a.e12468",
+    "id": "a6501243.d121f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3571.216827392578,
-    "y": 2426.883331298828,
-    "z": "7062000.f761",
+    "x": 3539.216827392578,
+    "y": 2419.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7278edf2.b8b58c"
+        "ef6aaa0a.46635"
       ]
     ]
   },
   {
-    "id": "2125c96e.09934e",
+    "id": "aaec6d99.4c304",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3580.707794189453,
-    "y": 2469.4573669433594,
-    "z": "7062000.f761",
+    "x": 3548.707794189453,
+    "y": 2462.4573669433594,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "68c9e27f.22495c"
+        "47f8697d.df9998"
       ]
     ]
   },
   {
-    "id": "be5c9f7d.6c274",
+    "id": "e6e0568a.7d4f68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3569.216827392578,
-    "y": 2515.883331298828,
-    "z": "7062000.f761",
+    "x": 3537.216827392578,
+    "y": 2508.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "dc663a75.10e1e"
+        "2963b336.e3bc8c"
       ]
     ]
   },
   {
-    "id": "68c9e27f.22495c",
+    "id": "47f8697d.df9998",
     "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": 3734.2792053222656,
-    "y": 2472.7431030273438,
-    "z": "7062000.f761",
+    "x": 3702.2792053222656,
+    "y": 2465.7431030273438,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "dc663a75.10e1e",
+    "id": "2963b336.e3bc8c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3738.216827392578,
-    "y": 2516.883331298828,
-    "z": "7062000.f761",
+    "x": 3706.216827392578,
+    "y": 2509.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3fae525c.90658e",
+    "id": "a10bbf1c.524bd",
     "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": 4030.216827392578,
-    "y": 2429.8834533691406,
-    "z": "7062000.f761",
+    "x": 3998.216827392578,
+    "y": 2422.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f8506393.ef4d48",
-        "ae1a7fe2.9ff988"
+        "b2433bfc.a285b",
+        "e32efd70.259f3"
       ]
     ]
   },
   {
-    "id": "ae1a7fe2.9ff988",
+    "id": "e32efd70.259f3",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4253.216827392578,
-    "y": 2384.8834533691406,
-    "z": "7062000.f761",
+    "x": 4221.216827392578,
+    "y": 2377.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "bd5252ed.d0e86"
+        "e33d7c06.1215a"
       ]
     ]
   },
   {
-    "id": "f8506393.ef4d48",
+    "id": "b2433bfc.a285b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4255.216827392578,
-    "y": 2448.8834533691406,
-    "z": "7062000.f761",
+    "x": 4223.216827392578,
+    "y": 2441.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7b56fdc4.718894"
+        "96c9f851.720ff"
       ]
     ]
   },
   {
-    "id": "7b56fdc4.718894",
+    "id": "96c9f851.720ff",
     "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": 4414.216827392578,
-    "y": 2467.8834533691406,
-    "z": "7062000.f761",
+    "x": 4382.216827392578,
+    "y": 2460.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "bd5252ed.d0e86",
+    "id": "e33d7c06.1215a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4418.216827392578,
-    "y": 2381.8834533691406,
-    "z": "7062000.f761",
+    "x": 4386.216827392578,
+    "y": 2374.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a04df249.3edf9",
-        "4445456b.4ef0dc"
+        "64140131.87f6a",
+        "d9669ac1.5a2d68"
       ]
     ]
   },
   {
-    "id": "dfb0d610.c67228",
+    "id": "e5d24864.c4d21",
     "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<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4032.216827392578,
-    "y": 2588.8834533691406,
-    "z": "7062000.f761",
+    "x": 4000.216827392578,
+    "y": 2581.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a9b19647.ecdf6",
+    "id": "f6b5343f.392d9",
     "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": 4077.216827392578,
-    "y": 2498.8834533691406,
-    "z": "7062000.f761",
+    "x": 4045.216827392578,
+    "y": 2491.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "d1080dc6.5d411",
+    "id": "cfe86ca7.011b18",
     "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": 4159.216827392578,
-    "y": 2653.8834533691406,
-    "z": "7062000.f761",
+    "x": 4127.216827392578,
+    "y": 2646.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "52e7c1a.b628dc",
+    "id": "f7e98987.293918",
     "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": 3343.216827392578,
-    "y": 2461.883331298828,
-    "z": "7062000.f761",
+    "x": 3311.216827392578,
+    "y": 2454.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "2fa6509a.e12468",
-        "2125c96e.09934e",
-        "be5c9f7d.6c274"
+        "a6501243.d121f",
+        "aaec6d99.4c304",
+        "e6e0568a.7d4f68"
       ]
     ]
   },
   {
-    "id": "534c4b07.5a4374",
+    "id": "d0c5015f.630ad",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3304.216827392578,
-    "y": 2405.883331298828,
-    "z": "7062000.f761",
+    "x": 3272.216827392578,
+    "y": 2398.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "59b35d49.e5c194",
+    "id": "1ebd0160.929687",
     "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": 3361.216827392578,
-    "y": 2124.8832092285156,
-    "z": "7062000.f761",
+    "x": 3329.216827392578,
+    "y": 2117.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8468812d.ab7d98",
-        "832feae1.441b18"
+        "28ff08ce.889b38",
+        "1b36a02a.8e3468"
       ]
     ]
   },
   {
-    "id": "832feae1.441b18",
+    "id": "1b36a02a.8e3468",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3584.216827392578,
-    "y": 2110.8832092285156,
-    "z": "7062000.f761",
+    "x": 3552.216827392578,
+    "y": 2103.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "45b67ba7.081314"
+        "314f424e.949456"
       ]
     ]
   },
   {
-    "id": "8468812d.ab7d98",
+    "id": "28ff08ce.889b38",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3586.216827392578,
-    "y": 2143.8832092285156,
-    "z": "7062000.f761",
+    "x": 3554.216827392578,
+    "y": 2136.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "71974a85.bc9554"
+        "c351a018.b67f98"
       ]
     ]
   },
   {
-    "id": "71974a85.bc9554",
+    "id": "c351a018.b67f98",
     "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": 3729.216827392578,
-    "y": 2140.8832092285156,
-    "z": "7062000.f761",
+    "x": 3697.216827392578,
+    "y": 2133.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "45b67ba7.081314",
+    "id": "314f424e.949456",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3732.216827392578,
-    "y": 2103.8832092285156,
-    "z": "7062000.f761",
+    "x": 3700.216827392578,
+    "y": 2096.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "10560f97.9ccdb",
-        "fb974250.3eaa5"
+        "8065ca34.19e0e",
+        "27c4c436.c4a394"
       ]
     ]
   },
   {
-    "id": "10560f97.9ccdb",
+    "id": "8065ca34.19e0e",
     "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": 3926.216827392578,
-    "y": 2106.883331298828,
-    "z": "7062000.f761",
+    "x": 3894.216827392578,
+    "y": 2099.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "13c312d5.234edd",
+    "id": "27427337.3be9a4",
     "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": 3989.216827392578,
-    "y": 2738.883331298828,
-    "z": "7062000.f761",
+    "x": 3957.216827392578,
+    "y": 2731.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "4f9cbec5.496d9"
+        "b95f783a.80c45"
       ]
     ]
   },
   {
-    "id": "4f9cbec5.496d9",
+    "id": "b95f783a.80c45",
     "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": 4195.216827392578,
-    "y": 2738.883331298828,
-    "z": "7062000.f761",
+    "x": 4163.216827392578,
+    "y": 2731.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b238117c.f6854"
+        "fdd7c5c3.71bfe8"
       ]
     ]
   },
   {
-    "id": "b238117c.f6854",
+    "id": "fdd7c5c3.71bfe8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4412.502471923828,
-    "y": 2737.705108642578,
-    "z": "7062000.f761",
+    "x": 4380.502471923828,
+    "y": 2730.705108642578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3bbc3c62.de1f1c"
+        "240f5a27.c1a7a6"
       ]
     ]
   },
   {
-    "id": "fb974250.3eaa5",
+    "id": "27c4c436.c4a394",
     "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": 3948.216827392578,
-    "y": 2174.883331298828,
-    "z": "7062000.f761",
+    "x": 3916.216827392578,
+    "y": 2167.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8b8a9b87.c8a068",
-        "46f3b355.657d1c",
-        "789bb9ae.3c411"
+        "47b31581.268b0c",
+        "43867bdb.1b0d54",
+        "bbdefe01.0e663"
       ]
     ]
   },
   {
-    "id": "8b8a9b87.c8a068",
+    "id": "47b31581.268b0c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4143.716949462891,
-    "y": 2126.883331298828,
-    "z": "7062000.f761",
+    "x": 4111.716949462891,
+    "y": 2119.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "288864eb.075f34"
+        "bdcfd968.805c18"
       ]
     ]
   },
   {
-    "id": "46f3b355.657d1c",
+    "id": "43867bdb.1b0d54",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4135.716949462891,
-    "y": 2181.883331298828,
-    "z": "7062000.f761",
+    "x": 4103.716949462891,
+    "y": 2174.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f82ba322.6474e"
+        "a95a4d5b.d3114"
       ]
     ]
   },
   {
-    "id": "789bb9ae.3c411",
+    "id": "bbdefe01.0e663",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4140.716949462891,
-    "y": 2238.883331298828,
-    "z": "7062000.f761",
+    "x": 4108.716949462891,
+    "y": 2231.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "98f52488.0327b8"
+        "64398d6f.e5c684"
       ]
     ]
   },
   {
-    "id": "98f52488.0327b8",
+    "id": "64398d6f.e5c684",
     "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": 4292.716949462891,
-    "y": 2239.883331298828,
-    "z": "7062000.f761",
+    "x": 4260.716949462891,
+    "y": 2232.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f82ba322.6474e",
+    "id": "a95a4d5b.d3114",
     "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": 4303.716949462891,
-    "y": 2184.883331298828,
-    "z": "7062000.f761",
+    "x": 4271.716949462891,
+    "y": 2177.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "288864eb.075f34",
+    "id": "bdcfd968.805c18",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4288.099273681641,
-    "y": 2124.5390014648438,
-    "z": "7062000.f761",
+    "x": 4256.099273681641,
+    "y": 2117.5390014648438,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ce45d16c.d5e628"
+        "6d52f6e9.bcbf28"
       ]
     ]
   },
   {
-    "id": "a04df249.3edf9",
+    "id": "64140131.87f6a",
     "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": 4588.216827392578,
-    "y": 2342.8834533691406,
-    "z": "7062000.f761",
+    "x": 4556.216827392578,
+    "y": 2335.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "4445456b.4ef0dc",
+    "id": "d9669ac1.5a2d68",
     "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": 4589.216827392578,
-    "y": 2447.8834533691406,
-    "z": "7062000.f761",
+    "x": 4557.216827392578,
+    "y": 2440.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "c559d0ff.64e92",
+    "id": "9ddf3bf9.57ff3",
     "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": 4584.216827392578,
-    "y": 2396.8834533691406,
-    "z": "7062000.f761",
+    "x": 4552.216827392578,
+    "y": 2389.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3bbc3c62.de1f1c",
+    "id": "240f5a27.c1a7a6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4619.334014892578,
-    "y": 2727.2237854003906,
-    "z": "7062000.f761",
+    "x": 4587.334014892578,
+    "y": 2720.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f4fc0b3b.90cef8",
-        "6738a6d1.eac328",
-        "94eb5da4.00ce9"
+        "801a071e.c98f98",
+        "45d249d1.4a712",
+        "37813776.11957"
       ]
     ]
   },
   {
-    "id": "f4fc0b3b.90cef8",
+    "id": "801a071e.c98f98",
     "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": 4834.334014892578,
-    "y": 2689.2237854003906,
-    "z": "7062000.f761",
+    "x": 4802.334014892578,
+    "y": 2682.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "6738a6d1.eac328",
+    "id": "45d249d1.4a712",
     "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": 4831.334014892578,
-    "y": 2728.2237854003906,
-    "z": "7062000.f761",
+    "x": 4799.334014892578,
+    "y": 2721.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "99dab506.61b3a8"
+        "d7c43050.0743b"
       ]
     ]
   },
   {
-    "id": "94eb5da4.00ce9",
+    "id": "37813776.11957",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4786.834014892578,
-    "y": 2770.2237854003906,
-    "z": "7062000.f761",
+    "x": 4754.834014892578,
+    "y": 2763.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "99dab506.61b3a8",
+    "id": "d7c43050.0743b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5011.834014892578,
-    "y": 2727.2237854003906,
-    "z": "7062000.f761",
+    "x": 4979.834014892578,
+    "y": 2720.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d09db1ae.3d50e8"
+        "161c6e5f.bccb42"
       ]
     ]
   },
   {
-    "id": "d09db1ae.3d50e8",
+    "id": "161c6e5f.bccb42",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5169.834014892578,
-    "y": 2727.2237854003906,
-    "z": "7062000.f761",
+    "x": 5137.834014892578,
+    "y": 2720.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b4fea58e.4d08b"
+        "268de5ce.943522"
       ]
     ]
   },
   {
-    "id": "b4fea58e.4d08b",
+    "id": "268de5ce.943522",
     "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": 5376.834014892578,
-    "y": 2727.2237854003906,
-    "z": "7062000.f761",
+    "x": 5344.834014892578,
+    "y": 2720.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "9cb60767.3dae68",
+    "id": "5dd066fb.8bb21",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4870.216827392578,
-    "y": 2142.883331298828,
-    "z": "7062000.f761",
+    "x": 4838.216827392578,
+    "y": 2135.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "20305f15.4fc8"
+        "4dd18012.7f83e"
       ]
     ]
   },
   {
-    "id": "20305f15.4fc8",
+    "id": "4dd18012.7f83e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5047.216827392578,
-    "y": 2134.883331298828,
-    "z": "7062000.f761",
+    "x": 5015.216827392578,
+    "y": 2127.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f06ad939.b3afb8",
-        "eb592a74.9250f"
+        "cb357072.40504",
+        "41f4620d.06ac64"
       ]
     ]
   },
   {
-    "id": "ce45d16c.d5e628",
+    "id": "6d52f6e9.bcbf28",
     "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": 4472.216827392578,
-    "y": 2138.883331298828,
-    "z": "7062000.f761",
+    "x": 4440.216827392578,
+    "y": 2131.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "836b2028.73fa6"
+        "1558a590.3c3faa"
       ]
     ]
   },
   {
-    "id": "836b2028.73fa6",
+    "id": "1558a590.3c3faa",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4667.216827392578,
-    "y": 2138.883331298828,
-    "z": "7062000.f761",
+    "x": 4635.216827392578,
+    "y": 2131.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9cb60767.3dae68",
-        "1e4a18fb.74350f"
+        "5dd066fb.8bb21",
+        "a026e3da.a47c68"
       ]
     ]
   },
   {
-    "id": "eb592a74.9250f",
+    "id": "41f4620d.06ac64",
     "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": 5255.216827392578,
-    "y": 2141.883331298828,
-    "z": "7062000.f761",
+    "x": 5223.216827392578,
+    "y": 2134.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b94c1f46.28b1b8",
-        "73a98c16.ea7094",
-        "1e6cb9ce.e34866"
+        "304be603.33560a",
+        "7b7d3ebe.8d439",
+        "4d809924.5591a8"
       ]
     ]
   },
   {
-    "id": "4be3f63c.7d65d8",
+    "id": "e13819fd.c513e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5049.216827392578,
-    "y": 2207.883331298828,
-    "z": "7062000.f761",
+    "x": 5017.216827392578,
+    "y": 2200.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "573bcde0.7ae984"
+        "b46e83ff.b91008"
       ]
     ]
   },
   {
-    "id": "1e4a18fb.74350f",
+    "id": "a026e3da.a47c68",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4872.216827392578,
-    "y": 2215.883331298828,
-    "z": "7062000.f761",
+    "x": 4840.216827392578,
+    "y": 2208.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "4be3f63c.7d65d8"
+        "e13819fd.c513e8"
       ]
     ]
   },
   {
-    "id": "f06ad939.b3afb8",
+    "id": "cb357072.40504",
     "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": 5285.216827392578,
-    "y": 2089.883331298828,
-    "z": "7062000.f761",
+    "x": 5253.216827392578,
+    "y": 2082.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "573bcde0.7ae984",
+    "id": "b46e83ff.b91008",
     "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": 5284.216827392578,
-    "y": 2331.883331298828,
-    "z": "7062000.f761",
+    "x": 5252.216827392578,
+    "y": 2324.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "b94c1f46.28b1b8",
+    "id": "304be603.33560a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5465.216827392578,
-    "y": 2132.883331298828,
-    "z": "7062000.f761",
+    "x": 5433.216827392578,
+    "y": 2125.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9cca84a4.69e27"
+        "d9386700.ef3558"
       ]
     ]
   },
   {
-    "id": "73a98c16.ea7094",
+    "id": "7b7d3ebe.8d439",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5457.216827392578,
-    "y": 2187.883331298828,
-    "z": "7062000.f761",
+    "x": 5425.216827392578,
+    "y": 2180.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e1e079f9.7a9848"
+        "b1a122b9.2b3df"
       ]
     ]
   },
   {
-    "id": "1e6cb9ce.e34866",
+    "id": "4d809924.5591a8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5462.216827392578,
-    "y": 2244.883331298828,
-    "z": "7062000.f761",
+    "x": 5430.216827392578,
+    "y": 2237.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9609b4db.95e4f"
+        "7206a51a.368f14"
       ]
     ]
   },
   {
-    "id": "9609b4db.95e4f",
+    "id": "7206a51a.368f14",
     "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": 5614.216827392578,
-    "y": 2245.883331298828,
-    "z": "7062000.f761",
+    "x": 5582.216827392578,
+    "y": 2238.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e1e079f9.7a9848",
+    "id": "b1a122b9.2b3df",
     "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": 5625.216827392578,
-    "y": 2190.883331298828,
-    "z": "7062000.f761",
+    "x": 5593.216827392578,
+    "y": 2183.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "9cca84a4.69e27",
+    "id": "d9386700.ef3558",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5609.599151611328,
-    "y": 2130.5390014648438,
-    "z": "7062000.f761",
+    "x": 5577.599151611328,
+    "y": 2123.5390014648438,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b8027aff.eb46b"
+        "c475367c.4940f8"
       ]
     ]
   },
   {
-    "id": "b8027aff.eb46b",
+    "id": "c475367c.4940f8",
     "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": 5824.216827392578,
-    "y": 2126.883331298828,
-    "z": "7062000.f761",
+    "x": 5792.216827392578,
+    "y": 2119.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "cdada9b0.2f3a48",
+    "id": "6b01ec04.e8e8dc",
     "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`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
+    "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": 3322.883331298828,
-    "y": 1736.8833312988281,
-    "z": "7062000.f761",
+    "x": 3290.883331298828,
+    "y": 1729.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "95e31216.278c48",
+    "id": "6404a595.2767cc",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4544.883331298828,
-    "y": 1019.8833312988281,
-    "z": "7062000.f761",
+    "x": 4512.883331298828,
+    "y": 1012.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e1b848f1.cea8f8",
+    "id": "fdf288f5.399238",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4536.883331298828,
-    "y": 1109.8833312988281,
-    "z": "7062000.f761",
+    "x": 4504.883331298828,
+    "y": 1102.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "850e2800.badf2",
+    "id": "ce90c6ec.193398",
     "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`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
+    "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": 3303.883331298828,
-    "y": 2592.883331298828,
-    "z": "7062000.f761",
+    "x": 3271.883331298828,
+    "y": 2585.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "2b1064a0.eade7c",
+    "id": "323cec2c.88d45c",
     "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": 3454.883331298828,
-    "y": 2840.883331298828,
-    "z": "7062000.f761",
+    "x": 3422.883331298828,
+    "y": 2833.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a5bcbd5b.23b83",
+    "id": "fba2883c.72d2",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3331.883331298828,
-    "y": 2950.883331298828,
-    "z": "7062000.f761",
+    "x": 3299.883331298828,
+    "y": 2943.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "6b05a347.83dffc",
-        "734dd518.f869ec"
+        "b06a53c9.6a23c",
+        "52a66ca0.57e87c"
       ]
     ]
   },
   {
-    "id": "6b05a347.83dffc",
+    "id": "b06a53c9.6a23c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3515.883331298828,
-    "y": 2929.883331298828,
-    "z": "7062000.f761",
+    "x": 3483.883331298828,
+    "y": 2922.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "81013cf2.231a08"
+        "d4c9f2dc.11912"
       ]
     ]
   },
   {
-    "id": "734dd518.f869ec",
+    "id": "52a66ca0.57e87c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3051.883331298828,
-    "y": 4515.883331298828,
-    "z": "7062000.f761",
+    "x": 3019.883331298828,
+    "y": 4508.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "adcb6448.ea7478"
+        "7ebd19ad.940af8"
       ]
     ]
   },
   {
-    "id": "68da37f9.05cc18",
+    "id": "d74b6b50.22dd88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3562.883331298828,
-    "y": 5100.883331298828,
-    "z": "7062000.f761",
+    "x": 3530.883331298828,
+    "y": 5093.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d849eb29.b778b",
-        "fb71ca0a.fe8928",
-        "c01640bb.f526e8",
-        "298d7f45.2553b",
-        "4ebb86dc.a0713"
+        "b3935092.c652b8",
+        "28b03e50.9f7992",
+        "980b4828.96504",
+        "17af28da.ceda4f",
+        "2c43e5ee.399d8a"
       ]
     ]
   },
   {
-    "id": "81013cf2.231a08",
+    "id": "d4c9f2dc.11912",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6634.883331298828,
-    "y": 2959.883331298828,
-    "z": "7062000.f761",
+    "x": 6602.883331298828,
+    "y": 2952.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8a2aea1.11dcc18",
-        "f98cf202.f36e28",
-        "90c516f3.625c7",
-        "2f838a6e.450ff6",
-        "1aed0e7e.f8efea",
-        "c314ffe6.755b68",
-        "92f41cb.d6037e",
-        "1663311a.25772f",
-        "12533815.a962b",
-        "110e6104.d57bd7",
-        "9037ac75.0bc238",
-        "3017f19.9b8270e",
-        "b384a7be.8178a",
-        "bc57a86f.472ff",
-        "ca7cd34b.bc2bf",
-        "139339a2.2c6a06",
-        "3b830a4d.e803be",
-        "9ce39c8b.582fa",
-        "79c8e0a2.e2d0f"
+        "1d7e1faa.548828",
+        "85f258da.5f0598",
+        "4b074654.080e5",
+        "5d8ffada.d10fc4",
+        "ea403b0c.aaf7e",
+        "1235d80a.544f18",
+        "af33968a.8315c",
+        "9cfe0ae9.258d58",
+        "65dbbd5b.a49b4c",
+        "1d15547d.10576c",
+        "89a6c1ea.eb5688",
+        "2f9ad2ef.1013a6",
+        "a5dc8f9.8a79df",
+        "e38bf422.7c8768",
+        "43d0f5c9.60220c",
+        "2b09e0eb.8326d",
+        "1698c025.c5ee78",
+        "1d008796.234d18",
+        "76e889a9.7e8db8"
       ]
     ]
   },
   {
-    "id": "12533815.a962b",
+    "id": "65dbbd5b.a49b4c",
     "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": 6945.883331298828,
-    "y": 3314.883331298828,
-    "z": "7062000.f761",
+    "x": 6913.883331298828,
+    "y": 3307.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "8a2aea1.11dcc18",
+    "id": "1d7e1faa.548828",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6899.883331298828,
-    "y": 3412.883331298828,
-    "z": "7062000.f761",
+    "x": 6867.883331298828,
+    "y": 3405.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "f98cf202.f36e28",
+    "id": "85f258da.5f0598",
     "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": 7035.883331298828,
-    "y": 3459.883331298828,
-    "z": "7062000.f761",
+    "x": 7003.883331298828,
+    "y": 3452.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "c27f6f12.2b7db",
+    "id": "7c12d148.f08d78",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6866.883331298828,
-    "y": 3263.883331298828,
-    "z": "7062000.f761",
+    "x": 6834.883331298828,
+    "y": 3256.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "c8ec9937.7e8ac",
+    "id": "8342cd90.5a2f6",
     "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": 7392.883331298828,
-    "y": 3754.883331298828,
-    "z": "7062000.f761",
+    "x": 7360.883331298828,
+    "y": 3747.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "90c516f3.625c7",
+    "id": "4b074654.080e5",
     "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": 6956.883331298828,
-    "y": 3793.883331298828,
-    "z": "7062000.f761",
+    "x": 6924.883331298828,
+    "y": 3786.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f838a6e.450ff6",
+    "id": "5d8ffada.d10fc4",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6904.883331298828,
-    "y": 3844.883331298828,
-    "z": "7062000.f761",
+    "x": 6872.883331298828,
+    "y": 3837.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "1aed0e7e.f8efea",
+    "id": "ea403b0c.aaf7e",
     "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": 7040.883331298828,
-    "y": 3891.883331298828,
-    "z": "7062000.f761",
+    "x": 7008.883331298828,
+    "y": 3884.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "26cc918c.53f13e",
+    "id": "18aaa2dc.b37a3d",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 6897.883331298828,
-    "y": 3753.883331298828,
-    "z": "7062000.f761",
+    "x": 6865.883331298828,
+    "y": 3746.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "4f7a1677.0cc04",
+    "id": "b8a58f62.fd6f68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 7327.883331298828,
-    "y": 3950.883331298828,
-    "z": "7062000.f761",
+    "x": 7295.883331298828,
+    "y": 3943.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "c314ffe6.755b68",
+    "id": "1235d80a.544f18",
     "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": 6918.883331298828,
-    "y": 3997.883331298828,
-    "z": "7062000.f761",
+    "x": 6886.883331298828,
+    "y": 3990.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b94a6109.4587b8",
-        "244569e0.e8b39e",
-        "f408fad5.acd5c"
+        "caaa8d0a.a400c",
+        "ba918a95.063018",
+        "73076382.d5d394"
       ]
     ]
   },
   {
-    "id": "b94a6109.4587b8",
+    "id": "caaa8d0a.a400c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7165.883331298828,
-    "y": 3951.883331298828,
-    "z": "7062000.f761",
+    "x": 7133.883331298828,
+    "y": 3944.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "4f7a1677.0cc04"
+        "b8a58f62.fd6f68"
       ]
     ]
   },
   {
-    "id": "244569e0.e8b39e",
+    "id": "ba918a95.063018",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7166.374298095703,
-    "y": 3997.4573669433594,
-    "z": "7062000.f761",
+    "x": 7134.374298095703,
+    "y": 3990.4573669433594,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c4e6aa20.1e07c8"
+        "70335d13.df0d4c"
       ]
     ]
   },
   {
-    "id": "f408fad5.acd5c",
+    "id": "73076382.d5d394",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7163.883331298828,
-    "y": 4040.883331298828,
-    "z": "7062000.f761",
+    "x": 7131.883331298828,
+    "y": 4033.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5ee0d1d0.ddd63"
+        "3d4cb88b.ddae8"
       ]
     ]
   },
   {
-    "id": "c4e6aa20.1e07c8",
+    "id": "70335d13.df0d4c",
     "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": 7328.945709228516,
-    "y": 3997.7431030273438,
-    "z": "7062000.f761",
+    "x": 7296.945709228516,
+    "y": 3990.7431030273438,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5ee0d1d0.ddd63",
+    "id": "3d4cb88b.ddae8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 7332.883331298828,
-    "y": 4041.883331298828,
-    "z": "7062000.f761",
+    "x": 7300.883331298828,
+    "y": 4034.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "ca7cd34b.bc2bf",
+    "id": "43d0f5c9.60220c",
     "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": 6975.883331298828,
-    "y": 4276.883331298828,
-    "z": "7062000.f761",
+    "x": 6943.883331298828,
+    "y": 4269.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "139339a2.2c6a06",
+    "id": "2b09e0eb.8326d",
     "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": 6978.883331298828,
-    "y": 4321.883331298828,
-    "z": "7062000.f761",
+    "x": 6946.883331298828,
+    "y": 4314.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "9ce39c8b.582fa",
+    "id": "1d008796.234d18",
     "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": 6967.883331298828,
-    "y": 4112.883331298828,
-    "z": "7062000.f761",
+    "x": 6935.883331298828,
+    "y": 4105.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "79c8e0a2.e2d0f",
+    "id": "76e889a9.7e8db8",
     "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": 6969.883331298828,
-    "y": 4159.883331298828,
-    "z": "7062000.f761",
+    "x": 6937.883331298828,
+    "y": 4152.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a0361928.318ac8",
+    "id": "2304ec84.74d9f4",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 6891.883331298828,
-    "y": 4229.883331298828,
-    "z": "7062000.f761",
+    "x": 6859.883331298828,
+    "y": 4222.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d342acdf.02b8f",
+    "id": "175b5cd1.9f40e3",
     "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": 4521.883087158203,
-    "y": 5380.883331298828,
-    "z": "7062000.f761",
+    "x": 4489.883087158203,
+    "y": 5373.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "d849eb29.b778b",
+    "id": "b3935092.c652b8",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3777.883331298828,
-    "y": 5081.883331298828,
-    "z": "7062000.f761",
+    "x": 3745.883331298828,
+    "y": 5074.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ef9ce74a.0aa3e",
-        "75834f94.5997b"
+        "b8e9bffb.cdc88",
+        "256198d1.5f7cf8"
       ]
     ]
   },
   {
-    "id": "75834f94.5997b",
+    "id": "256198d1.5f7cf8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3949.883331298828,
-    "y": 5078.883331298828,
-    "z": "7062000.f761",
+    "x": 3917.883331298828,
+    "y": 5071.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f997d531.6d1e2"
+        "30a42efe.828c8a"
       ]
     ]
   },
   {
-    "id": "ef9ce74a.0aa3e",
+    "id": "b8e9bffb.cdc88",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3901.883331298828,
-    "y": 5925.883331298828,
-    "z": "7062000.f761",
+    "x": 3869.883331298828,
+    "y": 5918.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7f678eb1.f9d898"
+        "2ed5b6b9.722642"
       ]
     ]
   },
   {
-    "id": "94fb7d78.dd39a8",
+    "id": "9dc6e8a7.9c1158",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3962.883331298828,
-    "y": 5048.883331298828,
-    "z": "7062000.f761",
+    "x": 3930.883331298828,
+    "y": 5041.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d898a291.dc858",
+    "id": "e1ff48b3.343b9",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3972.883331298828,
-    "y": 5883.883331298828,
-    "z": "7062000.f761",
+    "x": 3940.883331298828,
+    "y": 5876.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "92f41cb.d6037e",
+    "id": "af33968a.8315c",
     "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": 6975.883331298828,
-    "y": 4385.883331298828,
-    "z": "7062000.f761",
+    "x": 6943.883331298828,
+    "y": 4378.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "f997d531.6d1e2",
+    "id": "30a42efe.828c8a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4125.883331298828,
-    "y": 5080.883331298828,
-    "z": "7062000.f761",
+    "x": 4093.883331298828,
+    "y": 5073.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "baabeea4.9ec638",
-        "fd2de0c3.4119c8",
-        "7962decb.29a4b8",
-        "1df2ddf.d8fc4a2",
-        "bb9baf34.d0edd",
-        "983065a0.b74e08",
-        "d342acdf.02b8f"
+        "2892dc09.31fadc",
+        "afa31c79.54acd8",
+        "e8807ba5.c313d8",
+        "f07ffbda.6acb28",
+        "78d94074.f38b7",
+        "95bef4a8.5a7ff8",
+        "175b5cd1.9f40e3"
       ]
     ]
   },
   {
-    "id": "4b2297b2.c2986",
+    "id": "d52f0d8d.4208d8",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5569.883087158203,
-    "y": 5005.883331298828,
-    "z": "7062000.f761",
+    "x": 5537.883087158203,
+    "y": 4998.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "baabeea4.9ec638",
+    "id": "2892dc09.31fadc",
     "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": 4516.883087158203,
-    "y": 5683.883331298828,
-    "z": "7062000.f761",
+    "x": 4484.883087158203,
+    "y": 5676.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "1663311a.25772f",
+    "id": "9cfe0ae9.258d58",
     "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": 6951.883331298828,
-    "y": 3653.883331298828,
-    "z": "7062000.f761",
+    "x": 6919.883331298828,
+    "y": 3646.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ac7755ab.b0ef2",
+    "id": "753d3ee1.bef8a",
     "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 = $prop.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3435.883331298828,
-    "y": 1842.8833312988281,
-    "z": "7062000.f761",
+    "x": 3403.883331298828,
+    "y": 1835.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "2976ed1.40d8712",
+    "id": "564c1334.4c1554",
     "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-p-interface-short`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3342.883331298828,
-    "y": 1789.8833312988281,
-    "z": "7062000.f761",
+    "x": 3310.883331298828,
+    "y": 1782.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "7c3bd1f7.b32788",
+    "id": "514b6193.3ff5b",
     "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": 7001.883331298828,
-    "y": 3356.883331298828,
-    "z": "7062000.f761",
+    "x": 6969.883331298828,
+    "y": 3349.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "110e6104.d57bd7",
+    "id": "1d15547d.10576c",
     "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": 6948.883331298828,
-    "y": 2944.883331298828,
-    "z": "7062000.f761",
+    "x": 6916.883331298828,
+    "y": 2937.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "9037ac75.0bc238",
+    "id": "89a6c1ea.eb5688",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6896.883331298828,
-    "y": 2992.883331298828,
-    "z": "7062000.f761",
+    "x": 6864.883331298828,
+    "y": 2985.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "3017f19.9b8270e",
+    "id": "2f9ad2ef.1013a6",
     "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": 7024.883331298828,
-    "y": 3039.883331298828,
-    "z": "7062000.f761",
+    "x": 6992.883331298828,
+    "y": 3032.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "2b4caca8.ebe43c",
+    "id": "baf2c2db.c807d8",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 6861.883331298828,
-    "y": 2902.883331298828,
-    "z": "7062000.f761",
+    "x": 6829.883331298828,
+    "y": 2895.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "b384a7be.8178a",
+    "id": "a5dc8f9.8a79df",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />",
     "comments": "",
     "outputs": 1,
-    "x": 6858.883331298828,
-    "y": 3130.883331298828,
-    "z": "7062000.f761",
+    "x": 6826.883331298828,
+    "y": 3123.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "bc57a86f.472ff",
+    "id": "e38bf422.7c8768",
     "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": 6951.883331298828,
-    "y": 3183.883331298828,
-    "z": "7062000.f761",
+    "x": 6919.883331298828,
+    "y": 3176.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a5d38ce2.eac838",
+    "id": "5474c24a.9f6dac",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 6842.883331298828,
-    "y": 3086.883331298828,
-    "z": "7062000.f761",
+    "x": 6810.883331298828,
+    "y": 3079.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "232bd10a.a8b54e",
+    "id": "63adea28.503954",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 6848.883331298828,
-    "y": 3536.883331298828,
-    "z": "7062000.f761",
+    "x": 6816.883331298828,
+    "y": 3529.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "1df2ddf.d8fc4a2",
+    "id": "f07ffbda.6acb28",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4438.883087158203,
-    "y": 5013.883331298828,
-    "z": "7062000.f761",
+    "x": 4406.883087158203,
+    "y": 5006.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "5696f41b.05cf84",
+    "id": "5623ebdb.1a4534",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4422.883087158203,
-    "y": 4969.883331298828,
-    "z": "7062000.f761",
+    "x": 4390.883087158203,
+    "y": 4962.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "462a954a.4cebb4",
+    "id": "4b470452.112d8c",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5169.883087158203,
-    "y": 5000.883331298828,
-    "z": "7062000.f761",
+    "x": 5137.883087158203,
+    "y": 4993.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5bab7896.e13d9",
+    "id": "effc1efd.4a1d3",
     "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": 5256.883087158203,
-    "y": 5042.883331298828,
-    "z": "7062000.f761",
+    "x": 5224.883087158203,
+    "y": 5035.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ec708b2b.d3c6e",
+    "id": "5c8eea0c.68cc14",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5204.883087158203,
-    "y": 5090.883331298828,
-    "z": "7062000.f761",
+    "x": 5172.883087158203,
+    "y": 5083.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "dea6b450.126ae",
+    "id": "e7adda57.489d68",
     "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": 5332.883087158203,
-    "y": 5137.883331298828,
-    "z": "7062000.f761",
+    "x": 5300.883087158203,
+    "y": 5130.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "983065a0.b74e08",
+    "id": "95bef4a8.5a7ff8",
     "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": 4509.883087158203,
-    "y": 5422.883331298828,
-    "z": "7062000.f761",
+    "x": 4477.883087158203,
+    "y": 5415.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "e263a78e.c8cba",
+    "id": "63c65355.a8cec4",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4492.883087158203,
-    "y": 5484.883331298828,
-    "z": "7062000.f761",
+    "x": 4460.883087158203,
+    "y": 5477.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "fd2de0c3.4119c8",
+    "id": "afa31c79.54acd8",
     "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": 4603.883087158203,
-    "y": 5526.883331298828,
-    "z": "7062000.f761",
+    "x": 4571.883087158203,
+    "y": 5519.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "631f5baa.6a836c",
+    "id": "be0ea96a.8229",
     "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": 5051.883087158203,
-    "y": 5579.883331298828,
-    "z": "7062000.f761",
+    "x": 5019.883087158203,
+    "y": 5572.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "4505fb5a.3099fc",
+    "id": "4ebf5b73.f18c34",
     "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": 4361.883087158203,
-    "y": 6277.883331298828,
-    "z": "7062000.f761",
+    "x": 4329.883087158203,
+    "y": 6270.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "78bf173f.567498",
+    "id": "58b6c88a.c0b81",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4294.883087158203,
-    "y": 6231.883331298828,
-    "z": "7062000.f761",
+    "x": 4262.883087158203,
+    "y": 6224.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "79075338.970b1c",
+    "id": "cd721269.4316d8",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4243.883087158203,
-    "y": 6182.883331298828,
-    "z": "7062000.f761",
+    "x": 4211.883087158203,
+    "y": 6175.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "552d64d8.079684",
+    "id": "be012245.15127",
     "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": 5026.883331298828,
-    "y": 6388.883331298828,
-    "z": "7062000.f761",
+    "x": 4994.883331298828,
+    "y": 6381.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "7962decb.29a4b8",
+    "id": "e8807ba5.c313d8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4430.883087158203,
-    "y": 5583.883331298828,
-    "z": "7062000.f761",
+    "x": 4398.883087158203,
+    "y": 5576.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a8868823.64a65",
-        "f3d79a89.da5f"
+        "572d7988.ef657",
+        "f53c00f0.cf63b8"
       ]
     ]
   },
   {
-    "id": "a8868823.64a65",
+    "id": "572d7988.ef657",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4641.883087158203,
-    "y": 5583.883331298828,
-    "z": "7062000.f761",
+    "x": 4609.883087158203,
+    "y": 5576.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8c7e9ec3.edd538"
+        "a96de56.d3d4f18"
       ]
     ]
   },
   {
-    "id": "8c7e9ec3.edd538",
+    "id": "a96de56.d3d4f18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4797.883087158203,
-    "y": 5579.883331298828,
-    "z": "7062000.f761",
+    "x": 4765.883087158203,
+    "y": 5572.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "631f5baa.6a836c",
-        "e719db8e.3b76c8",
-        "63d85a3d.4103fc"
+        "be0ea96a.8229",
+        "d676c28d.645a28",
+        "bc2e1526.9ae628"
       ]
     ]
   },
   {
-    "id": "f3d79a89.da5f",
+    "id": "f53c00f0.cf63b8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4637.883087158203,
-    "y": 5631.883331298828,
-    "z": "7062000.f761",
+    "x": 4605.883087158203,
+    "y": 5624.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c9509718.d9f2e8"
+        "d258f77c.8cc748"
       ]
     ]
   },
   {
-    "id": "c9509718.d9f2e8",
+    "id": "d258f77c.8cc748",
     "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": 4785.883087158203,
-    "y": 5626.883331298828,
-    "z": "7062000.f761",
+    "x": 4753.883087158203,
+    "y": 5619.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "10f1aa00.faee3e",
+    "id": "5438b6e6.1482f8",
     "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": 5293.883087158203,
-    "y": 5208.883331298828,
-    "z": "7062000.f761",
+    "x": 5261.883087158203,
+    "y": 5201.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "dca67cc5.30d2f8",
+    "id": "42097510.f58b64",
     "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": 2460.883331298828,
-    "y": 167.88333129882812,
-    "z": "7062000.f761",
+    "x": 2428.883331298828,
+    "y": 160.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce64f5e6.94469",
+    "id": "7a55e6a1.70e4b",
     "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": 2394.883331298828,
-    "y": 203.88333129882812,
-    "z": "7062000.f761",
+    "x": 2362.883331298828,
+    "y": 196.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "10c1b340.47f61d",
+    "id": "bf79a82b.b4ff98",
     "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": 2579.883331298828,
-    "y": 130.88333129882812,
-    "z": "7062000.f761",
+    "x": 2547.883331298828,
+    "y": 123.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "7299a42e.833c84",
+    "id": "7675dfe3.26b5f8",
     "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": 4328.883087158203,
-    "y": 6343.883331298828,
-    "z": "7062000.f761",
+    "x": 4296.883087158203,
+    "y": 6336.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "14b14bf.2fcb6b4",
+    "id": "ce5c7ab5.bd83c8",
     "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": 4461.883087158203,
-    "y": 6391.883331298828,
-    "z": "7062000.f761",
+    "x": 4429.883087158203,
+    "y": 6384.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "787fc902.6b8688",
+    "id": "60efc6f5.6c666",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4280.883087158203,
-    "y": 6449.883331298828,
-    "z": "7062000.f761",
+    "x": 4248.883087158203,
+    "y": 6442.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "17a7dc18.0b8f9c",
-        "f762f.a378f1d18"
+        "f080a66c.4f7ec8",
+        "652b319b.ab8708"
       ]
     ]
   },
   {
-    "id": "17a7dc18.0b8f9c",
+    "id": "f080a66c.4f7ec8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4473.883087158203,
-    "y": 6450.883331298828,
-    "z": "7062000.f761",
+    "x": 4441.883087158203,
+    "y": 6443.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "22a4f0b9.5cc3f"
+        "10a44adb.d38a25"
       ]
     ]
   },
   {
-    "id": "22a4f0b9.5cc3f",
+    "id": "10a44adb.d38a25",
     "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": 4629.883087158203,
-    "y": 6447.883331298828,
-    "z": "7062000.f761",
+    "x": 4597.883087158203,
+    "y": 6440.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f762f.a378f1d18",
+    "id": "652b319b.ab8708",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4477.883087158203,
-    "y": 6494.883331298828,
-    "z": "7062000.f761",
+    "x": 4445.883087158203,
+    "y": 6487.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "82673a8f.5388f"
+        "a7138657.394d98"
       ]
     ]
   },
   {
-    "id": "82673a8f.5388f",
+    "id": "a7138657.394d98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4616.883087158203,
-    "y": 6489.883331298828,
-    "z": "7062000.f761",
+    "x": 4584.883087158203,
+    "y": 6482.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "552d64d8.079684",
-        "b152a028.0e0e48",
-        "df3932b1.5cfd1",
-        "dd853f0d.c675b",
-        "6a2f520.9e626b",
-        "4ac1ad89.6ecd0c",
-        "5a7c34be.0eee64",
-        "f8b3148.1a90a68",
-        "506cbb81.2befbc",
-        "e29af13.61a371",
-        "1a8fecd4.39509b",
-        "2374b67.d3b424a"
+        "be012245.15127",
+        "cc830633.a13cc",
+        "cd9f0573.3ee2f8",
+        "a5be208e.ddaeb8",
+        "eaad5657.8cd72",
+        "eb39c4f9.289008",
+        "f25bfca7.d75338",
+        "ea968dfa.497e7",
+        "11d506a.c6a64f9",
+        "d968015c.39cda8",
+        "54a65e87.65172",
+        "11c77751.f259a1",
+        "9efae615.dd5ab"
       ]
     ]
   },
   {
-    "id": "5a7c34be.0eee64",
+    "id": "f25bfca7.d75338",
     "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": 4813.883087158203,
-    "y": 7168.883331298828,
-    "z": "7062000.f761",
+    "x": 4781.883087158203,
+    "y": 7161.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8d3fe228.0e9ab8",
-        "92f94e1c.33687",
-        "710bd5c.e65692c"
+        "3dba1ed8.091bf2",
+        "7f8f7997.fe796",
+        "d8010c15.3a2778"
       ]
     ]
   },
   {
-    "id": "8d3fe228.0e9ab8",
+    "id": "3dba1ed8.091bf2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5018.883087158203,
-    "y": 7165.883331298828,
-    "z": "7062000.f761",
+    "x": 4976.88330078125,
+    "y": 7137.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "867b5387.a77e68"
+        "1b65a6f4.4e2729"
       ]
     ]
   },
   {
-    "id": "92f94e1c.33687",
+    "id": "7f8f7997.fe796",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5002.374053955078,
-    "y": 7227.457366943359,
-    "z": "7062000.f761",
+    "x": 4969.374267578125,
+    "y": 7174.457336425781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "32a9210e.f5a66e"
+        "403902c8.70c854"
       ]
     ]
   },
   {
-    "id": "710bd5c.e65692c",
+    "id": "d8010c15.3a2778",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4999.883087158203,
-    "y": 7270.883331298828,
-    "z": "7062000.f761",
+    "x": 4966.88330078125,
+    "y": 7217.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5f13dad2.143724"
+        "ab2fcd35.01c098"
       ]
     ]
   },
   {
-    "id": "867b5387.a77e68",
+    "id": "1b65a6f4.4e2729",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5186.883331298828,
-    "y": 7160.883331298828,
-    "z": "7062000.f761",
+    "x": 5148.88330078125,
+    "y": 7135.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a6483ec8.fd095"
+        "c7100026.09f848"
       ]
     ]
   },
   {
-    "id": "32a9210e.f5a66e",
+    "id": "403902c8.70c854",
     "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": 5164.945465087891,
-    "y": 7227.743103027344,
-    "z": "7062000.f761",
+    "x": 5131.9456787109375,
+    "y": 7174.743072509766,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5f13dad2.143724",
+    "id": "ab2fcd35.01c098",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5166.883087158203,
-    "y": 7269.883331298828,
-    "z": "7062000.f761",
+    "x": 5133.88330078125,
+    "y": 7216.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a6483ec8.fd095",
+    "id": "c7100026.09f848",
     "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": 5421.883087158203,
-    "y": 7176.883331298828,
-    "z": "7062000.f761",
+    "x": 5389.883087158203,
+    "y": 7169.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "2bfd9e0f.b0b65a"
+        "746d723d.92756c"
       ]
     ]
   },
   {
-    "id": "2bfd9e0f.b0b65a",
+    "id": "746d723d.92756c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5658.883087158203,
-    "y": 7172.883331298828,
-    "z": "7062000.f761",
+    "x": 5626.883087158203,
+    "y": 7165.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f7d1e8ad.4dc7b8"
+        "c84e8944.ab748"
       ]
     ]
   },
   {
-    "id": "58dab986.f5f5a",
+    "id": "9e3ec759.f9e0d",
     "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": 5925.883087158203,
-    "y": 7138.883331298828,
-    "z": "7062000.f761",
+    "x": 5893.883087158203,
+    "y": 7131.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "25d3132f.f14084",
-        "88844ebd.a9a5b"
+        "4fee4c24.360bcc",
+        "4314046.5a68afc"
       ]
     ]
   },
   {
-    "id": "25d3132f.f14084",
+    "id": "4fee4c24.360bcc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6106.883087158203,
-    "y": 7164.883331298828,
-    "z": "7062000.f761",
+    "x": 6074.883087158203,
+    "y": 7157.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f7d1e8ad.4dc7b8"
+        "c84e8944.ab748"
       ]
     ]
   },
   {
-    "id": "88844ebd.a9a5b",
+    "id": "4314046.5a68afc",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6105.883087158203,
-    "y": 7117.883331298828,
-    "z": "7062000.f761",
+    "x": 6073.883087158203,
+    "y": 7110.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "f7d1e8ad.4dc7b8",
+    "id": "c84e8944.ab748",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4849.883087158203,
-    "y": 7439.883331298828,
-    "z": "7062000.f761",
+    "x": 4590.88330078125,
+    "y": 7305.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a21574dc.7f1048"
+        "cbf296b5.4a44d"
       ]
     ]
   },
   {
-    "id": "da2d189.a0c85e8",
+    "id": "1eeaf51a.0f85d3",
     "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": 5698.883087158203,
-    "y": 7344.883331298828,
-    "z": "7062000.f761",
+    "x": 5666.883087158203,
+    "y": 7337.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "9ec2c103.e591",
+    "id": "75dd5c17.2526e4",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4911.883087158203,
-    "y": 7115.883331298828,
-    "z": "7062000.f761",
+    "x": 4879.88330078125,
+    "y": 7073.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "4ac1ad89.6ecd0c",
+    "id": "eb39c4f9.289008",
     "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": 4795.883087158203,
-    "y": 6964.883331298828,
-    "z": "7062000.f761",
+    "x": 4763.883087158203,
+    "y": 6957.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "2add06b4.24634a",
+    "id": "5dce4a96.7e6e5c",
     "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": 5140.883087158203,
-    "y": 6795.883331298828,
-    "z": "7062000.f761",
+    "x": 5108.883087158203,
+    "y": 6788.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a410e22f.bcf42"
+        "f4b6cbdd.4872c"
       ]
     ]
   },
   {
-    "id": "a410e22f.bcf42",
+    "id": "f4b6cbdd.4872c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5360.883087158203,
-    "y": 6801.883331298828,
-    "z": "7062000.f761",
+    "x": 5328.883087158203,
+    "y": 6794.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "22269296.bf623e"
+        "49771dd5.9b717c"
       ]
     ]
   },
   {
-    "id": "22269296.bf623e",
+    "id": "49771dd5.9b717c",
     "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": 5545.883087158203,
-    "y": 6800.883331298828,
-    "z": "7062000.f761",
+    "x": 5513.883087158203,
+    "y": 6793.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "66b1e6be.5824e"
+        "444eff53.bd878"
       ]
     ]
   },
   {
-    "id": "66b1e6be.5824e",
+    "id": "444eff53.bd878",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5737.883087158203,
-    "y": 6803.883331298828,
-    "z": "7062000.f761",
+    "x": 5705.883087158203,
+    "y": 6796.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "19dd27ef.ab039"
+        "149f57f1.fd7a"
       ]
     ]
   },
   {
-    "id": "19dd27ef.ab039",
+    "id": "149f57f1.fd7a",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5946.883087158203,
-    "y": 6801.883331298828,
-    "z": "7062000.f761",
+    "x": 5914.883087158203,
+    "y": 6794.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f8b3148.1a90a68",
+    "id": "ea968dfa.497e7",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4847.883087158203,
-    "y": 6789.883331298828,
-    "z": "7062000.f761",
+    "x": 4815.883087158203,
+    "y": 6782.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "2add06b4.24634a"
+        "5dce4a96.7e6e5c"
       ]
     ]
   },
   {
-    "id": "df3932b1.5cfd1",
+    "id": "cd9f0573.3ee2f8",
     "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": 4855.883087158203,
-    "y": 6682.883331298828,
-    "z": "7062000.f761",
+    "x": 4823.883087158203,
+    "y": 6675.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "6d632da3.ca2994",
-        "65bd7037.bc9ea",
-        "29b67365.cad774"
+        "e6c84893.53204",
+        "5e294103.3f0c78",
+        "8261318b.eb457"
       ]
     ]
   },
   {
-    "id": "6d632da3.ca2994",
+    "id": "e6c84893.53204",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5091.883087158203,
-    "y": 6665.883331298828,
-    "z": "7062000.f761",
+    "x": 5059.883087158203,
+    "y": 6658.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "65bd7037.bc9ea",
+    "id": "5e294103.3f0c78",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5088.883087158203,
-    "y": 6706.883331298828,
-    "z": "7062000.f761",
+    "x": 5056.883087158203,
+    "y": 6699.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "29b67365.cad774",
+    "id": "8261318b.eb457",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5102.883087158203,
-    "y": 6746.883331298828,
-    "z": "7062000.f761",
+    "x": 5070.883087158203,
+    "y": 6739.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "dd853f0d.c675b",
+    "id": "a5be208e.ddaeb8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4791.883087158203,
-    "y": 6841.883331298828,
-    "z": "7062000.f761",
+    "x": 4759.883087158203,
+    "y": 6834.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "6a2f520.9e626b",
+    "id": "eaad5657.8cd72",
     "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": 4799.883087158203,
-    "y": 6899.883331298828,
-    "z": "7062000.f761",
+    "x": 4767.883087158203,
+    "y": 6892.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "b152a028.0e0e48",
+    "id": "cc830633.a13cc",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4804.883087158203,
-    "y": 6639.883331298828,
-    "z": "7062000.f761",
+    "x": 4772.883087158203,
+    "y": 6632.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3d7b7763.09cfd",
+    "id": "904e1ae5.bbd558",
     "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": 4919.883087158203,
-    "y": 6591.883331298828,
-    "z": "7062000.f761",
+    "x": 4887.883087158203,
+    "y": 6584.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a21574dc.7f1048",
+    "id": "cbf296b5.4a44d",
     "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": 5092.883087158203,
-    "y": 7436.883331298828,
-    "z": "7062000.f761",
+    "x": 4880.88330078125,
+    "y": 7300.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b03df3ba.8ce8d8",
-        "c15c4a9f.54e778"
+        "a993ecb7.4e75a",
+        "50a501d.eb089"
       ]
     ]
   },
   {
-    "id": "b03df3ba.8ce8d8",
+    "id": "a993ecb7.4e75a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5321.883087158203,
-    "y": 7413.883331298828,
-    "z": "7062000.f761",
+    "x": 5136.88330078125,
+    "y": 7272.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b68c7fcf.24567"
+        "2f3de295.447b1e"
       ]
     ]
   },
   {
-    "id": "c15c4a9f.54e778",
+    "id": "50a501d.eb089",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5321.883087158203,
-    "y": 7462.883331298828,
-    "z": "7062000.f761",
+    "x": 5136.88330078125,
+    "y": 7321.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "b68c7fcf.24567",
+    "id": "ed22a86b.d791b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5482.883087158203,
-    "y": 7418.883331298828,
-    "z": "7062000.f761",
+    "x": 5402.88330078125,
+    "y": 7313.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "57615513.3c37ac",
-        "da2d189.a0c85e8",
-        "aa5be19c.b28bd"
+        "5c9c1b49.b9b35c",
+        "1eeaf51a.0f85d3",
+        "e4035d6c.e05158"
       ]
     ]
   },
   {
-    "id": "41927c2c.53b90c",
+    "id": "f63796a1.344c48",
     "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": 5826.883087158203,
-    "y": 7398.883331298828,
-    "z": "7062000.f761",
+    "x": 5794.883087158203,
+    "y": 7391.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "aa5be19c.b28bd",
+    "id": "e4035d6c.e05158",
     "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": 5796.883087158203,
-    "y": 7458.883331298828,
-    "z": "7062000.f761",
+    "x": 5764.883087158203,
+    "y": 7451.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "57615513.3c37ac",
+    "id": "5c9c1b49.b9b35c",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5703.883087158203,
-    "y": 7286.883331298828,
-    "z": "7062000.f761",
+    "x": 5671.883087158203,
+    "y": 7279.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "7f678eb1.f9d898",
+    "id": "2ed5b6b9.722642",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4053.883331298828,
-    "y": 5924.883331298828,
-    "z": "7062000.f761",
+    "x": 4021.883331298828,
+    "y": 5917.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "78bf173f.567498",
-        "7299a42e.833c84",
-        "14b14bf.2fcb6b4",
-        "787fc902.6b8688",
-        "4505fb5a.3099fc"
+        "58b6c88a.c0b81",
+        "7675dfe3.26b5f8",
+        "ce5c7ab5.bd83c8",
+        "60efc6f5.6c666",
+        "4ebf5b73.f18c34"
       ]
     ]
   },
   {
-    "id": "950e3220.8c6648",
+    "id": "8e0e6c35.35f418",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4796.883087158203,
-    "y": 6739.883331298828,
-    "z": "7062000.f761",
+    "x": 4764.883087158203,
+    "y": 6732.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "506cbb81.2befbc",
+    "id": "11d506a.c6a64f9",
     "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": 4919.883331298828,
-    "y": 6469.883331298828,
-    "z": "7062000.f761",
+    "x": 4887.883331298828,
+    "y": 6462.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce6bcae6.279bf",
+    "id": "4d39072e.34b5f8",
     "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": 5056.883331298828,
-    "y": 6419.883331298828,
-    "z": "7062000.f761",
+    "x": 5024.883331298828,
+    "y": 6412.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3b830a4d.e803be",
+    "id": "1698c025.c5ee78",
     "type": "save",
     "name": "save ROOT UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6864.883331298828,
-    "y": 3595.883331298828,
-    "z": "7062000.f761",
+    "x": 6832.883331298828,
+    "y": 3588.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "debea5ca.c5efb8",
+    "id": "63d6aa7c.b5a514",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 4070.883331298828,
-    "y": 1820.8833312988281,
-    "z": "7062000.f761",
+    "x": 4038.883331298828,
+    "y": 1813.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "dcf5d1.89c23a3",
+    "id": "3aa74194.8661ee",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 4048.883331298828,
-    "y": 2690.883331298828,
-    "z": "7062000.f761",
+    "x": 4016.883331298828,
+    "y": 2683.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3dc14de7.91d75a",
+    "id": "b098a36d.e0c3e",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 6855.883331298828,
-    "y": 4062.883331298828,
-    "z": "7062000.f761",
+    "x": 6823.883331298828,
+    "y": 4055.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "2530e84c.0abb78",
+    "id": "2f2ed9c0.e0663e",
     "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": 3560.883331298828,
-    "y": 6064.883331298828,
-    "z": "7062000.f761",
+    "x": 3528.883331298828,
+    "y": 6057.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "fb71ca0a.fe8928",
+    "id": "28b03e50.9f7992",
     "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": 3771.883331298828,
-    "y": 4941.883331298828,
-    "z": "7062000.f761",
+    "x": 3739.883331298828,
+    "y": 4934.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "c01640bb.f526e8",
+    "id": "980b4828.96504",
     "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": 3904.883331298828,
-    "y": 4989.883331298828,
-    "z": "7062000.f761",
+    "x": 3872.883331298828,
+    "y": 4982.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "bb9baf34.d0edd",
+    "id": "78d94074.f38b7",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4449.883087158203,
-    "y": 5069.883331298828,
-    "z": "7062000.f761",
+    "x": 4417.883087158203,
+    "y": 5062.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9b70cfc4.c55e3",
-        "fdbb8f8a.783248"
+        "bc43fa2d.411608",
+        "7dd6f63d.8487f"
       ]
     ]
   },
   {
-    "id": "9b70cfc4.c55e3",
+    "id": "bc43fa2d.411608",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4642.883087158203,
-    "y": 5070.883331298828,
-    "z": "7062000.f761",
+    "x": 4610.883087158203,
+    "y": 5063.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c1e58440.70184"
+        "c471dfd.f92dba"
       ]
     ]
   },
   {
-    "id": "fdbb8f8a.783248",
+    "id": "7dd6f63d.8487f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4646.883087158203,
-    "y": 5114.883331298828,
-    "z": "7062000.f761",
+    "x": 4614.883087158203,
+    "y": 5107.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "75c1affe.0ddba8"
+        "a8ff6a7c.81ae98"
       ]
     ]
   },
   {
-    "id": "75c1affe.0ddba8",
+    "id": "a8ff6a7c.81ae98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4785.883087158203,
-    "y": 5109.883331298828,
-    "z": "7062000.f761",
+    "x": 4753.883087158203,
+    "y": 5102.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "4c2b44d5.f7301c",
-        "6ccb98db.74d4e8",
-        "d416487a.185998"
+        "a2ef082b.b2f048",
+        "fa92cb40.708c7",
+        "c4bba10e.ae5948"
       ]
     ]
   },
   {
-    "id": "c1e58440.70184",
+    "id": "c471dfd.f92dba",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4785.883087158203,
-    "y": 5066.883331298828,
-    "z": "7062000.f761",
+    "x": 4753.883087158203,
+    "y": 5059.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5bab7896.e13d9",
-        "ec708b2b.d3c6e",
-        "dea6b450.126ae",
-        "10f1aa00.faee3e"
+        "effc1efd.4a1d3",
+        "5c8eea0c.68cc14",
+        "e7adda57.489d68",
+        "5438b6e6.1482f8"
       ]
     ]
   },
   {
-    "id": "4c2b44d5.f7301c",
+    "id": "a2ef082b.b2f048",
     "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": 5179.883087158203,
-    "y": 5360.883331298828,
-    "z": "7062000.f761",
+    "x": 5147.883087158203,
+    "y": 5353.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "eb20f196.54125",
+    "id": "963dc7de.4f275",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5186.883087158203,
-    "y": 5314.883331298828,
-    "z": "7062000.f761",
+    "x": 5154.883087158203,
+    "y": 5307.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e29af13.61a371",
+    "id": "d968015c.39cda8",
     "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": 4984.883087158203,
-    "y": 7064.883331298828,
-    "z": "7062000.f761",
+    "x": 4944.88330078125,
+    "y": 7022.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "6ccb98db.74d4e8",
+    "id": "fa92cb40.708c7",
     "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": 5298.883087158203,
-    "y": 5413.883331298828,
-    "z": "7062000.f761",
+    "x": 5266.883087158203,
+    "y": 5406.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "e719db8e.3b76c8",
+    "id": "d676c28d.645a28",
     "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": 5180.883087158203,
-    "y": 5631.883331298828,
-    "z": "7062000.f761",
+    "x": 5148.883087158203,
+    "y": 5624.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "d1afb38c.0141a8",
+    "id": "3d7bbeb8.4fb6ea",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3735.883331298828,
-    "y": 4539.883331298828,
-    "z": "7062000.f761",
+    "x": 3703.883331298828,
+    "y": 4532.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "42d36cb1.4fa424",
+    "id": "b16bd91d.551568",
     "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": 4069.883331298828,
-    "y": 4722.883331298828,
-    "z": "7062000.f761",
+    "x": 4037.883331298828,
+    "y": 4715.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "298d7f45.2553b",
+    "id": "17af28da.ceda4f",
     "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": 3681.883331298828,
-    "y": 4589.883331298828,
-    "z": "7062000.f761",
+    "x": 3649.883331298828,
+    "y": 4582.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9ef5d43.2b0bca8",
-        "3ef07e30.e6e7da",
-        "f6dffd82.1f8af"
+        "1c28f8e9.5cfb07",
+        "7bdf0726.9bbbb8",
+        "d03c4576.8b0b7"
       ]
     ]
   },
   {
-    "id": "3ef07e30.e6e7da",
+    "id": "7bdf0726.9bbbb8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3909.374298095703,
-    "y": 4562.457305908203,
-    "z": "7062000.f761",
+    "x": 3877.374298095703,
+    "y": 4555.457305908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "afd7cfee.d60a88"
+        "6a9d8f.c783f27"
       ]
     ]
   },
   {
-    "id": "f6dffd82.1f8af",
+    "id": "d03c4576.8b0b7",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3904.883331298828,
-    "y": 4606.883270263672,
-    "z": "7062000.f761",
+    "x": 3872.883331298828,
+    "y": 4599.883270263672,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "718ca986.9a7a48"
+        "732d0fc7.ef1e4"
       ]
     ]
   },
   {
-    "id": "afd7cfee.d60a88",
+    "id": "6a9d8f.c783f27",
     "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": 4071.945831298828,
-    "y": 4561.743011474609,
-    "z": "7062000.f761",
+    "x": 4039.945831298828,
+    "y": 4554.743011474609,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "718ca986.9a7a48",
+    "id": "732d0fc7.ef1e4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4072.883331298828,
-    "y": 4606.883270263672,
-    "z": "7062000.f761",
+    "x": 4040.883331298828,
+    "y": 4599.883270263672,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "bbe16e71.3e09e8",
+    "id": "2b632ac5.849276",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3857.883331298828,
-    "y": 4679.883331298828,
-    "z": "7062000.f761",
+    "x": 3825.883331298828,
+    "y": 4672.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "2abf34d.6a0b3cc",
-        "42d36cb1.4fa424"
+        "d3a7ff82.f011",
+        "b16bd91d.551568"
       ]
     ]
   },
   {
-    "id": "9ef5d43.2b0bca8",
+    "id": "1c28f8e9.5cfb07",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3688.883331298828,
-    "y": 4679.883331298828,
-    "z": "7062000.f761",
+    "x": 3656.883331298828,
+    "y": 4672.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "bbe16e71.3e09e8"
+        "2b632ac5.849276"
       ]
     ]
   },
   {
-    "id": "2abf34d.6a0b3cc",
+    "id": "d3a7ff82.f011",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4046.883331298828,
-    "y": 4671.883331298828,
-    "z": "7062000.f761",
+    "x": 4014.883331298828,
+    "y": 4664.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "4ebb86dc.a0713",
+    "id": "2c43e5ee.399d8a",
     "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": 3879.883331298828,
-    "y": 4817.883331298828,
-    "z": "7062000.f761",
+    "x": 3847.883331298828,
+    "y": 4810.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "e230ac3e.9cb188",
+    "id": "97722063.27aea",
     "type": "comment",
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",
     "info": "",
     "comments": "",
-    "x": 3662.883331298828,
-    "y": 2900.883331298828,
-    "z": "7062000.f761",
+    "x": 3630.883331298828,
+    "y": 2893.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3d29417.d2eee3e",
+    "id": "65778a7a.89ed44",
     "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": 3517.883331298828,
-    "y": 4467.883331298828,
-    "z": "7062000.f761",
+    "x": 3485.883331298828,
+    "y": 4460.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "c01a7bbf.331a48",
+    "id": "a2d538df.980d68",
     "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": 3290.883331298828,
-    "y": 4735.883331298828,
-    "z": "7062000.f761",
+    "x": 3258.883331298828,
+    "y": 4728.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "19c2896c.95fdb7",
-        "cde01ebb.100c6"
+        "43a12633.7a37a8",
+        "6d14b300.778b24"
       ]
     ]
   },
   {
-    "id": "adcb6448.ea7478",
+    "id": "7ebd19ad.940af8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3122.883331298828,
-    "y": 4738.883331298828,
-    "z": "7062000.f761",
+    "x": 3090.883331298828,
+    "y": 4731.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c01a7bbf.331a48"
+        "a2d538df.980d68"
       ]
     ]
   },
   {
-    "id": "cde01ebb.100c6",
+    "id": "6d14b300.778b24",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3453.883331298828,
-    "y": 4754.883331298828,
-    "z": "7062000.f761",
+    "x": 3421.883331298828,
+    "y": 4747.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "68da37f9.05cc18"
+        "d74b6b50.22dd88"
       ]
     ]
   },
   {
-    "id": "19c2896c.95fdb7",
+    "id": "43a12633.7a37a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3489.883331298828,
-    "y": 3361.883331298828,
-    "z": "7062000.f761",
+    "x": 3457.883331298828,
+    "y": 3354.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b19d09a1.5b2a5"
+        "fd9ecd52.f0eec"
       ]
     ]
   },
   {
-    "id": "e9cce0c6.04cdf8",
+    "id": "58f27ca9.e6694c",
     "type": "switchNode",
     "name": "switch leafuni.data-source == gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3805.883331298828,
-    "y": 3413.883331298828,
-    "z": "7062000.f761",
+    "x": 3773.883331298828,
+    "y": 3406.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "24dd4d51.dc7852",
-        "a81116be.6c3738"
+        "f8970eb9.db20d",
+        "767d527f.e764f4"
       ]
     ]
   },
   {
-    "id": "24dd4d51.dc7852",
+    "id": "f8970eb9.db20d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4010.883331298828,
-    "y": 3409.883331298828,
-    "z": "7062000.f761",
+    "x": 3978.883331298828,
+    "y": 3402.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a81116be.6c3738",
+    "id": "767d527f.e764f4",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4012.883331298828,
-    "y": 3459.883331298828,
-    "z": "7062000.f761",
+    "x": 3980.883331298828,
+    "y": 3452.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "29997430.010c94"
+        "e0571d8f.b0d5c"
       ]
     ]
   },
   {
-    "id": "29997430.010c94",
+    "id": "e0571d8f.b0d5c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4168.883331298828,
-    "y": 3465.883331298828,
-    "z": "7062000.f761",
+    "x": 4136.883331298828,
+    "y": 3458.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f4475341.93d378",
-        "4264dea0.b43bb8",
-        "5f09d2da.19bfa4",
-        "c71fd59.dfc0428"
+        "29bbf41c.92a224",
+        "892518e7.2c6e68",
+        "36c28209.5e5a0e",
+        "b822f518.1b138"
       ]
     ]
   },
   {
-    "id": "f4475341.93d378",
+    "id": "29bbf41c.92a224",
     "type": "set",
     "name": "set bwModified",
     "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 4394.883575439453,
-    "y": 3206.883331298828,
-    "z": "7062000.f761",
+    "x": 4362.883575439453,
+    "y": 3199.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5f1f0cb4.e46a84",
+    "id": "f218f6e.d910588",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4926.883056640625,
-    "y": 4293.88330078125,
-    "z": "7062000.f761",
+    "x": 4894.883056640625,
+    "y": 4286.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "293be2f2.0d66a6",
-        "898be63d.63497"
+        "a5aad4b.a7f08a8",
+        "7594985d.bdad18"
       ]
     ]
   },
   {
-    "id": "898be63d.63497",
+    "id": "7594985d.bdad18",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5128.8828125,
-    "y": 4260.88330078125,
-    "z": "7062000.f761",
+    "x": 5096.8828125,
+    "y": 4253.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "853d7a8b.2e02f",
+    "id": "a04d2a4d.17b14",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4812.88330078125,
-    "y": 4470.883056640625,
-    "z": "7062000.f761",
+    "x": 4780.88330078125,
+    "y": 4463.883056640625,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "1915e47b.7ebf64",
+    "id": "3892fdc5.2518b2",
     "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": 4809.9454345703125,
-    "y": 4419.743072509766,
-    "z": "7062000.f761",
+    "x": 4777.9454345703125,
+    "y": 4412.743072509766,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "caf66330.b1b298",
+    "id": "809a6f2e.e2cff",
     "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": 4392.883056640625,
-    "y": 4293.88330078125,
-    "z": "7062000.f761",
+    "x": 4360.883056640625,
+    "y": 4286.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ee97b865.b6783"
+        "663c1b4b.a64fcc"
       ]
     ]
   },
   {
-    "id": "ee97b865.b6783",
+    "id": "663c1b4b.a64fcc",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4597.883056640625,
-    "y": 4293.88330078125,
-    "z": "7062000.f761",
+    "x": 4565.883056640625,
+    "y": 4286.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c8ca8353.4e5678"
+        "4c765f5a.bea65"
       ]
     ]
   },
   {
-    "id": "c8ca8353.4e5678",
+    "id": "4c765f5a.bea65",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4763.883056640625,
-    "y": 4293.88330078125,
-    "z": "7062000.f761",
+    "x": 4731.883056640625,
+    "y": 4286.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5f1f0cb4.e46a84"
+        "f218f6e.d910588"
       ]
     ]
   },
   {
-    "id": "293be2f2.0d66a6",
+    "id": "a5aad4b.a7f08a8",
     "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": 4435.883056640625,
-    "y": 4371.88330078125,
-    "z": "7062000.f761",
+    "x": 4403.883056640625,
+    "y": 4364.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "82c1720.e28a61",
-        "745eb7b1.5e824",
-        "fa83b701.248a2"
+        "6b0b4a54.7d0dd4",
+        "c44b1722.eadf8",
+        "30cd81de.fee396"
       ]
     ]
   },
   {
-    "id": "82c1720.e28a61",
+    "id": "6b0b4a54.7d0dd4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4646.883056640625,
-    "y": 4373.88330078125,
-    "z": "7062000.f761",
+    "x": 4614.883056640625,
+    "y": 4366.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "74de082.69b8bf8"
+        "d1d7ad20.29b52"
       ]
     ]
   },
   {
-    "id": "745eb7b1.5e824",
+    "id": "c44b1722.eadf8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4647.3740234375,
-    "y": 4419.457336425781,
-    "z": "7062000.f761",
+    "x": 4615.3740234375,
+    "y": 4412.457336425781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "1915e47b.7ebf64"
+        "3892fdc5.2518b2"
       ]
     ]
   },
   {
-    "id": "fa83b701.248a2",
+    "id": "30cd81de.fee396",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4644.883056640625,
-    "y": 4462.88330078125,
-    "z": "7062000.f761",
+    "x": 4612.883056640625,
+    "y": 4455.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "853d7a8b.2e02f"
+        "a04d2a4d.17b14"
       ]
     ]
   },
   {
-    "id": "b19d09a1.5b2a5",
+    "id": "fd9ecd52.f0eec",
     "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": 3679.883331298828,
-    "y": 3256.883331298828,
-    "z": "7062000.f761",
+    "x": 3647.883331298828,
+    "y": 3249.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9b46823e.72756",
-        "35aaafce.bf5cc8",
-        "d1f12cfb.14a2c8"
+        "3062cdfd.42c69a",
+        "db9f52e5.d7dfa8",
+        "aae84cfb.f1edc"
       ]
     ]
   },
   {
-    "id": "35aaafce.bf5cc8",
+    "id": "db9f52e5.d7dfa8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3907.374298095703,
-    "y": 3229.457305908203,
-    "z": "7062000.f761",
+    "x": 3875.374298095703,
+    "y": 3222.457305908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c379ee48.9a04a"
+        "557116c4.068f88"
       ]
     ]
   },
   {
-    "id": "d1f12cfb.14a2c8",
+    "id": "aae84cfb.f1edc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3902.883331298828,
-    "y": 3273.883270263672,
-    "z": "7062000.f761",
+    "x": 3870.883331298828,
+    "y": 3266.883270263672,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7e073ce5.e1fbec"
+        "270e15a6.70575a"
       ]
     ]
   },
   {
-    "id": "c379ee48.9a04a",
+    "id": "557116c4.068f88",
     "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": 4069.945831298828,
-    "y": 3228.7430114746094,
-    "z": "7062000.f761",
+    "x": 4037.945831298828,
+    "y": 3221.7430114746094,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "7e073ce5.e1fbec",
+    "id": "270e15a6.70575a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4070.883331298828,
-    "y": 3273.883270263672,
-    "z": "7062000.f761",
+    "x": 4038.883331298828,
+    "y": 3266.883270263672,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "9b46823e.72756",
+    "id": "3062cdfd.42c69a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3914.883331298828,
-    "y": 3323.883331298828,
-    "z": "7062000.f761",
+    "x": 3882.883331298828,
+    "y": 3316.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e9cce0c6.04cdf8"
+        "58f27ca9.e6694c"
       ]
     ]
   },
   {
-    "id": "715dcd2e.3d9a6c",
+    "id": "d823dcb2.3ea1b",
     "type": "comment",
     "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",
     "info": "",
     "comments": "",
-    "x": 3804.7666625976562,
-    "y": 3514.7666625976562,
-    "z": "7062000.f761",
+    "x": 3772.7666625976562,
+    "y": 3507.7666625976562,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "b78f20d3.5b466",
+    "id": "a7eccb2d.bd2018",
     "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": 3819.483428955078,
-    "y": 3866.566680908203,
-    "z": "7062000.f761",
+    "x": 3787.483428955078,
+    "y": 3859.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "9e72dea1.067a48",
+    "id": "a53a5ddb.dd60f",
     "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": 3957.483428955078,
-    "y": 3924.566680908203,
-    "z": "7062000.f761",
+    "x": 3925.483428955078,
+    "y": 3917.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "4264dea0.b43bb8",
+    "id": "892518e7.2c6e68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3535.483428955078,
-    "y": 3605.966583251953,
-    "z": "7062000.f761",
+    "x": 3503.483428955078,
+    "y": 3598.966583251953,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ea9a5f5d.8f9bf8",
-        "1c248a70.8f6db6",
-        "1f0e75d7.8b5a2a"
+        "b4ed3622.c08",
+        "c0c356fb.babc",
+        "67daf127.7e6a38"
       ]
     ]
   },
   {
-    "id": "d32411c9.b56a18",
+    "id": "fce3ea32.0915b",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3776.483428955078,
-    "y": 4034.366729736328,
-    "z": "7062000.f761",
+    "x": 3744.483428955078,
+    "y": 4027.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e283eb67.9ec4b",
-        "f5e18bc8.e6b668"
+        "fda5acc2.f20fe",
+        "e480dda8.f10d98"
       ]
     ]
   },
   {
-    "id": "e283eb67.9ec4b",
+    "id": "fda5acc2.f20fe",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3969.483428955078,
-    "y": 4035.366729736328,
-    "z": "7062000.f761",
+    "x": 3937.483428955078,
+    "y": 4028.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ead422bf.e71108"
+        "90393c50.c5c688"
       ]
     ]
   },
   {
-    "id": "f5e18bc8.e6b668",
+    "id": "e480dda8.f10d98",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3973.483428955078,
-    "y": 4079.366729736328,
-    "z": "7062000.f761",
+    "x": 3941.483428955078,
+    "y": 4072.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c6dc9f70.44622"
+        "c7e0a8ee.d6f32"
       ]
     ]
   },
   {
-    "id": "c6dc9f70.44622",
+    "id": "c7e0a8ee.d6f32",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4112.483428955078,
-    "y": 4074.366729736328,
-    "z": "7062000.f761",
+    "x": 4080.483428955078,
+    "y": 4067.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "caf66330.b1b298"
+        "809a6f2e.e2cff"
       ]
     ]
   },
   {
-    "id": "ead422bf.e71108",
+    "id": "90393c50.c5c688",
     "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": 4113.483428955078,
-    "y": 4031.566680908203,
-    "z": "7062000.f761",
+    "x": 4081.483428955078,
+    "y": 4024.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5f09d2da.19bfa4",
+    "id": "36c28209.5e5a0e",
     "type": "switchNode",
     "name": "switch leafuni.data-source > gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4428.600372314453,
-    "y": 3463.166778564453,
-    "z": "7062000.f761",
+    "x": 4396.600372314453,
+    "y": 3456.166778564453,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d442302c.ca32e",
-        "7bb1b9a.4551dc8"
+        "beb5c16.4204b4",
+        "cf431e74.d4d548"
       ]
     ]
   },
   {
-    "id": "d442302c.ca32e",
+    "id": "beb5c16.4204b4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4627.767364501953,
-    "y": 3529.766632080078,
-    "z": "7062000.f761",
+    "x": 4595.767364501953,
+    "y": 3522.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7e28b551.d4ae3c"
+        "105d466c.be1d02"
       ]
     ]
   },
   {
-    "id": "7bb1b9a.4551dc8",
+    "id": "cf431e74.d4d548",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4649.767364501953,
-    "y": 3374.766632080078,
-    "z": "7062000.f761",
+    "x": 4617.767364501953,
+    "y": 3367.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ff62768e.03d4d"
+        "8c32ddc1.dc0d4"
       ]
     ]
   },
   {
-    "id": "c71fd59.dfc0428",
+    "id": "b822f518.1b138",
     "type": "save",
     "name": "update LEAF UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4427.600372314453,
-    "y": 3318.366729736328,
-    "z": "7062000.f761",
+    "x": 4395.600372314453,
+    "y": 3311.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "5004b561.86b324",
+    "id": "3f7a0e0a.9d9b82",
     "type": "comment",
     "name": "update LEAF UNI with the new bw",
     "info": "",
     "comments": "",
-    "x": 4443.767364501953,
-    "y": 3271.766632080078,
-    "z": "7062000.f761",
+    "x": 4411.767364501953,
+    "y": 3264.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3679700e.bfb9b8",
+    "id": "fd150e87.231aa",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5112.533966064453,
-    "y": 3248.766632080078,
-    "z": "7062000.f761",
+    "x": 5080.533966064453,
+    "y": 3241.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "180c72db.e0ca25",
+    "id": "c5a29e92.7207c",
     "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": 5714.533966064453,
-    "y": 3353.766632080078,
-    "z": "7062000.f761",
+    "x": 5682.533966064453,
+    "y": 3346.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "eaf2956b.f5da68",
+    "id": "be41e2f.9cfd32",
     "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": 5104.533721923828,
-    "y": 3294.766632080078,
-    "z": "7062000.f761",
+    "x": 5072.533721923828,
+    "y": 3287.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "94b5c3f.97615c",
-        "5f9fd4c2.f09244",
-        "be126d8d.81e41"
+        "2e2379b.d7f7006",
+        "db5acda.eac92b",
+        "bc7f8b0.aa27df8"
       ]
     ]
   },
   {
-    "id": "5f9fd4c2.f09244",
+    "id": "db5acda.eac92b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5332.024688720703,
-    "y": 3267.340606689453,
-    "z": "7062000.f761",
+    "x": 5300.024688720703,
+    "y": 3260.340606689453,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7b864f73.0d50b8"
+        "ac17b57a.282248"
       ]
     ]
   },
   {
-    "id": "be126d8d.81e41",
+    "id": "bc7f8b0.aa27df8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5327.533721923828,
-    "y": 3311.766571044922,
-    "z": "7062000.f761",
+    "x": 5295.533721923828,
+    "y": 3304.766571044922,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "20abe4f.26a359c"
+        "57de8cb.81497f4"
       ]
     ]
   },
   {
-    "id": "7b864f73.0d50b8",
+    "id": "ac17b57a.282248",
     "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": 5494.596221923828,
-    "y": 3266.6263122558594,
-    "z": "7062000.f761",
+    "x": 5462.596221923828,
+    "y": 3259.6263122558594,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "20abe4f.26a359c",
+    "id": "57de8cb.81497f4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5495.533721923828,
-    "y": 3311.766571044922,
-    "z": "7062000.f761",
+    "x": 5463.533721923828,
+    "y": 3304.766571044922,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "cd6b80d0.dac0d8",
+    "id": "9014714c.903978",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5492.533721923828,
-    "y": 3361.766632080078,
-    "z": "7062000.f761",
+    "x": 5460.533721923828,
+    "y": 3354.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c08f6988.b1e668",
-        "180c72db.e0ca25"
+        "cb023eec.a5c808",
+        "c5a29e92.7207c"
       ]
     ]
   },
   {
-    "id": "94b5c3f.97615c",
+    "id": "2e2379b.d7f7006",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5323.533721923828,
-    "y": 3361.766632080078,
-    "z": "7062000.f761",
+    "x": 5291.533721923828,
+    "y": 3354.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cd6b80d0.dac0d8"
+        "9014714c.903978"
       ]
     ]
   },
   {
-    "id": "c08f6988.b1e668",
+    "id": "cb023eec.a5c808",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",
     "comments": "",
-    "x": 5674.534454345703,
-    "y": 3303.766632080078,
-    "z": "7062000.f761",
+    "x": 5642.534454345703,
+    "y": 3296.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "96b13181.04b1f8",
+    "id": "6d766032.1486b8",
     "type": "comment",
     "name": "bw+ has increased ",
     "info": "",
     "comments": "",
-    "x": 4641.766662597656,
-    "y": 3336.7666625976562,
-    "z": "7062000.f761",
+    "x": 4609.766662597656,
+    "y": 3329.7666625976562,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a39bd08a.5e567",
+    "id": "56336637.740a88",
     "type": "comment",
     "name": "bw- has decreased",
     "info": "",
     "comments": "",
-    "x": 4640.600372314453,
-    "y": 3493.566680908203,
-    "z": "7062000.f761",
+    "x": 4608.600372314453,
+    "y": 3486.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "ca05c492.e4ea9",
+    "id": "e142830c.8ce718",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5089.600372314453,
-    "y": 3451.566680908203,
-    "z": "7062000.f761",
+    "x": 5057.600372314453,
+    "y": 3444.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "6af65c6b.88b2a4",
+    "id": "253cc252.2e7476",
     "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": 5691.600372314453,
-    "y": 3556.566680908203,
-    "z": "7062000.f761",
+    "x": 5659.600372314453,
+    "y": 3549.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "e7dc732b.754658",
+    "id": "e936a38f.06f2b",
     "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": 5081.600128173828,
-    "y": 3497.566680908203,
-    "z": "7062000.f761",
+    "x": 5049.600128173828,
+    "y": 3490.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5192fc04.bc79ac",
-        "9675a219.e39ec8",
-        "491e7a3e.fd6efc"
+        "6f1b7a54.b4f3a4",
+        "7ba2b9f4.ea954",
+        "c55de303.d0cb4"
       ]
     ]
   },
   {
-    "id": "9675a219.e39ec8",
+    "id": "7ba2b9f4.ea954",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5309.091094970703,
-    "y": 3470.140655517578,
-    "z": "7062000.f761",
+    "x": 5277.091094970703,
+    "y": 3463.140655517578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9eb1719c.df987"
+        "426bf991.15b6a8"
       ]
     ]
   },
   {
-    "id": "491e7a3e.fd6efc",
+    "id": "c55de303.d0cb4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5304.600128173828,
-    "y": 3514.566619873047,
-    "z": "7062000.f761",
+    "x": 5272.600128173828,
+    "y": 3507.566619873047,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "73d5ba80.efe18c"
+        "fe0c112c.8fb4f"
       ]
     ]
   },
   {
-    "id": "9eb1719c.df987",
+    "id": "426bf991.15b6a8",
     "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": 5471.662628173828,
-    "y": 3469.4263610839844,
-    "z": "7062000.f761",
+    "x": 5439.662628173828,
+    "y": 3462.4263610839844,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "73d5ba80.efe18c",
+    "id": "fe0c112c.8fb4f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5472.600128173828,
-    "y": 3514.566619873047,
-    "z": "7062000.f761",
+    "x": 5440.600128173828,
+    "y": 3507.566619873047,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "49e14e2.90e413",
+    "id": "4702676.988cf18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5469.600128173828,
-    "y": 3564.566680908203,
-    "z": "7062000.f761",
+    "x": 5437.600128173828,
+    "y": 3557.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "fc162869.747088",
-        "6af65c6b.88b2a4"
+        "2f82a117.e4a2be",
+        "253cc252.2e7476"
       ]
     ]
   },
   {
-    "id": "5192fc04.bc79ac",
+    "id": "6f1b7a54.b4f3a4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5300.600128173828,
-    "y": 3564.566680908203,
-    "z": "7062000.f761",
+    "x": 5268.600128173828,
+    "y": 3557.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "49e14e2.90e413"
+        "4702676.988cf18"
       ]
     ]
   },
   {
-    "id": "fc162869.747088",
+    "id": "2f82a117.e4a2be",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",
     "comments": "",
-    "x": 5651.600860595703,
-    "y": 3506.566680908203,
-    "z": "7062000.f761",
+    "x": 5619.600860595703,
+    "y": 3499.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "af7611a6.c24d8",
+    "id": "f5580ce3.db6eb8",
     "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": 5006.600128173828,
-    "y": 3410.566680908203,
-    "z": "7062000.f761",
+    "x": 4974.600128173828,
+    "y": 3403.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "7e28b551.d4ae3c",
+    "id": "105d466c.be1d02",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4799.766662597656,
-    "y": 3518.7666625976562,
-    "z": "7062000.f761",
+    "x": 4767.766662597656,
+    "y": 3511.7666625976562,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "af7611a6.c24d8",
-        "e7dc732b.754658"
+        "f5580ce3.db6eb8",
+        "e936a38f.06f2b"
       ]
     ]
   },
   {
-    "id": "ff62768e.03d4d",
+    "id": "8c32ddc1.dc0d4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4820.500030517578,
-    "y": 3345.566680908203,
-    "z": "7062000.f761",
+    "x": 4788.500030517578,
+    "y": 3338.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d835bd5d.93ef8",
-        "eaf2956b.f5da68"
+        "b0b6c683.a43628",
+        "be41e2f.9cfd32"
       ]
     ]
   },
   {
-    "id": "d835bd5d.93ef8",
+    "id": "b0b6c683.a43628",
     "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": 5019.333526611328,
-    "y": 3163.366729736328,
-    "z": "7062000.f761",
+    "x": 4987.333526611328,
+    "y": 3156.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "2025b954.4fbac6",
+    "id": "c2cf98a5.f5859",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4414.649932861328,
-    "y": 3418.566680908203,
-    "z": "7062000.f761",
+    "x": 4382.649932861328,
+    "y": 3411.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "976feb0e.893a98",
+    "id": "53815df2.f3fe8c",
     "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": 3916.9833984375,
-    "y": 4197.3671875,
-    "z": "7062000.f761",
+    "x": 3884.9833984375,
+    "y": 4190.3671875,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a99b9bcd.cfe81",
+    "id": "1f65c294.737a2d",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3751.9833984375,
-    "y": 4269.567138671875,
-    "z": "7062000.f761",
+    "x": 3719.9833984375,
+    "y": 4262.567138671875,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "98f48307.654f08",
-        "d531b9e1.8374e"
+        "d304f78f.a9e16",
+        "fe02c5f8.83fd58"
       ]
     ]
   },
   {
-    "id": "98f48307.654f08",
+    "id": "d304f78f.a9e16",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3962.9833984375,
-    "y": 4269.567138671875,
-    "z": "7062000.f761",
+    "x": 3930.9833984375,
+    "y": 4262.567138671875,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c74f3bbd.636d88"
+        "632bbee5.d51fe8"
       ]
     ]
   },
   {
-    "id": "d531b9e1.8374e",
+    "id": "fe02c5f8.83fd58",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3958.9833984375,
-    "y": 4317.567138671875,
-    "z": "7062000.f761",
+    "x": 3926.9833984375,
+    "y": 4310.567138671875,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7e7563eb.7c66dc"
+        "670f8deb.e1038c"
       ]
     ]
   },
   {
-    "id": "c74f3bbd.636d88",
+    "id": "632bbee5.d51fe8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4118.9833984375,
-    "y": 4265.567138671875,
-    "z": "7062000.f761",
+    "x": 4086.9833984375,
+    "y": 4258.567138671875,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "6a777147.b443f8"
+        "e27123aa.cc28d"
       ]
     ]
   },
   {
-    "id": "7e7563eb.7c66dc",
+    "id": "670f8deb.e1038c",
     "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": 4106.9833984375,
-    "y": 4312.567138671875,
-    "z": "7062000.f761",
+    "x": 4074.9833984375,
+    "y": 4305.567138671875,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d69512d3.73027",
+    "id": "88c84935.d74a7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4959.949493408203,
-    "y": 4579.765899658203,
-    "z": "7062000.f761",
+    "x": 4927.949493408203,
+    "y": 4572.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cae5635c.9a1e2",
-        "6f0b5fb4.a1fb4"
+        "c788c95c.77178",
+        "1fda418f.a21f6e"
       ]
     ]
   },
   {
-    "id": "6f0b5fb4.a1fb4",
+    "id": "1fda418f.a21f6e",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5202.949737548828,
-    "y": 4548.765899658203,
-    "z": "7062000.f761",
+    "x": 5170.949737548828,
+    "y": 4541.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e903ccd1.487f98",
+    "id": "bffc0dc9.a62e08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4819.949493408203,
-    "y": 4689.765899658203,
-    "z": "7062000.f761",
+    "x": 4787.949493408203,
+    "y": 4682.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e80670f4.672e68"
+        "1b45b5a2.80df72"
       ]
     ]
   },
   {
-    "id": "c7ea39a3.498988",
+    "id": "5a207984.9538",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4807.949737548828,
-    "y": 4782.766143798828,
-    "z": "7062000.f761",
+    "x": 4775.949737548828,
+    "y": 4775.766143798828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3f0dd5a.ea39aaa",
+    "id": "ff47d1c6.a1d1",
     "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": 4810.011871337891,
-    "y": 4737.625671386719,
-    "z": "7062000.f761",
+    "x": 4778.011871337891,
+    "y": 4730.625671386719,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "6a777147.b443f8",
+    "id": "e27123aa.cc28d",
     "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": 4425.949493408203,
-    "y": 4579.765899658203,
-    "z": "7062000.f761",
+    "x": 4393.949493408203,
+    "y": 4572.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b25b3b22.1646d"
+        "bdd7e518.23e34"
       ]
     ]
   },
   {
-    "id": "b25b3b22.1646d",
+    "id": "bdd7e518.23e34",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4630.949493408203,
-    "y": 4579.765899658203,
-    "z": "7062000.f761",
+    "x": 4598.949493408203,
+    "y": 4572.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e858f590.02822"
+        "e5bca59.0771c58"
       ]
     ]
   },
   {
-    "id": "e858f590.02822",
+    "id": "e5bca59.0771c58",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4796.949493408203,
-    "y": 4579.765899658203,
-    "z": "7062000.f761",
+    "x": 4764.949493408203,
+    "y": 4572.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d69512d3.73027"
+        "88c84935.d74a7"
       ]
     ]
   },
   {
-    "id": "cae5635c.9a1e2",
+    "id": "c788c95c.77178",
     "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": 4435.949493408203,
-    "y": 4689.765899658203,
-    "z": "7062000.f761",
+    "x": 4403.949493408203,
+    "y": 4682.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a8297a32.4725f",
-        "102b4f2b.1cfcf9",
-        "6f0b5913.92db28"
+        "9cbfda8d.34d6e8",
+        "7093291a.080b6",
+        "8f2c4a9c.eaf89"
       ]
     ]
   },
   {
-    "id": "a8297a32.4725f",
+    "id": "9cbfda8d.34d6e8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4646.949493408203,
-    "y": 4691.765899658203,
-    "z": "7062000.f761",
+    "x": 4614.949493408203,
+    "y": 4684.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e903ccd1.487f98"
+        "bffc0dc9.a62e08"
       ]
     ]
   },
   {
-    "id": "102b4f2b.1cfcf9",
+    "id": "7093291a.080b6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4647.440460205078,
-    "y": 4737.339935302734,
-    "z": "7062000.f761",
+    "x": 4615.440460205078,
+    "y": 4730.339935302734,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3f0dd5a.ea39aaa"
+        "ff47d1c6.a1d1"
       ]
     ]
   },
   {
-    "id": "6f0b5913.92db28",
+    "id": "8f2c4a9c.eaf89",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4644.949493408203,
-    "y": 4780.765899658203,
-    "z": "7062000.f761",
+    "x": 4612.949493408203,
+    "y": 4773.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c7ea39a3.498988"
+        "5a207984.9538"
       ]
     ]
   },
   {
-    "id": "e8e91e40.c50e3",
+    "id": "31c1ab24.2782c4",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 6055.766387939453,
-    "y": 7078.966827392578,
-    "z": "7062000.f761",
+    "x": 6023.766387939453,
+    "y": 7071.966827392578,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "12a072b1.a1936d",
+    "id": "3272cf3c.df27d8",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5324.2333984375,
-    "y": 4310.16650390625,
-    "z": "7062000.f761",
+    "x": 5292.2333984375,
+    "y": 4303.16650390625,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "74de082.69b8bf8",
+    "id": "d1d7ad20.29b52",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4826.233642578125,
-    "y": 4376.16650390625,
-    "z": "7062000.f761",
+    "x": 4794.233642578125,
+    "y": 4369.16650390625,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ac63c59c.83048",
+    "id": "3f823260.f76936",
     "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": 5357.2333984375,
-    "y": 4378.16650390625,
-    "z": "7062000.f761",
+    "x": 5325.2333984375,
+    "y": 4371.16650390625,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e6f065d2.aee8e",
-        "6b430222.42764c"
+        "de937f43.9aff7",
+        "af59f95b.0de0c8"
       ]
     ]
   },
   {
-    "id": "e6f065d2.aee8e",
+    "id": "de937f43.9aff7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5482.2333984375,
-    "y": 4276.166259765625,
-    "z": "7062000.f761",
+    "x": 5450.2333984375,
+    "y": 4269.166259765625,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3f51a421.f29684"
+        "31c7669e.9273ea"
       ]
     ]
   },
   {
-    "id": "6b430222.42764c",
+    "id": "af59f95b.0de0c8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5601.233428955078,
-    "y": 4350.166290283203,
-    "z": "7062000.f761",
+    "x": 5569.233428955078,
+    "y": 4343.166290283203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "b946186b.4be33",
+    "id": "361b2cba.676744",
     "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": 4569.916534423828,
-    "y": 3921.883331298828,
-    "z": "7062000.f761",
+    "x": 4537.916534423828,
+    "y": 3914.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "402f3aa1.dbe4cc",
+    "id": "37ee69b4.cc11f6",
     "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": 4914.916534423828,
-    "y": 3783.883331298828,
-    "z": "7062000.f761",
+    "x": 4882.916534423828,
+    "y": 3776.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a579376d.bc3"
+        "35c1fec6.57172a"
       ]
     ]
   },
   {
-    "id": "d26cf0c5.68acc",
+    "id": "a8388031.3aed68",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4621.916534423828,
-    "y": 3777.883331298828,
-    "z": "7062000.f761",
+    "x": 4589.916534423828,
+    "y": 3770.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "402f3aa1.dbe4cc"
+        "37ee69b4.cc11f6"
       ]
     ]
   },
   {
-    "id": "e2cb41dc.f4c8f8",
+    "id": "a8458e1d.db654",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4876.916534423828,
-    "y": 3734.883331298828,
-    "z": "7062000.f761",
+    "x": 4844.916534423828,
+    "y": 3727.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "72812dae.8552e4",
+    "id": "f592965f.32c0e8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4565.916534423828,
-    "y": 3829.883331298828,
-    "z": "7062000.f761",
+    "x": 4533.916534423828,
+    "y": 3822.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "82192f60.51b328",
+    "id": "5ddf33c1.65a594",
     "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": 4573.916534423828,
-    "y": 3874.883331298828,
-    "z": "7062000.f761",
+    "x": 4541.916534423828,
+    "y": 3867.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "37b8f0e0.bc121",
+    "id": "76b17a13.8ea0bc",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4570.916534423828,
-    "y": 3727.883331298828,
-    "z": "7062000.f761",
+    "x": 4538.916534423828,
+    "y": 3720.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a579376d.bc3",
+    "id": "35c1fec6.57172a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4823.916534423828,
-    "y": 3851.883331298828,
-    "z": "7062000.f761",
+    "x": 4791.916534423828,
+    "y": 3844.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "bcbc46d8.da70d8"
+        "a725ab73.c73ac"
       ]
     ]
   },
   {
-    "id": "bcbc46d8.da70d8",
+    "id": "a725ab73.c73ac",
     "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": 5008.916534423828,
-    "y": 3850.883331298828,
-    "z": "7062000.f761",
+    "x": 4976.916534423828,
+    "y": 3843.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "df0e838b.1a8"
+        "d15b8b2d.be0c58"
       ]
     ]
   },
   {
-    "id": "df0e838b.1a8",
+    "id": "d15b8b2d.be0c58",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5200.916534423828,
-    "y": 3853.883331298828,
-    "z": "7062000.f761",
+    "x": 5168.916534423828,
+    "y": 3846.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b552c813.211c2"
+        "8eebb571.fd6c9"
       ]
     ]
   },
   {
-    "id": "b552c813.211c2",
+    "id": "8eebb571.fd6c9",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5372.916534423828,
-    "y": 3849.883331298828,
-    "z": "7062000.f761",
+    "x": 5340.916534423828,
+    "y": 3842.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "9806e019.ad2a",
+    "id": "4b7e80ea.96d268",
     "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": 4748.916534423828,
-    "y": 3964.883331298828,
-    "z": "7062000.f761",
+    "x": 4716.916534423828,
+    "y": 3957.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea9a5f5d.8f9bf8",
+    "id": "b4ed3622.c08",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4265.916534423828,
-    "y": 3749.883331298828,
-    "z": "7062000.f761",
+    "x": 4233.916534423828,
+    "y": 3742.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "4c3bbf42.6f3d68",
-        "e37c29b1.ce632",
-        "72812dae.8552e4",
-        "82192f60.51b328",
-        "b946186b.4be33",
-        "d26cf0c5.68acc",
-        "9806e019.ad2a"
+        "26ef8b2b.34003c",
+        "269ffcd4.c70e7c",
+        "f592965f.32c0e8",
+        "5ddf33c1.65a594",
+        "361b2cba.676744",
+        "a8388031.3aed68",
+        "4b7e80ea.96d268"
       ]
     ]
   },
   {
-    "id": "805d495b.3d6b18",
+    "id": "ce279396.ecc818",
     "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": 4250.916534423828,
-    "y": 3683.883331298828,
-    "z": "7062000.f761",
+    "x": 4218.916534423828,
+    "y": 3676.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e37c29b1.ce632",
+    "id": "269ffcd4.c70e7c",
     "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": 4629.916534423828,
-    "y": 3670.883331298828,
-    "z": "7062000.f761",
+    "x": 4597.916534423828,
+    "y": 3663.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "942a4caf.d868d8",
-        "8905a79d.0fb76",
-        "e2cb41dc.f4c8f8"
+        "2b1251d3.218d36",
+        "69b1ddc7.bc8184",
+        "a8458e1d.db654"
       ]
     ]
   },
   {
-    "id": "942a4caf.d868d8",
+    "id": "2b1251d3.218d36",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4865.916534423828,
-    "y": 3653.883331298828,
-    "z": "7062000.f761",
+    "x": 4833.916534423828,
+    "y": 3646.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "8905a79d.0fb76",
+    "id": "69b1ddc7.bc8184",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4862.916534423828,
-    "y": 3694.883331298828,
-    "z": "7062000.f761",
+    "x": 4830.916534423828,
+    "y": 3687.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "4c3bbf42.6f3d68",
+    "id": "26ef8b2b.34003c",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4578.916534423828,
-    "y": 3627.883331298828,
-    "z": "7062000.f761",
+    "x": 4546.916534423828,
+    "y": 3620.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "94da922f.c01d98",
+    "id": "a7d12ef0.b4e948",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5308.316436767578,
-    "y": 4677.283233642578,
-    "z": "7062000.f761",
+    "x": 5276.316436767578,
+    "y": 4670.283233642578,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e80670f4.672e68",
+    "id": "1b45b5a2.80df72",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5097.316436767578,
-    "y": 4739.283233642578,
-    "z": "7062000.f761",
+    "x": 5065.316436767578,
+    "y": 4732.283233642578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ed69a679.8ddb2"
+        "ed1b64d5.33faa"
       ]
     ]
   },
   {
-    "id": "ed69a679.8ddb2",
+    "id": "ed1b64d5.33faa",
     "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": 5341.316436767578,
-    "y": 4745.283233642578,
-    "z": "7062000.f761",
+    "x": 5309.316436767578,
+    "y": 4738.283233642578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "90bf5e35.d23788",
-        "6659c466.b510dc"
+        "230e8d7f.cf5b82",
+        "8c0eb7af.7df34"
       ]
     ]
   },
   {
-    "id": "90bf5e35.d23788",
+    "id": "230e8d7f.cf5b82",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5572.316436767578,
-    "y": 4723.283233642578,
-    "z": "7062000.f761",
+    "x": 5540.316436767578,
+    "y": 4716.283233642578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5ef895fb.b1bf7c"
+        "626950bd.12ae3"
       ]
     ]
   },
   {
-    "id": "6659c466.b510dc",
+    "id": "8c0eb7af.7df34",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5577.316436767578,
-    "y": 4790.283233642578,
-    "z": "7062000.f761",
+    "x": 5545.316436767578,
+    "y": 4783.283233642578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ef985380.75ae68",
+    "id": "a8be8ed1.6d85c",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5826.2001953125,
-    "y": 4287.965576171875,
-    "z": "7062000.f761",
+    "x": 5794.2001953125,
+    "y": 4280.965576171875,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "76a7bc4a.dd01dc",
-        "c64cf61b.17568"
+        "5f515b8.97d0aa4",
+        "e3c5fe18.dd7758"
       ]
     ]
   },
   {
-    "id": "76a7bc4a.dd01dc",
+    "id": "5f515b8.97d0aa4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5981.200225830078,
-    "y": 4215.965850830078,
-    "z": "7062000.f761",
+    "x": 5949.200225830078,
+    "y": 4208.965850830078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "79b64e60.35626"
+        "b9ddbbac.4ceb18"
       ]
     ]
   },
   {
-    "id": "c64cf61b.17568",
+    "id": "e3c5fe18.dd7758",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5982.200225830078,
-    "y": 4348.965850830078,
-    "z": "7062000.f761",
+    "x": 5950.200225830078,
+    "y": 4341.965850830078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d1f760ec.7590a"
+        "7f4f722.c77710c"
       ]
     ]
   },
   {
-    "id": "79b64e60.35626",
+    "id": "b9ddbbac.4ceb18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6126.200225830078,
-    "y": 4215.966094970703,
-    "z": "7062000.f761",
+    "x": 6094.200225830078,
+    "y": 4208.966094970703,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a1fc801a.8dde7",
-        "f7199aa1.5a0618"
+        "c99d2def.311358",
+        "6bec6ba7.e1cedc"
       ]
     ]
   },
   {
-    "id": "a1fc801a.8dde7",
+    "id": "c99d2def.311358",
     "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": 6419.200225830078,
-    "y": 4193.965850830078,
-    "z": "7062000.f761",
+    "x": 6387.200225830078,
+    "y": 4186.965850830078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "f7199aa1.5a0618",
+    "id": "6bec6ba7.e1cedc",
     "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": 6370.850128173828,
-    "y": 4241.282745361328,
-    "z": "7062000.f761",
+    "x": 6338.850128173828,
+    "y": 4234.282745361328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "598a3c97.c62cd4",
+    "id": "9711fbcd.9495e8",
     "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": 6443.200225830078,
-    "y": 4154.965850830078,
-    "z": "7062000.f761",
+    "x": 6412.2001953125,
+    "y": 4135.965576171875,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d1f760ec.7590a",
+    "id": "7f4f722.c77710c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6138.200225830078,
-    "y": 4347.966094970703,
-    "z": "7062000.f761",
+    "x": 6106.200225830078,
+    "y": 4340.966094970703,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e43682b5.56552",
-        "8aed809d.a72bd8"
+        "59431729.1fb158",
+        "1fc311b.d897f6e"
       ]
     ]
   },
   {
-    "id": "e43682b5.56552",
+    "id": "59431729.1fb158",
     "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": 6431.200225830078,
-    "y": 4325.965850830078,
-    "z": "7062000.f761",
+    "x": 6399.200225830078,
+    "y": 4318.965850830078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "8aed809d.a72bd8",
+    "id": "1fc311b.d897f6e",
     "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": 6382.850128173828,
-    "y": 4373.282745361328,
-    "z": "7062000.f761",
+    "x": 6350.850128173828,
+    "y": 4366.282745361328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "3a2ab7c7.d2dab8",
+    "id": "1617355e.191edb",
     "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": 6455.200225830078,
-    "y": 4286.965850830078,
-    "z": "7062000.f761",
+    "x": 6423.200225830078,
+    "y": 4279.965850830078,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5ef895fb.b1bf7c",
+    "id": "626950bd.12ae3",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5777.433135986328,
-    "y": 4730.166534423828,
-    "z": "7062000.f761",
+    "x": 5745.433135986328,
+    "y": 4723.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3e55897.59031f6",
-        "a1d97b4a.208e4"
+        "a17c6b6f.2c879",
+        "a4050844.87c708"
       ]
     ]
   },
   {
-    "id": "3e55897.59031f6",
+    "id": "a17c6b6f.2c879",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5972.433135986328,
-    "y": 4658.166534423828,
-    "z": "7062000.f761",
+    "x": 5940.433135986328,
+    "y": 4651.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "1661a8d0.f6d65f"
+        "cccf95aa.d66d78"
       ]
     ]
   },
   {
-    "id": "a1d97b4a.208e4",
+    "id": "a4050844.87c708",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5973.433135986328,
-    "y": 4791.166534423828,
-    "z": "7062000.f761",
+    "x": 5941.433135986328,
+    "y": 4784.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5810f31a.0a9ed4"
+        "90ce4884.5c53c8"
       ]
     ]
   },
   {
-    "id": "1661a8d0.f6d65f",
+    "id": "cccf95aa.d66d78",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6117.433135986328,
-    "y": 4658.166778564453,
-    "z": "7062000.f761",
+    "x": 6085.433135986328,
+    "y": 4651.166778564453,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "da6580ac.af986",
-        "ee810baa.63495"
+        "c37b260.db0c1d8",
+        "742aa3a0.c04704"
       ]
     ]
   },
   {
-    "id": "da6580ac.af986",
+    "id": "c37b260.db0c1d8",
     "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": 6410.433135986328,
-    "y": 4636.166534423828,
-    "z": "7062000.f761",
+    "x": 6378.433135986328,
+    "y": 4629.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ee810baa.63495",
+    "id": "742aa3a0.c04704",
     "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": 6362.083038330078,
-    "y": 4683.483428955078,
-    "z": "7062000.f761",
+    "x": 6330.083038330078,
+    "y": 4676.483428955078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "87cf660.a2b3f18",
+    "id": "5708f1c2.de612",
     "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": 6434.433135986328,
-    "y": 4597.166534423828,
-    "z": "7062000.f761",
+    "x": 6402.433135986328,
+    "y": 4590.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5810f31a.0a9ed4",
+    "id": "90ce4884.5c53c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6129.433135986328,
-    "y": 4790.166778564453,
-    "z": "7062000.f761",
+    "x": 6097.433135986328,
+    "y": 4783.166778564453,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "80c260b2.6af7a",
-        "9a874787.276bd"
+        "9bebcf2c.a35908",
+        "bf7ecccc.77e158"
       ]
     ]
   },
   {
-    "id": "80c260b2.6af7a",
+    "id": "9bebcf2c.a35908",
     "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": 6422.433135986328,
-    "y": 4768.166534423828,
-    "z": "7062000.f761",
+    "x": 6390.433135986328,
+    "y": 4761.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "9a874787.276bd",
+    "id": "bf7ecccc.77e158",
     "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": 6374.083038330078,
-    "y": 4815.483428955078,
-    "z": "7062000.f761",
+    "x": 6342.083038330078,
+    "y": 4808.483428955078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "815fc293.94d2f8",
+    "id": "898aa8ca.144488",
     "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": 6446.433135986328,
-    "y": 4729.166534423828,
-    "z": "7062000.f761",
+    "x": 6414.433135986328,
+    "y": 4722.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a537e9a.90f0c98",
+    "id": "3302d733.17cb08",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5185.283233642578,
-    "y": 5470.366729736328,
-    "z": "7062000.f761",
+    "x": 5153.283233642578,
+    "y": 5463.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d416487a.185998",
+    "id": "c4bba10e.ae5948",
     "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": 5183.066436767578,
-    "y": 5510.566925048828,
-    "z": "7062000.f761",
+    "x": 5151.066436767578,
+    "y": 5503.566925048828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "7898de27.66a698",
+    "id": "fba1ca00.18c228",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5058.316680908203,
-    "y": 5695.049835205078,
-    "z": "7062000.f761",
+    "x": 5026.316680908203,
+    "y": 5688.049835205078,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "63d85a3d.4103fc",
+    "id": "bc2e1526.9ae628",
     "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": 5056.099884033203,
-    "y": 5735.250030517578,
-    "z": "7062000.f761",
+    "x": 5024.099884033203,
+    "y": 5728.250030517578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "105ea6a7.242f79",
+    "id": "c14b3eb1.3ce2b",
     "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": 5160.433135986328,
-    "y": 6178.166534423828,
-    "z": "7062000.f761",
+    "x": 5128.433135986328,
+    "y": 6171.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "8f43e7c7.1c41b8",
+    "id": "78d24bb0.4c8ea4",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4987.433135986328,
-    "y": 6235.166534423828,
-    "z": "7062000.f761",
+    "x": 4955.433135986328,
+    "y": 6228.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "4e0d7b1b.4cc2ec",
-        "609ed3b9.40f534"
+        "8d0d07ba.6f81c8",
+        "4ae3fa7f.c7968c"
       ]
     ]
   },
   {
-    "id": "4e0d7b1b.4cc2ec",
+    "id": "8d0d07ba.6f81c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5198.433135986328,
-    "y": 6235.166534423828,
-    "z": "7062000.f761",
+    "x": 5166.433135986328,
+    "y": 6228.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c2d7112c.1b117"
+        "7c55c647.3c8228"
       ]
     ]
   },
   {
-    "id": "609ed3b9.40f534",
+    "id": "4ae3fa7f.c7968c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5194.433135986328,
-    "y": 6283.166534423828,
-    "z": "7062000.f761",
+    "x": 5162.433135986328,
+    "y": 6276.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "fd4c4e47.075cf8"
+        "2e757361.f3de2c"
       ]
     ]
   },
   {
-    "id": "c2d7112c.1b117",
+    "id": "7c55c647.3c8228",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5354.433135986328,
-    "y": 6231.166534423828,
-    "z": "7062000.f761",
+    "x": 5322.433135986328,
+    "y": 6224.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c4eacefe.2b5518",
-        "773bf221.e0586c",
-        "f38f117c.80c7b8"
+        "2cbacdde.26f332",
+        "94ab2e80.b69ba8",
+        "d5533498.f6f7f"
       ]
     ]
   },
   {
-    "id": "fd4c4e47.075cf8",
+    "id": "2e757361.f3de2c",
     "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": 5342.433135986328,
-    "y": 6278.166534423828,
-    "z": "7062000.f761",
+    "x": 5310.433135986328,
+    "y": 6271.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a5cbc756.e321b8",
+    "id": "510063da.63ac6c",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5620.316925048828,
-    "y": 6331.049835205078,
-    "z": "7062000.f761",
+    "x": 5588.316925048828,
+    "y": 6324.049835205078,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f38f117c.80c7b8",
+    "id": "d5533498.f6f7f",
     "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": 5618.100128173828,
-    "y": 6371.250030517578,
-    "z": "7062000.f761",
+    "x": 5586.100128173828,
+    "y": 6364.250030517578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "773bf221.e0586c",
+    "id": "94ab2e80.b69ba8",
     "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": 5737.433135986328,
-    "y": 6283.166534423828,
-    "z": "7062000.f761",
+    "x": 5705.433135986328,
+    "y": 6276.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "c4eacefe.2b5518",
+    "id": "2cbacdde.26f332",
     "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": 5608.433135986328,
-    "y": 6231.166534423828,
-    "z": "7062000.f761",
+    "x": 5576.433135986328,
+    "y": 6224.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5ff4d90f.61eca8",
+    "id": "d8a0b134.770b1",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5049.433135986328,
-    "y": 6136.166534423828,
-    "z": "7062000.f761",
+    "x": 5017.433135986328,
+    "y": 6129.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "1a8fecd4.39509b",
+    "id": "54a65e87.65172",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4756.766143798828,
-    "y": 6218.166534423828,
-    "z": "7062000.f761",
+    "x": 4724.766143798828,
+    "y": 6211.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "105ea6a7.242f79",
-        "8f43e7c7.1c41b8"
+        "c14b3eb1.3ce2b",
+        "78d24bb0.4c8ea4"
       ]
     ]
   },
   {
-    "id": "2374b67.d3b424a",
+    "id": "11c77751.f259a1",
     "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": 5035.516632080078,
-    "y": 6533.166534423828,
-    "z": "7062000.f761",
+    "x": 5003.516632080078,
+    "y": 6526.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "5d1aa304.0ec964",
+    "id": "7eabc766.dd7c8",
     "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": 3740.8837890625,
-    "y": 3809.88330078125,
-    "z": "7062000.f761",
+    "x": 3708.8837890625,
+    "y": 3802.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "1c248a70.8f6db6",
+    "id": "c0c356fb.babc",
     "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": 4493.4169921875,
-    "y": 4084,
-    "z": "7062000.f761",
+    "x": 4461.4169921875,
+    "y": 4077,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e8d15ab4.54c49",
-        "20b8f97c.98322e",
-        "6302d7c5.b6ebe8"
+        "b8196ee9.4b3808",
+        "80c1418b.2150d8",
+        "56405931.8c65f8"
       ]
     ]
   },
   {
-    "id": "3d05d16c.2a1566",
+    "id": "eb18f7d.31abf88",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4595.4169921875,
-    "y": 4049,
-    "z": "7062000.f761",
+    "x": 4569.417236328125,
+    "y": 4033,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e8d15ab4.54c49",
+    "id": "b8196ee9.4b3808",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4698.4169921875,
-    "y": 4081,
-    "z": "7062000.f761",
+    "x": 4666.4169921875,
+    "y": 4074,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7ec23daa.6a0bc4"
+        "9aacf189.24898"
       ]
     ]
   },
   {
-    "id": "20b8f97c.98322e",
+    "id": "80c1418b.2150d8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4681.907958984375,
-    "y": 4142.574035644531,
-    "z": "7062000.f761",
+    "x": 4649.907958984375,
+    "y": 4135.574035644531,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "36ba2eea.c2f3b2"
+        "de469de6.448a8"
       ]
     ]
   },
   {
-    "id": "6302d7c5.b6ebe8",
+    "id": "56405931.8c65f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4679.4169921875,
-    "y": 4186,
-    "z": "7062000.f761",
+    "x": 4647.4169921875,
+    "y": 4179,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "949d59bf.9e67a"
+        "6c1db7b.a15c7c8"
       ]
     ]
   },
   {
-    "id": "7ec23daa.6a0bc4",
+    "id": "9aacf189.24898",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4866.417236328125,
-    "y": 4076,
-    "z": "7062000.f761",
+    "x": 4834.417236328125,
+    "y": 4069,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "df77d6a9.222ef"
+        "3b0478b5.ff78"
       ]
     ]
   },
   {
-    "id": "36ba2eea.c2f3b2",
+    "id": "de469de6.448a8",
     "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": 4844.4793701171875,
-    "y": 4142.859771728516,
-    "z": "7062000.f761",
+    "x": 4812.4793701171875,
+    "y": 4135.859771728516,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "949d59bf.9e67a",
+    "id": "6c1db7b.a15c7c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4846.4169921875,
-    "y": 4185,
-    "z": "7062000.f761",
+    "x": 4814.4169921875,
+    "y": 4178,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "df77d6a9.222ef",
+    "id": "3b0478b5.ff78",
     "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": 5104.417236328125,
-    "y": 4081,
-    "z": "7062000.f761",
+    "x": 5072.417236328125,
+    "y": 4074,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "abc8ebdb.52f0a8"
+        "b59112.09635ef"
       ]
     ]
   },
   {
-    "id": "abc8ebdb.52f0a8",
+    "id": "b59112.09635ef",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5338.4169921875,
-    "y": 4088,
-    "z": "7062000.f761",
+    "x": 5306.4169921875,
+    "y": 4081,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ac63c59c.83048"
+        "3f823260.f76936"
       ]
     ]
   },
   {
-    "id": "1f0e75d7.8b5a2a",
+    "id": "67daf127.7e6a38",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4472.11669921875,
-    "y": 4010,
-    "z": "7062000.f761",
+    "x": 4440.11669921875,
+    "y": 4003,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "bffd072f.5e512",
+    "id": "11444ec1.8e4d01",
     "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": 5755.2666015625,
-    "y": 4098.5830078125,
-    "z": "7062000.f761",
+    "x": 5723.2666015625,
+    "y": 4091.5830078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f3f61fe0.c57dd"
+        "f98d1d31.14c4f8"
       ]
     ]
   },
   {
-    "id": "f3f61fe0.c57dd",
+    "id": "f98d1d31.14c4f8",
     "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": 5947.2666015625,
-    "y": 4087.583251953125,
-    "z": "7062000.f761",
+    "x": 5915.2666015625,
+    "y": 4080.583251953125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8cedd329.3f3c9"
+        "894c5e31.55f348"
       ]
     ]
   },
   {
-    "id": "8cedd329.3f3c9",
+    "id": "894c5e31.55f348",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6129.2666015625,
-    "y": 4066.583251953125,
-    "z": "7062000.f761",
+    "x": 6097.2666015625,
+    "y": 4059.583251953125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "86e0777f.9370f"
+        "2837af93.7fedb8"
       ]
     ]
   },
   {
-    "id": "86e0777f.9370f",
+    "id": "2837af93.7fedb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 6291.2666015625,
-    "y": 4055.583251953125,
-    "z": "7062000.f761",
+    "x": 6259.2666015625,
+    "y": 4048.583251953125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "869c4324.9670f",
-        "bbb484a7.96add8"
+        "75575304.c30724",
+        "fb102e8c.f8d02"
       ]
     ]
   },
   {
-    "id": "869c4324.9670f",
+    "id": "75575304.c30724",
     "type": "set",
     "name": "unset tmp.the-connectivity",
     "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
     "comments": "",
-    "x": 6488.2666015625,
-    "y": 3984.583251953125,
-    "z": "7062000.f761",
+    "x": 6456.2666015625,
+    "y": 3977.583251953125,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3f51a421.f29684",
+    "id": "812bc4de.8330d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5609.216796875,
-    "y": 4214.582763671875,
-    "z": "7062000.f761",
+    "x": 5630.216796875,
+    "y": 4206.5830078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ef985380.75ae68",
-        "bffd072f.5e512",
-        "bbf89c4c.2b2c98",
-        "55e59a7f.53654c"
+        "a8be8ed1.6d85c",
+        "11444ec1.8e4d01",
+        "7f9cffe2.08c768",
+        "8c2c4043.586498"
       ]
     ]
   },
   {
-    "id": "bbf89c4c.2b2c98",
+    "id": "7f9cffe2.08c768",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5793.783203125,
-    "y": 3988.800048828125,
-    "z": "7062000.f761",
+    "x": 5761.783203125,
+    "y": 3981.800048828125,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "55e59a7f.53654c",
+    "id": "8c2c4043.586498",
     "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": 5785.783203125,
-    "y": 4037.800048828125,
-    "z": "7062000.f761",
+    "x": 5753.783203125,
+    "y": 4030.800048828125,
+    "z": "1854297c.6f0f4f",
+    "wires": []
+  },
+  {
+    "id": "fb102e8c.f8d02",
+    "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": 6461.7333984375,
+    "y": 4086.800048828125,
+    "z": "1854297c.6f0f4f",
+    "wires": []
+  },
+  {
+    "id": "a9133f1b.8373c8",
+    "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": 5755,
+    "y": 3805,
+    "z": "1854297c.6f0f4f",
+    "wires": []
+  },
+  {
+    "id": "4b95d87b.bccc58",
+    "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": 5909,
+    "y": 3857,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "31c7669e.9273ea",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5500,
+    "y": 3924,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      [
+        "4b95d87b.bccc58",
+        "26b17ecc.f40902",
+        "a9133f1b.8373c8"
+      ]
+    ]
+  },
+  {
+    "id": "26b17ecc.f40902",
+    "type": "switchNode",
+    "name": "switch $foundVpnName",
+    "xml": "<switch test=\"`$foundVpnName`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5754,
+    "y": 3912,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      [
+        "245d39b1.fcc7b6"
+      ]
+    ]
+  },
+  {
+    "id": "245d39b1.fcc7b6",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5933,
+    "y": 3911,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      [
+        "812bc4de.8330d"
+      ]
+    ]
+  },
+  {
+    "id": "2f3de295.447b1e",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4631,
+    "y": 7429,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      [
+        "48382561.04ccdc",
+        "a0fe64b2.d649a",
+        "3a51bb36.70835c"
+      ]
+    ]
+  },
+  {
+    "id": "3a51bb36.70835c",
+    "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": 4854,
+    "y": 7373,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "bbb484a7.96add8",
+    "id": "48382561.04ccdc",
+    "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": 5033,
+    "y": 7416,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a0fe64b2.d649a",
+    "type": "switchNode",
+    "name": "switch $foundVpnName",
+    "xml": "<switch test=\"`$foundVpnName`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4878,
+    "y": 7471,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      [
+        "e761a2b0.d43cc"
+      ]
+    ]
+  },
+  {
+    "id": "e761a2b0.d43cc",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5057,
+    "y": 7470,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      [
+        "ed22a86b.d791b8"
+      ]
+    ]
+  },
+  {
+    "id": "9efae615.dd5ab",
     "type": "set",
-    "name": "set tmp.the-connectivity",
-    "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",
+    "name": "unset tmp.aai.all-vpn-bindings",
+    "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 6485.7333984375,
-    "y": 4083.800048828125,
-    "z": "7062000.f761",
+    "x": 4788,
+    "y": 7109,
+    "z": "1854297c.6f0f4f",
     "wires": []
   }
 ]
\ No newline at end of file