X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json;h=7f05d90e8f15cd8ee72ded2161079f0d63be133c;hb=645b21298c9a4aff5f3f625eabb586fff40db732;hp=ad56b54472e028a221ab5e9c21827a942f0d31d9;hpb=5e25c5f31e4e47dfdc5810ed470450b194d81bba;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..7f05d90e 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "d60c3cf9.321a6",
+    "id": "25755a71.e1632e",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 205.88333129882812,
-    "y": 156.88333129882812,
-    "z": "7062000.f761",
+    "x": 123.56666564941406,
+    "y": 162.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cce5e3d9.59223"
+        "9782b41f.c0bae8"
       ]
     ]
   },
   {
-    "id": "cce5e3d9.59223",
+    "id": "9782b41f.c0bae8",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,7912 +22,10541 @@
     "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": 407.85235595703125,
+    "y": 223.32380199432373,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "73cbe8fd.7b7b"
+        "aa6f3182.becc9"
       ]
     ]
   },
   {
-    "id": "73cbe8fd.7b7b",
+    "id": "aa6f3182.becc9",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-modify",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-modify' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 496.3119354248047,
-    "y": 302.88336181640625,
-    "z": "7062000.f761",
+    "x": 413.9952697753906,
+    "y": 308.0857238769531,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b5475b4e.9dc8a"
+        "29bc2f8.db80dd"
       ]
     ]
   },
   {
-    "id": "b5475b4e.9dc8a",
+    "id": "29bc2f8.db80dd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 845.8833312988281,
-    "y": 361.8833312988281,
-    "z": "7062000.f761",
+    "x": 763.5666656494141,
+    "y": 367.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bacceb8f.95926",
-        "e0024e9e.57e7f8",
-        "6d19a9bc.4fa958"
+        "9c0eb1ca.43b71",
+        "3646fbaf.66abd4",
+        "ab0c0a1d.943358"
       ]
     ]
   },
   {
-    "id": "bacceb8f.95926",
+    "id": "9c0eb1ca.43b71",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 1147.2168273925781,
-    "y": 632.8136291503906,
-    "z": "7062000.f761",
+    "x": 1064.900161743164,
+    "y": 638.0159912109375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e0024e9e.57e7f8",
+    "id": "3646fbaf.66abd4",
     "type": "save",
     "name": "get service-instance from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
     "comments": "",
     "outputs": 1,
-    "x": 1168.6452941894531,
-    "y": 335.2166442871094,
-    "z": "7062000.f761",
+    "x": 1086.328628540039,
+    "y": 340.41900634765625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "dc9a92d7.7dd0c",
-        "68404646.133ac8",
-        "f6dee010.98fcd"
+        "7f13e7b9.528038",
+        "21855f86.1eb1c",
+        "8626acaa.0dcb08"
       ]
     ]
   },
   {
-    "id": "dc9a92d7.7dd0c",
+    "id": "7f13e7b9.528038",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1393.6452941894531,
-    "y": 193.21664428710938,
-    "z": "7062000.f761",
+    "x": 1311.328628540039,
+    "y": 198.41900634765625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d1be34ef.26139"
+        "d8a6bab4.98cd48"
       ]
     ]
   },
   {
-    "id": "68404646.133ac8",
+    "id": "21855f86.1eb1c",
     "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": 1306.819595336914,
+    "y": 267.9930419921875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c39ebb83.790b68"
+        "2ec478eb.d4cdf8"
       ]
     ]
   },
   {
-    "id": "f6dee010.98fcd",
+    "id": "8626acaa.0dcb08",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1377.6452941894531,
-    "y": 309.2166442871094,
-    "z": "7062000.f761",
+    "x": 1295.328628540039,
+    "y": 314.41900634765625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f8b91686.4a47a8"
+        "7ead638e.196dac"
       ]
     ]
   },
   {
-    "id": "6c16fe1b.61251",
+    "id": "250bdb2a.4b0894",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1147.6452941894531,
-    "y": 223.21664428710938,
-    "z": "7062000.f761",
+    "x": 1065.328628540039,
+    "y": 228.41900634765625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6d19a9bc.4fa958",
+    "id": "ab0c0a1d.943358",
     "type": "execute",
     "name": "execute properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
     "comments": "",
     "outputs": 1,
-    "x": 1135.6452941894531,
-    "y": 275.2166442871094,
-    "z": "7062000.f761",
+    "x": 1053.328628540039,
+    "y": 280.41900634765625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "d1be34ef.26139",
+    "id": "d8a6bab4.98cd48",
     "type": "switchNode",
     "name": "switch allotted-resources_length != 0",
     "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1633.8833312988281,
-    "y": 189.88333129882812,
-    "z": "7062000.f761",
+    "x": 1551.566665649414,
+    "y": 195.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "74daedf5.b00d34",
-        "3ddd8ea0.9d48e2"
+        "ddda0f66.6b349",
+        "66168207.1d9724"
       ]
     ]
   },
   {
-    "id": "c39ebb83.790b68",
+    "id": "2ec478eb.d4cdf8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 1543.9457092285156,
-    "y": 265.74310302734375,
-    "z": "7062000.f761",
+    "x": 1461.6290435791016,
+    "y": 270.9454650878906,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f8b91686.4a47a8",
+    "id": "7ead638e.196dac",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1547.8833312988281,
-    "y": 309.8833312988281,
-    "z": "7062000.f761",
+    "x": 1465.566665649414,
+    "y": 315.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "74daedf5.b00d34",
+    "id": "ddda0f66.6b349",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1838.8833312988281,
-    "y": 226.88333129882812,
-    "z": "7062000.f761",
+    "x": 1756.566665649414,
+    "y": 232.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "50897ba7.acdc24"
+        "5c931c3f.aba674"
       ]
     ]
   },
   {
-    "id": "3ddd8ea0.9d48e2",
+    "id": "66168207.1d9724",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1848.8833312988281,
-    "y": 153.88333129882812,
-    "z": "7062000.f761",
+    "x": 1766.566665649414,
+    "y": 159.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "50897ba7.acdc24",
+    "id": "5c931c3f.aba674",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1831.8833312988281,
-    "y": 301.8833312988281,
-    "z": "7062000.f761",
+    "x": 1749.566665649414,
+    "y": 307.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "25219f6c.9cf818",
-        "166df7f7.8cb52",
-        "35f1defb.605572",
-        "f67d2f30.77ecd8",
-        "2530e84c.0abb78"
+        "b951c0d0.48c67",
+        "3ae502fc.de69ae",
+        "7554f41e.870f04",
+        "b94dc7e3.86f89",
+        "37dc60ca.62221"
       ]
     ]
   },
   {
-    "id": "e3fc1b13.141158",
+    "id": "fb84a849.18463",
     "type": "save",
     "name": "get allotted-resource from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2317.883331298828,
-    "y": 352.8833312988281,
-    "z": "7062000.f761",
+    "x": 2235.566665649414,
+    "y": 358.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "792e0cb6.295efc",
-        "9cda4258.33c028",
-        "8ec312be.acb358"
+        "7f791be2.0d23ec",
+        "6090d832.b4d3b8",
+        "b011647e.200f58"
       ]
     ]
   },
   {
-    "id": "792e0cb6.295efc",
+    "id": "7f791be2.0d23ec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2533.883331298828,
-    "y": 419.8833312988281,
-    "z": "7062000.f761",
+    "x": 2451.566665649414,
+    "y": 425.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d2a1ae9f.45e878"
+        "f400ea8d.94bbd8"
       ]
     ]
   },
   {
-    "id": "9cda4258.33c028",
+    "id": "6090d832.b4d3b8",
     "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": 2452.057632446289,
+    "y": 324.65966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5f00fc5b.612da4"
+        "84744d3b.9da2a"
       ]
     ]
   },
   {
-    "id": "8ec312be.acb358",
+    "id": "b011647e.200f58",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2529.883331298828,
-    "y": 368.8833312988281,
-    "z": "7062000.f761",
+    "x": 2447.566665649414,
+    "y": 374.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "24485e5a.4004d2"
+        "d7ef13e5.e943b8"
       ]
     ]
   },
   {
-    "id": "25219f6c.9cf818",
+    "id": "b951c0d0.48c67",
     "type": "for",
     "name": "for each allotted-resource",
     "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2034.8833312988281,
-    "y": 333.8833312988281,
-    "z": "7062000.f761",
+    "x": 1952.566665649414,
+    "y": 339.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e97f59ea.8d55",
-        "e3fc1b13.141158",
-        "dca67cc5.30d2f8",
-        "ce64f5e6.94469"
+        "4b529d8b.e7269c",
+        "fb84a849.18463",
+        "4f8a0bf3.f76a6c",
+        "6a76544b.f753cc"
       ]
     ]
   },
   {
-    "id": "e97f59ea.8d55",
+    "id": "4b529d8b.e7269c",
     "type": "set",
     "name": "set the current allotted-resource-id",
     "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
     "comments": "",
-    "x": 2314.883331298828,
-    "y": 271.8833312988281,
-    "z": "7062000.f761",
+    "x": 2232.566665649414,
+    "y": 277.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f67d2f30.77ecd8",
+    "id": "b94dc7e3.86f89",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
     "comments": "",
-    "x": 2008.8833312988281,
-    "y": 283.8833312988281,
-    "z": "7062000.f761",
+    "x": 1926.566665649414,
+    "y": 289.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "166df7f7.8cb52",
+    "id": "3ae502fc.de69ae",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2051.883331298828,
-    "y": 142.88333129882812,
-    "z": "7062000.f761",
+    "x": 1969.566665649414,
+    "y": 148.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "35f1defb.605572",
+    "id": "7554f41e.870f04",
     "type": "get-resource",
     "name": "get-resource logical-links",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2063.883331298828,
-    "y": 183.88333129882812,
-    "z": "7062000.f761",
+    "x": 1981.566665649414,
+    "y": 189.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "2302212a.18d7a6",
+    "id": "c4ed6feb.870ac",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2088.883331298828,
-    "y": 95.88333129882812,
-    "z": "7062000.f761",
+    "x": 2006.566665649414,
+    "y": 101.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "67aae728.5fece",
+    "id": "3fa0fea5.b1a7a2",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
     "comments": "",
-    "x": 2008.8833312988281,
-    "y": 229.88333129882812,
-    "z": "7062000.f761",
+    "x": 1926.566665649414,
+    "y": 235.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5f00fc5b.612da4",
+    "id": "84744d3b.9da2a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 2712.883331298828,
-    "y": 321.8833312988281,
-    "z": "7062000.f761",
+    "x": 2630.566665649414,
+    "y": 327.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "24485e5a.4004d2",
+    "id": "d7ef13e5.e943b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2712.820831298828,
-    "y": 371.0235900878906,
-    "z": "7062000.f761",
+    "x": 2630.504165649414,
+    "y": 376.2259521484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d2a1ae9f.45e878",
+    "id": "f400ea8d.94bbd8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2714.820831298828,
-    "y": 422.0235900878906,
-    "z": "7062000.f761",
+    "x": 2632.504165649414,
+    "y": 427.2259521484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "61c50290.a54bf4"
+        "3f239fa1.c0b958"
       ]
     ]
   },
   {
-    "id": "61c50290.a54bf4",
+    "id": "3f239fa1.c0b958",
     "type": "save",
     "name": "get allotted-resource relationship from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3007.820831298828,
-    "y": 369.0235900878906,
-    "z": "7062000.f761",
+    "x": 2967.504165649414,
+    "y": 196.22596740722656,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d79412d7.a6c38",
-        "3f6fbc64.721af4",
-        "a6250e3f.f36fa"
+        "b38986d.d0d7878",
+        "824af3e9.18d3c",
+        "c4ad697c.ed235"
       ]
     ]
   },
   {
-    "id": "3f6fbc64.721af4",
+    "id": "824af3e9.18d3c",
     "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": 3240.995132446289,
+    "y": 88.79994201660156,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "16afc6a3.6b5401"
+        "53ebc234.9c89e4"
       ]
     ]
   },
   {
-    "id": "16afc6a3.6b5401",
+    "id": "53ebc234.9c89e4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3458.883331298828,
-    "y": 261.8833312988281,
-    "z": "7062000.f761",
+    "x": 3418.566665649414,
+    "y": 89.08570861816406,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a6250e3f.f36fa",
+    "id": "c4ad697c.ed235",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3276.820831298828,
-    "y": 311.0235900878906,
-    "z": "7062000.f761",
+    "x": 3236.504165649414,
+    "y": 138.22596740722656,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5cebea40.e205d4"
+        "d35b45c.ac75538"
       ]
     ]
   },
   {
-    "id": "5cebea40.e205d4",
+    "id": "d35b45c.ac75538",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3458.820831298828,
-    "y": 311.0235900878906,
-    "z": "7062000.f761",
+    "x": 3418.504165649414,
+    "y": 138.22596740722656,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d79412d7.a6c38",
+    "id": "b38986d.d0d7878",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3280.820831298828,
-    "y": 362.0235900878906,
-    "z": "7062000.f761",
+    "x": 3240.504165649414,
+    "y": 189.22596740722656,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9ae7a072.d1e518"
+        "cda04f1c.b5e8e8"
       ]
     ]
   },
   {
-    "id": "9ae7a072.d1e518",
+    "id": "cda04f1c.b5e8e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3460.820831298828,
-    "y": 362.0235900878906,
-    "z": "7062000.f761",
+    "x": 3420.504165649414,
+    "y": 189.22596740722656,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "360b8115.051b46"
+        "9d21d2af.f1a338"
       ]
     ]
   },
   {
-    "id": "360b8115.051b46",
+    "id": "9d21d2af.f1a338",
     "type": "switchNode",
     "name": "switch allotted-resource.relationship-list not empty",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3026.883331298828,
-    "y": 496.8833312988281,
-    "z": "7062000.f761",
+    "x": 2986.566665649414,
+    "y": 324.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "28ab4f33.316c8",
-        "e49a7d12.f127b"
+        "2a81c517.5bc7ca",
+        "6137d6c5.a89918"
       ]
     ]
   },
   {
-    "id": "e49a7d12.f127b",
+    "id": "6137d6c5.a89918",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3336.883331298828,
-    "y": 503.8833312988281,
-    "z": "7062000.f761",
+    "x": 3296.566665649414,
+    "y": 331.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "28ab4f33.316c8",
+    "id": "2a81c517.5bc7ca",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3335.883331298828,
-    "y": 557.8833312988281,
-    "z": "7062000.f761",
+    "x": 3295.566665649414,
+    "y": 385.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "32ff3e84.f9f78a"
+        "5824c72f.9c5af"
       ]
     ]
   },
   {
-    "id": "ac20a1c4.b5d88",
+    "id": "28f331ee.9053e6",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.883331298828,
-    "y": 511.8833312988281,
-    "z": "7062000.f761",
+    "x": 4040.566665649414,
+    "y": 339.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "eb5b39ae.c0eb7"
+        "75d3715b.ab7198"
       ]
     ]
   },
   {
-    "id": "eb5b39ae.c0eb7",
+    "id": "75d3715b.ab7198",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4257.883209228516,
-    "y": 504.8832092285156,
-    "z": "7062000.f761",
+    "x": 4217.566543579102,
+    "y": 332.08558654785156,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c3ea0a96.012838",
-        "42443b39.66d044"
+        "ae2a4fce.8a1ea",
+        "2c72c44.f2aec3c"
       ]
     ]
   },
   {
-    "id": "32ff3e84.f9f78a",
+    "id": "5824c72f.9c5af",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3499.883331298828,
-    "y": 483.8833312988281,
-    "z": "7062000.f761",
+    "x": 3459.566665649414,
+    "y": 311.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6034bf74.a356a8",
-        "cf462c55.82"
+        "a5e82cdc.4d956",
+        "b714d40c.0dac68"
       ]
     ]
   },
   {
-    "id": "6034bf74.a356a8",
+    "id": "a5e82cdc.4d956",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3780.883331298828,
-    "y": 439.8833312988281,
-    "z": "7062000.f761",
+    "x": 3740.566665649414,
+    "y": 267.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6ceb7138.15694"
+        "e552898d.0c1d9"
       ]
     ]
   },
   {
-    "id": "6ceb7138.15694",
+    "id": "e552898d.0c1d9",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4042.883331298828,
-    "y": 439.8833312988281,
-    "z": "7062000.f761",
+    "x": 4002.566665649414,
+    "y": 267.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ac20a1c4.b5d88"
+        "28f331ee.9053e6"
       ]
     ]
   },
   {
-    "id": "c3ea0a96.012838",
+    "id": "ae2a4fce.8a1ea",
     "type": "set",
     "name": "set the 1st network-policy-id",
     "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 4500.883209228516,
-    "y": 461.8832092285156,
-    "z": "7062000.f761",
+    "x": 4460.566543579102,
+    "y": 289.08558654785156,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "42443b39.66d044",
+    "id": "2c72c44.f2aec3c",
     "type": "save",
     "name": "get network-policy from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
     "comments": "",
     "outputs": 1,
-    "x": 4489.883209228516,
-    "y": 516.8832092285156,
-    "z": "7062000.f761",
+    "x": 4449.566543579102,
+    "y": 344.08558654785156,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cb5892f8.a134a",
-        "3110dc42.56e8b4",
-        "b948b2e1.478978"
+        "9efeb089.3f19c",
+        "79f2e4c0.6b947c",
+        "6e1f853a.2f305c"
       ]
     ]
   },
   {
-    "id": "b948b2e1.478978",
+    "id": "6e1f853a.2f305c",
     "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": 4780.566665649414,
+    "y": 252.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f1bf9a6a.1a4ef8"
+        "4cb6456e.ff636c"
       ]
     ]
   },
   {
-    "id": "f1bf9a6a.1a4ef8",
+    "id": "4cb6456e.ff636c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4891.454864501953,
-    "y": 403.1690979003906,
-    "z": "7062000.f761",
+    "x": 4929.138198852539,
+    "y": 252.3714599609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e719bcf6.a15758",
+    "id": "7e5b3ac6.b0f59c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4890.392364501953,
-    "y": 447.3093566894531,
-    "z": "7062000.f761",
+    "x": 4928.075698852539,
+    "y": 296.51171875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3110dc42.56e8b4",
+    "id": "79f2e4c0.6b947c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4731.392364501953,
-    "y": 447.3093566894531,
-    "z": "7062000.f761",
+    "x": 4769.075698852539,
+    "y": 296.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e719bcf6.a15758"
+        "7e5b3ac6.b0f59c"
       ]
     ]
   },
   {
-    "id": "cb5892f8.a134a",
+    "id": "9efeb089.3f19c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4738.392364501953,
-    "y": 526.3093566894531,
-    "z": "7062000.f761",
+    "x": 4776.075698852539,
+    "y": 375.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f905d5a0.4b001"
+        "826c9ce5.e54c8"
       ]
     ]
   },
   {
-    "id": "f905d5a0.4b001",
+    "id": "826c9ce5.e54c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4877.392364501953,
-    "y": 526.3093566894531,
-    "z": "7062000.f761",
+    "x": 4915.075698852539,
+    "y": 375.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "abc9ac08.900428",
-        "808b62f7.887bc"
+        "97cd2b3d.5361c",
+        "b21dac06.214a"
       ]
     ]
   },
   {
-    "id": "abc9ac08.900428",
+    "id": "97cd2b3d.5361c",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5082.883331298828,
-    "y": 523.8833312988281,
-    "z": "7062000.f761",
+    "x": 5120.566665649414,
+    "y": 373.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "808b62f7.887bc",
+    "id": "b21dac06.214a",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5081.883331298828,
-    "y": 569.8833312988281,
-    "z": "7062000.f761",
+    "x": 5119.566665649414,
+    "y": 419.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "cf462c55.82",
+    "id": "b714d40c.0dac68",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3597.883331298828,
-    "y": 555.8833312988281,
-    "z": "7062000.f761",
+    "x": 3557.566665649414,
+    "y": 383.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d512c83a.b4f08"
+        "1e5b0c1.e0c2e74"
       ]
     ]
   },
   {
-    "id": "d512c83a.b4f08",
+    "id": "1e5b0c1.e0c2e74",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3877.883331298828,
-    "y": 555.8833312988281,
-    "z": "7062000.f761",
+    "x": 3837.566665649414,
+    "y": 383.08570861816406,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7f3fc2f9.da6f6c"
+        "4e4dff53.dcf898"
       ]
     ]
   },
   {
-    "id": "7f3fc2f9.da6f6c",
+    "id": "4e4dff53.dcf898",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2290.8834533691406,
-    "y": 808.8834533691406,
-    "z": "7062000.f761",
+    "x": 2208.5667877197266,
+    "y": 814.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c5194935.bd2228"
+        "ac446985.9d513"
       ]
     ]
   },
   {
-    "id": "c5194935.bd2228",
+    "id": "ac446985.9d513",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2467.883331298828,
-    "y": 801.8833312988281,
-    "z": "7062000.f761",
+    "x": 2385.566665649414,
+    "y": 807.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d3179b9f.9873a8",
-        "b976f3f3.6f7998"
+        "8274477.dcf57b8",
+        "276accab.cdfa24"
       ]
     ]
   },
   {
-    "id": "d3179b9f.9873a8",
+    "id": "8274477.dcf57b8",
     "type": "set",
     "name": "set the current logical-link-name",
     "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 2710.883331298828,
-    "y": 758.8833312988281,
-    "z": "7062000.f761",
+    "x": 2628.566665649414,
+    "y": 764.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b976f3f3.6f7998",
+    "id": "276accab.cdfa24",
     "type": "save",
     "name": "get logical-link from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
     "comments": "",
     "outputs": 1,
-    "x": 2699.883331298828,
-    "y": 813.8833312988281,
-    "z": "7062000.f761",
+    "x": 2617.566665649414,
+    "y": 819.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "78ac5925.ecf5a8",
-        "b7b22856.252df8",
-        "ac6d9ce2.b2e9e"
+        "650f90f1.61d618",
+        "627e407c.cdb6e8",
+        "11b910a0.ac71f7"
       ]
     ]
   },
   {
-    "id": "78ac5925.ecf5a8",
+    "id": "650f90f1.61d618",
     "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": 2909.057632446289,
+    "y": 797.65966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cd49934.02e89f"
+        "4873b670.d0b66"
       ]
     ]
   },
   {
-    "id": "b7b22856.252df8",
+    "id": "627e407c.cdb6e8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2979.883331298828,
-    "y": 836.8833312988281,
-    "z": "7062000.f761",
+    "x": 2897.566665649414,
+    "y": 842.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ed06d18.02143b"
+        "24b3a747.017c5"
       ]
     ]
   },
   {
-    "id": "cd49934.02e89f",
+    "id": "4873b670.d0b66",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3139.945831298828,
-    "y": 792.7430725097656,
-    "z": "7062000.f761",
+    "x": 3057.629165649414,
+    "y": 797.9454345703125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ed06d18.02143b",
+    "id": "24b3a747.017c5",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3138.883331298828,
-    "y": 836.8833312988281,
-    "z": "7062000.f761",
+    "x": 3056.566665649414,
+    "y": 842.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ac6d9ce2.b2e9e",
+    "id": "11b910a0.ac71f7",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2986.883331298828,
-    "y": 915.8833312988281,
-    "z": "7062000.f761",
+    "x": 2904.566665649414,
+    "y": 921.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "87f4e9d.ba71598"
+        "90fde557.205cd"
       ]
     ]
   },
   {
-    "id": "87f4e9d.ba71598",
+    "id": "90fde557.205cd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3125.883331298828,
-    "y": 915.8833312988281,
-    "z": "7062000.f761",
+    "x": 3043.566665649414,
+    "y": 921.085693359375,
+    "z": "9718fe15.98603",
     "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"
+        "c9c2aba8.a4026",
+        "ff35ed1f.a0a938",
+        "85e3c5ae.d3ea4",
+        "f6929a04.bb038",
+        "aab96898.397318",
+        "1f6e9e43.7e8d42",
+        "158807bc.c2dde8",
+        "b53436ed.4e5d8",
+        "8c4c723a.871028",
+        "af5ed41e.3d53d8",
+        "ad7d5348.0e5498",
+        "36740b66.98fa4c",
+        "344dee20.fc9faa",
+        "8b000822.1c253",
+        "4b552ff.dab62d",
+        "76a3b118.862498",
+        "62eac021.71055",
+        "fbc065ad.333e38",
+        "28bc0683.b68302"
       ]
     ]
   },
   {
-    "id": "f8061145.abbc7",
+    "id": "e37a586.c072528",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3439.883331298828,
-    "y": 721.8833312988281,
-    "z": "7062000.f761",
+    "x": 3355.566665649414,
+    "y": 471.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "c2cb656b.4adff",
+    "id": "c9c2aba8.a4026",
     "type": "execute",
     "name": "execute UUID generator for otn-tunnel-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3420.883331298828,
-    "y": 771.8833312988281,
-    "z": "7062000.f761",
+    "x": 3342.5665435791016,
+    "y": 563.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "23879b91.f9cdd4",
+    "id": "8b000822.1c253",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 3377.883331298828,
-    "y": 816.8833312988281,
-    "z": "7062000.f761",
+    "x": 3299.5665435791016,
+    "y": 608.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "148d0b0c.712fa5",
+    "id": "ff35ed1f.a0a938",
     "type": "set",
     "name": "set network-route-one",
     "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
     "comments": "",
-    "x": 3352.883331298828,
-    "y": 879.8833312988281,
-    "z": "7062000.f761",
+    "x": 3274.5665435791016,
+    "y": 671.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d89221fb.e3072",
+    "id": "85e3c5ae.d3ea4",
     "type": "set",
     "name": "set network-route-two",
     "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
     "comments": "",
-    "x": 3353.883331298828,
-    "y": 934.8833312988281,
-    "z": "7062000.f761",
+    "x": 3275.5665435791016,
+    "y": 726.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ea9aeb3f.7f8c98",
+    "id": "f6929a04.bb038",
     "type": "save",
     "name": "get network-route-one from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
     "comments": "",
     "outputs": 1,
-    "x": 3369.883331298828,
-    "y": 982.8833312988281,
-    "z": "7062000.f761",
+    "x": 3291.5665435791016,
+    "y": 774.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "842b0094.75a4a",
-        "7eb2f3df.e44f04",
-        "b07921bb.e3808"
+        "b38ce95d.a8d8b",
+        "924a9986.e8ef18",
+        "f99ce89.2f90198"
       ]
     ]
   },
   {
-    "id": "11e605d7.ecd0fa",
+    "id": "aab96898.397318",
     "type": "save",
     "name": "get network-route-two from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
     "comments": "",
     "outputs": 1,
-    "x": 3358.883331298828,
-    "y": 1069.8832092285156,
-    "z": "7062000.f761",
+    "x": 3286.566665649414,
+    "y": 841.0855712890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2d5fb508.bfab52",
-        "cb29efc.c6f4b1",
-        "61b86bd0.897d5c"
+        "84f95296.4ca828",
+        "1e5b7441.b6964c",
+        "529168b7.ab36c8"
       ]
     ]
   },
   {
-    "id": "842b0094.75a4a",
+    "id": "b38ce95d.a8d8b",
     "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": 3532.566665649414,
+    "y": 602.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "20684afd.b6d766"
+        "b93c3fb5.8aab08"
       ]
     ]
   },
   {
-    "id": "7eb2f3df.e44f04",
+    "id": "924a9986.e8ef18",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3566.392364501953,
-    "y": 916.3093566894531,
-    "z": "7062000.f761",
+    "x": 3528.075698852539,
+    "y": 651.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d2041960.fe2c28"
+        "e5b21304.84d3f"
       ]
     ]
   },
   {
-    "id": "b07921bb.e3808",
+    "id": "f99ce89.2f90198",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3570.392364501953,
-    "y": 969.3093566894531,
-    "z": "7062000.f761",
+    "x": 3532.075698852539,
+    "y": 704.51171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f96f84b2.606d"
+        "27a2d9bd.f2416e"
       ]
     ]
   },
   {
-    "id": "20684afd.b6d766",
+    "id": "b93c3fb5.8aab08",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3719.454864501953,
-    "y": 866.1690979003906,
-    "z": "7062000.f761",
+    "x": 3681.138198852539,
+    "y": 601.3714599609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d2041960.fe2c28",
+    "id": "e5b21304.84d3f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3709.392364501953,
-    "y": 916.3093566894531,
-    "z": "7062000.f761",
+    "x": 3671.075698852539,
+    "y": 651.51171875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2d5fb508.bfab52",
+    "id": "84f95296.4ca828",
     "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": 3536.566665649414,
+    "y": 758.0855712890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "96baba9a.d0e19"
+        "5554565c.9228c"
       ]
     ]
   },
   {
-    "id": "cb29efc.c6f4b1",
+    "id": "1e5b7441.b6964c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3577.392364501953,
-    "y": 1089.3092346191406,
-    "z": "7062000.f761",
+    "x": 3532.075698852539,
+    "y": 807.5115966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1fb34f72.484a51"
+        "6ebd88b9.37bc78"
       ]
     ]
   },
   {
-    "id": "61b86bd0.897d5c",
+    "id": "529168b7.ab36c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3578.392364501953,
-    "y": 1142.3092346191406,
-    "z": "7062000.f761",
+    "x": 3515.075698852539,
+    "y": 855.5115966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "10c44aa8.1e2ead"
+        "a79b682c.88ba1"
       ]
     ]
   },
   {
-    "id": "96baba9a.d0e19",
+    "id": "5554565c.9228c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3730.454864501953,
-    "y": 1039.1689758300781,
-    "z": "7062000.f761",
+    "x": 3685.138198852539,
+    "y": 757.371337890625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1fb34f72.484a51",
+    "id": "6ebd88b9.37bc78",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3720.392364501953,
-    "y": 1089.3092346191406,
-    "z": "7062000.f761",
+    "x": 3675.075698852539,
+    "y": 807.5115966796875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f96f84b2.606d",
+    "id": "27a2d9bd.f2416e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3731.883331298828,
-    "y": 968.8833312988281,
-    "z": "7062000.f761",
+    "x": 3693.566665649414,
+    "y": 704.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c276b776.1eb8a"
+        "e35dbf37.07c328"
       ]
     ]
   },
   {
-    "id": "10c44aa8.1e2ead",
+    "id": "a79b682c.88ba1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3731.883331298828,
-    "y": 1141.8832092285156,
-    "z": "7062000.f761",
+    "x": 3668.566665649414,
+    "y": 855.0855712890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "dfc4c0e1.407a7"
+        "25d6cc4d.0a0984"
       ]
     ]
   },
   {
-    "id": "c276b776.1eb8a",
+    "id": "e35dbf37.07c328",
     "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": 3865.566665649414,
+    "y": 704.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "680276dd.9e09b8",
-        "fada4cff.fbd328"
+        "df69d2ac.c94928",
+        "d63273d9.506ef8",
+        "3dcf3da2.14e88a"
       ]
     ]
   },
   {
-    "id": "dfc4c0e1.407a7",
+    "id": "25d6cc4d.0a0984",
     "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": 3860.566665649414,
+    "y": 789.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1f020e0e.66975a",
-        "a14ce01a.56f21"
+        "284fe38.7ff599c",
+        "574139dc.c55898",
+        "f46ebe04.450d9"
       ]
     ]
   },
   {
-    "id": "680276dd.9e09b8",
+    "id": "df69d2ac.c94928",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4079.883331298828,
-    "y": 947.8833312988281,
-    "z": "7062000.f761",
+    "x": 4026.566177368164,
+    "y": 440.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2d74202a.0b02c"
+        "7ce464fa.676414"
       ]
     ]
   },
   {
-    "id": "fada4cff.fbd328",
+    "id": "d63273d9.506ef8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4081.883331298828,
-    "y": 1001.8833312988281,
-    "z": "7062000.f761",
+    "x": 4028.566177368164,
+    "y": 494.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7e647400.994a6c"
+        "6bd6b0d9.b558a"
       ]
     ]
   },
   {
-    "id": "1f020e0e.66975a",
+    "id": "284fe38.7ff599c",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.883331298828,
-    "y": 1111.8833312988281,
-    "z": "7062000.f761",
+    "x": 4041.565933227539,
+    "y": 662.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "45ecb3a3.4434cc"
+        "6918e709.d57e78"
       ]
     ]
   },
   {
-    "id": "a14ce01a.56f21",
+    "id": "574139dc.c55898",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4082.883331298828,
-    "y": 1165.8833312988281,
-    "z": "7062000.f761",
+    "x": 4043.565933227539,
+    "y": 716.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c83b931a.caa288"
+        "688d98a0.dbdc1"
       ]
     ]
   },
   {
-    "id": "698ac3d0.bab4ec",
+    "id": "69d167e5.40c62",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4389.883331298828,
-    "y": 899.8833312988281,
-    "z": "7062000.f761",
+    "x": 4336.566177368164,
+    "y": 392.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d12533f5.293ec",
+    "id": "e079feb5.4893f8",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4382.883331298828,
-    "y": 997.8833312988281,
-    "z": "7062000.f761",
+    "x": 4329.566177368164,
+    "y": 490.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "cfe2458d.e53598",
+    "id": "81aa5c4a.edfc28",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4382.883331298828,
-    "y": 1084.8833312988281,
-    "z": "7062000.f761",
+    "x": 4405.565933227539,
+    "y": 689.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e0154f38.db2ba",
+    "id": "3e901a8b.2e5bae",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4386.883331298828,
-    "y": 1177.8833312988281,
-    "z": "7062000.f761",
+    "x": 4409.565933227539,
+    "y": 782.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c5ef28c0.6623d",
+    "id": "93aaa3a6.0ddda8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3613.883331298828,
-    "y": 1586.8833312988281,
-    "z": "7062000.f761",
+    "x": 3487.566665649414,
+    "y": 1205.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cf149009.40de5"
+        "e42413be.b1fcf8"
       ]
     ]
   },
   {
-    "id": "892e385b.99fcd8",
+    "id": "9cfab2db.ec2e9",
     "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": 3497.057632446289,
+    "y": 1247.6597290039062,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fcd9fb7.509ae08"
+        "b6bb4e8e.b484d"
       ]
     ]
   },
   {
-    "id": "a241b92b.410968",
+    "id": "aba7aaee.8e0cf8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3611.883331298828,
-    "y": 1675.8833312988281,
-    "z": "7062000.f761",
+    "x": 3485.566665649414,
+    "y": 1294.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3987c181.ee8c26"
+        "30b7412f.1199ae"
       ]
     ]
   },
   {
-    "id": "277d69d7.fb78d6",
+    "id": "3ca3d712.007d28",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3313.883331298828,
-    "y": 1548.8833312988281,
-    "z": "7062000.f761",
+    "x": 3187.566665649414,
+    "y": 1167.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1a00d4a4.ff98a3",
+    "id": "158807bc.c2dde8",
     "type": "save",
     "name": "get p-interface-src from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3356.883331298828,
-    "y": 1613.8833312988281,
-    "z": "7062000.f761",
+    "x": 3230.566665649414,
+    "y": 1232.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c5ef28c0.6623d",
-        "892e385b.99fcd8",
-        "a241b92b.410968"
+        "93aaa3a6.0ddda8",
+        "9cfab2db.ec2e9",
+        "aba7aaee.8e0cf8"
       ]
     ]
   },
   {
-    "id": "104f2b87.41fe14",
+    "id": "1f6e9e43.7e8d42",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3357.883331298828,
-    "y": 1283.8833312988281,
-    "z": "7062000.f761",
+    "x": 3219.566665649414,
+    "y": 1082.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a533cbf2.9ff568",
-        "84397dc4.6052e8"
+        "aef080fa.c114b",
+        "ec7d5fb1.6942b"
       ]
     ]
   },
   {
-    "id": "84397dc4.6052e8",
+    "id": "ec7d5fb1.6942b",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3580.883331298828,
-    "y": 1269.8833312988281,
-    "z": "7062000.f761",
+    "x": 3442.566665649414,
+    "y": 1068.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a3186923.403f7"
+        "fd803677.f63638"
       ]
     ]
   },
   {
-    "id": "a533cbf2.9ff568",
+    "id": "aef080fa.c114b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3582.883331298828,
-    "y": 1302.8833312988281,
-    "z": "7062000.f761",
+    "x": 3444.566665649414,
+    "y": 1101.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fb4a8c19.28b8c8"
+        "51e88d79.18cdf4"
       ]
     ]
   },
   {
-    "id": "cf149009.40de5",
+    "id": "e42413be.b1fcf8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3786.549835205078,
-    "y": 1585.8833312988281,
-    "z": "7062000.f761",
+    "x": 3660.233169555664,
+    "y": 1204.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d71c8cc2.44ee38",
-        "eeee90c0.e5cea8"
+        "4ed4fbc5.711d0c",
+        "90207f5c.a05dd8"
       ]
     ]
   },
   {
-    "id": "fcd9fb7.509ae08",
+    "id": "b6bb4e8e.b484d",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3776.9457092285156,
-    "y": 1632.7431030273438,
-    "z": "7062000.f761",
+    "x": 3650.6290435791016,
+    "y": 1250.9454650878906,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3987c181.ee8c26",
+    "id": "30b7412f.1199ae",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3780.883331298828,
-    "y": 1676.8833312988281,
-    "z": "7062000.f761",
+    "x": 3654.566665649414,
+    "y": 1295.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d71c8cc2.44ee38",
+    "id": "4ed4fbc5.711d0c",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4050.883331298828,
-    "y": 1569.8833312988281,
-    "z": "7062000.f761",
+    "x": 3924.566665649414,
+    "y": 1255.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "245c145e.ebe6e4",
-        "5de5cc75.c2e844"
+        "db4ec7c1.fb8ff8",
+        "8a68098.2ae2578"
       ]
     ]
   },
   {
-    "id": "5de5cc75.c2e844",
+    "id": "8a68098.2ae2578",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4273.883331298828,
-    "y": 1524.8833312988281,
-    "z": "7062000.f761",
+    "x": 4100.566665649414,
+    "y": 1305.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a0f9be9b.313468"
+        "9f8db296.d1b7"
       ]
     ]
   },
   {
-    "id": "245c145e.ebe6e4",
+    "id": "db4ec7c1.fb8ff8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4275.883331298828,
-    "y": 1588.8833312988281,
-    "z": "7062000.f761",
+    "x": 4102.566665649414,
+    "y": 1369.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "911806e7.142508"
+        "19ec1ce6.638d63"
       ]
     ]
   },
   {
-    "id": "911806e7.142508",
+    "id": "19ec1ce6.638d63",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4437.883331298828,
-    "y": 1584.8833312988281,
-    "z": "7062000.f761",
+    "x": 4264.566665649414,
+    "y": 1365.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a0f9be9b.313468",
+    "id": "9f8db296.d1b7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4438.883331298828,
-    "y": 1521.8833312988281,
-    "z": "7062000.f761",
+    "x": 4265.566665649414,
+    "y": 1302.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e1f125c0.caa6f",
-        "a1eca114.4be78"
+        "5c94bd3f.3e7f94",
+        "fc089afb.f44ed8"
       ]
     ]
   },
   {
-    "id": "d95b965d.c926c",
-    "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",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "6b95fc34.5ad8b4",
-    "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",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "8335544a.4f7eb",
-    "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",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "fb4a8c19.28b8c8",
+    "id": "51e88d79.18cdf4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3725.883331298828,
-    "y": 1299.8833312988281,
-    "z": "7062000.f761",
+    "x": 3587.566665649414,
+    "y": 1098.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a3186923.403f7",
+    "id": "fd803677.f63638",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3728.883331298828,
-    "y": 1262.8833312988281,
-    "z": "7062000.f761",
+    "x": 3590.566665649414,
+    "y": 1061.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "df51c615.6dea38",
-        "42564be7.1576fc"
+        "eccb372c.34c8d",
+        "98d2965b.47a9d8"
       ]
     ]
   },
   {
-    "id": "df51c615.6dea38",
+    "id": "eccb372c.34c8d",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3902.883331298828,
-    "y": 1218.8833312988281,
-    "z": "7062000.f761",
+    "x": 3764.566665649414,
+    "y": 1017.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "eeee90c0.e5cea8",
+    "id": "90207f5c.a05dd8",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4004.883331298828,
-    "y": 1853.8833312988281,
-    "z": "7062000.f761",
+    "x": 3636.566665649414,
+    "y": 1386.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1b697bac.74bf24"
+        "5a97a44a.833984"
       ]
     ]
   },
   {
-    "id": "1b697bac.74bf24",
+    "id": "5a97a44a.833984",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4210.883331298828,
-    "y": 1853.8833312988281,
-    "z": "7062000.f761",
+    "x": 3917.566665649414,
+    "y": 1381.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fad81e7.f76f06"
+        "1a323487.0d80a3"
       ]
     ]
   },
   {
-    "id": "fad81e7.f76f06",
+    "id": "1a323487.0d80a3",
     "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": 4228.852310180664,
+    "y": 1455.907470703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f6db1963.f8cc08"
+        "25962334.407414"
       ]
     ]
   },
   {
-    "id": "42564be7.1576fc",
+    "id": "98d2965b.47a9d8",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3917.883331298828,
-    "y": 1329.8833312988281,
-    "z": "7062000.f761",
+    "x": 3779.566665649414,
+    "y": 1128.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3d26932b.7c3bc4",
-        "11ea41e8.6fef1e",
-        "60ff709f.49eb3"
+        "3ec80c0c.a7d6a4",
+        "fb8be251.80b5",
+        "c39223e5.81b608"
       ]
     ]
   },
   {
-    "id": "3d26932b.7c3bc4",
+    "id": "3ec80c0c.a7d6a4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4113.383453369141,
-    "y": 1281.8833312988281,
-    "z": "7062000.f761",
+    "x": 3975.0667877197266,
+    "y": 1080.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e66646fd.ae97a8"
+        "cee29929.100dd"
       ]
     ]
   },
   {
-    "id": "11ea41e8.6fef1e",
+    "id": "fb8be251.80b5",
     "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": 3967.0667877197266,
+    "y": 1135.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6bc38e9e.a8f668"
+        "75204f77.c3b168"
       ]
     ]
   },
   {
-    "id": "60ff709f.49eb3",
+    "id": "c39223e5.81b608",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4110.383453369141,
-    "y": 1393.8833312988281,
-    "z": "7062000.f761",
+    "x": 3972.0667877197266,
+    "y": 1192.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1b2700d2.65979f"
+        "24e0ef02.5cfcc"
       ]
     ]
   },
   {
-    "id": "1b2700d2.65979f",
+    "id": "24e0ef02.5cfcc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4262.383453369141,
-    "y": 1394.8833312988281,
-    "z": "7062000.f761",
+    "x": 4124.066787719727,
+    "y": 1193.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6bc38e9e.a8f668",
+    "id": "75204f77.c3b168",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4273.383453369141,
-    "y": 1339.8833312988281,
-    "z": "7062000.f761",
+    "x": 4135.066787719727,
+    "y": 1138.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e66646fd.ae97a8",
+    "id": "cee29929.100dd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4257.765777587891,
-    "y": 1279.5390014648438,
-    "z": "7062000.f761",
+    "x": 4119.449111938477,
+    "y": 1077.7413635253906,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8c7c1f5.e4db1e"
+        "20e9a108.5fcefe"
       ]
     ]
   },
   {
-    "id": "8c7c1f5.e4db1e",
+    "id": "20e9a108.5fcefe",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4441.883331298828,
-    "y": 1293.8833312988281,
-    "z": "7062000.f761",
+    "x": 4342.566909790039,
+    "y": 1216.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9be30f1d.25d3a8"
+        "4c952f98.568af8"
       ]
     ]
   },
   {
-    "id": "a1eca114.4be78",
+    "id": "fc089afb.f44ed8",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
     "comments": "",
-    "x": 4608.883331298828,
-    "y": 1479.8833312988281,
-    "z": "7062000.f761",
+    "x": 4435.566665649414,
+    "y": 1260.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e1f125c0.caa6f",
+    "id": "5c94bd3f.3e7f94",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
     "comments": "",
-    "x": 4609.883331298828,
-    "y": 1587.8833312988281,
-    "z": "7062000.f761",
+    "x": 4436.566665649414,
+    "y": 1368.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b9cba76c.d9c1f8",
+    "id": "e2e3430b.441438",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4610.883331298828,
-    "y": 1536.8833312988281,
-    "z": "7062000.f761",
+    "x": 4437.566665649414,
+    "y": 1317.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f6db1963.f8cc08",
+    "id": "25962334.407414",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4633.000518798828,
-    "y": 1854.2236633300781,
-    "z": "7062000.f761",
+    "x": 4435.683853149414,
+    "y": 1456.426025390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7891783a.b17838",
-        "d094659a.049558",
-        "9c226fb0.3cc118"
+        "c4c94be4.c4e6d8",
+        "778cb9b9.8f8fe8",
+        "bf204b7b.9bfdb"
       ]
     ]
   },
   {
-    "id": "7891783a.b17838",
+    "id": "c4c94be4.c4e6d8",
     "type": "set",
     "name": "set source ttp-id",
     "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4848.000518798828,
-    "y": 1816.2236633300781,
-    "z": "7062000.f761",
+    "x": 4650.683853149414,
+    "y": 1418.426025390625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d094659a.049558",
+    "id": "778cb9b9.8f8fe8",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4845.000518798828,
-    "y": 1855.2236633300781,
-    "z": "7062000.f761",
+    "x": 4647.683853149414,
+    "y": 1457.426025390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7580173.08b9968"
+        "ec4224f7.9e7cd8"
       ]
     ]
   },
   {
-    "id": "9c226fb0.3cc118",
+    "id": "bf204b7b.9bfdb",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4800.500518798828,
-    "y": 1897.2236633300781,
-    "z": "7062000.f761",
+    "x": 4603.183853149414,
+    "y": 1499.426025390625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7580173.08b9968",
+    "id": "ec4224f7.9e7cd8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5025.500518798828,
-    "y": 1854.2236633300781,
-    "z": "7062000.f761",
+    "x": 4828.183853149414,
+    "y": 1456.426025390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cbf832f4.29b03"
+        "582de34f.7fb28c"
       ]
     ]
   },
   {
-    "id": "c301ea5d.736948",
+    "id": "594a82b5.27abf4",
     "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": 4740.566909790039,
+    "y": 1220.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "82c12c36.ef82a"
+        "66078b.852b6874"
       ]
     ]
   },
   {
-    "id": "82c12c36.ef82a",
+    "id": "66078b.852b6874",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5016.883331298828,
-    "y": 1289.8833312988281,
-    "z": "7062000.f761",
+    "x": 4917.566909790039,
+    "y": 1212.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "99af67bd.f0a288",
-        "27aaa5b6.e5d6a2"
+        "845ac8fd.748f28",
+        "83b24a05.2f8a"
       ]
     ]
   },
   {
-    "id": "9be30f1d.25d3a8",
+    "id": "4c952f98.568af8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4636.883331298828,
-    "y": 1293.8833312988281,
-    "z": "7062000.f761",
+    "x": 4537.566909790039,
+    "y": 1216.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c301ea5d.736948",
-        "d642ceb0.6d61d8"
+        "594a82b5.27abf4",
+        "5ed6730.6c8c00c"
       ]
     ]
   },
   {
-    "id": "d642ceb0.6d61d8",
+    "id": "5ed6730.6c8c00c",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4842.883331298828,
-    "y": 1371.8833312988281,
-    "z": "7062000.f761",
+    "x": 4606.566909790039,
+    "y": 1290.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8d64b35.e02ce5"
+        "4c5161e.9fd722"
       ]
     ]
   },
   {
-    "id": "8d64b35.e02ce5",
+    "id": "4c5161e.9fd722",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5019.883331298828,
-    "y": 1363.8833312988281,
-    "z": "7062000.f761",
+    "x": 4802.566909790039,
+    "y": 1290.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b7238960.567a78"
+        "56b33693.b47598"
       ]
     ]
   },
   {
-    "id": "cbf832f4.29b03",
+    "id": "582de34f.7fb28c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5183.500518798828,
-    "y": 1854.2236633300781,
-    "z": "7062000.f761",
+    "x": 4986.183853149414,
+    "y": 1456.426025390625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "703f7e18.3396c8"
+        "85577907.9676c"
       ]
     ]
   },
   {
-    "id": "703f7e18.3396c8",
+    "id": "85577907.9676c",
     "type": "set",
     "name": "set source tunnel tp ip",
     "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5390.500518798828,
-    "y": 1854.2236633300781,
-    "z": "7062000.f761",
+    "x": 5193.183853149414,
+    "y": 1456.426025390625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "27aaa5b6.e5d6a2",
+    "id": "83b24a05.2f8a",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5224.883331298828,
-    "y": 1296.8833312988281,
-    "z": "7062000.f761",
+    "x": 5142.566909790039,
+    "y": 1208.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5f4852b0.deaefc",
-        "a3e152bc.1612f",
-        "6a748238.68a734"
+        "713c5be.b2c37a4",
+        "d56276.26041588",
+        "196389ff.ab755e"
       ]
     ]
   },
   {
-    "id": "99af67bd.f0a288",
+    "id": "845ac8fd.748f28",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainA id",
     "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5254.883331298828,
-    "y": 1244.8833312988281,
-    "z": "7062000.f761",
+    "x": 5172.566909790039,
+    "y": 1156.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5f4852b0.deaefc",
+    "id": "713c5be.b2c37a4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5434.883331298828,
-    "y": 1287.8833312988281,
-    "z": "7062000.f761",
+    "x": 5352.566909790039,
+    "y": 1199.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fce8f611.8c7338"
+        "d0702051.0907f"
       ]
     ]
   },
   {
-    "id": "a3e152bc.1612f",
+    "id": "d56276.26041588",
     "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": 5344.566909790039,
+    "y": 1254.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "23b3b244.7d6476"
+        "8b99771a.c5d7d8"
       ]
     ]
   },
   {
-    "id": "6a748238.68a734",
+    "id": "196389ff.ab755e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5431.883331298828,
-    "y": 1399.8833312988281,
-    "z": "7062000.f761",
+    "x": 5349.566909790039,
+    "y": 1311.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a282f316.3a8968"
+        "a51c05da.8af508"
       ]
     ]
   },
   {
-    "id": "a282f316.3a8968",
+    "id": "a51c05da.8af508",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5583.883331298828,
-    "y": 1400.8833312988281,
-    "z": "7062000.f761",
+    "x": 5501.566909790039,
+    "y": 1312.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "23b3b244.7d6476",
+    "id": "8b99771a.c5d7d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5594.883331298828,
-    "y": 1345.8833312988281,
-    "z": "7062000.f761",
+    "x": 5512.566909790039,
+    "y": 1257.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fce8f611.8c7338",
+    "id": "d0702051.0907f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5579.265655517578,
-    "y": 1285.5390014648438,
-    "z": "7062000.f761",
+    "x": 5496.949234008789,
+    "y": 1196.7413635253906,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a440aece.fb083"
+        "2f7031d3.9cf0ee"
       ]
     ]
   },
   {
-    "id": "b7238960.567a78",
+    "id": "56b33693.b47598",
     "type": "set",
     "name": "set domainA ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5254.883331298828,
-    "y": 1487.8833312988281,
-    "z": "7062000.f761",
+    "x": 5065.566909790039,
+    "y": 1293.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a440aece.fb083",
+    "id": "2f7031d3.9cf0ee",
     "type": "set",
     "name": "set controller domainA data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5793.883331298828,
-    "y": 1281.8833312988281,
-    "z": "7062000.f761",
+    "x": 5683.566909790039,
+    "y": 1193.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5b9ee810.250ef",
+    "id": "f189d378.846e88",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4377.883331298828,
-    "y": 935.8833312988281,
-    "z": "7062000.f761",
+    "x": 4324.566177368164,
+    "y": 428.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "8e2d81c0.4fd7e8",
+    "id": "b971caad.98e088",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4368.883331298828,
-    "y": 1033.8833312988281,
-    "z": "7062000.f761",
+    "x": 4315.566177368164,
+    "y": 526.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2d74202a.0b02c",
+    "id": "7ce464fa.676414",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4202.883331298828,
-    "y": 941.8833312988281,
-    "z": "7062000.f761",
+    "x": 4149.566177368164,
+    "y": 434.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "698ac3d0.bab4ec",
-        "5b9ee810.250ef"
+        "69d167e5.40c62",
+        "f189d378.846e88"
       ]
     ]
   },
   {
-    "id": "7e647400.994a6c",
+    "id": "6bd6b0d9.b558a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4208.883331298828,
-    "y": 1005.8833312988281,
-    "z": "7062000.f761",
+    "x": 4155.566177368164,
+    "y": 498.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d12533f5.293ec",
-        "8e2d81c0.4fd7e8"
+        "e079feb5.4893f8",
+        "b971caad.98e088"
       ]
     ]
   },
   {
-    "id": "45ecb3a3.4434cc",
+    "id": "6918e709.d57e78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4208.883331298828,
-    "y": 1111.8833312988281,
-    "z": "7062000.f761",
+    "x": 4169.565933227539,
+    "y": 662.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cfe2458d.e53598",
-        "1ea1c70f.8279e9"
+        "81aa5c4a.edfc28",
+        "94706e58.1662e"
       ]
     ]
   },
   {
-    "id": "c83b931a.caa288",
+    "id": "688d98a0.dbdc1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4211.883331298828,
-    "y": 1164.8833312988281,
-    "z": "7062000.f761",
+    "x": 4172.565933227539,
+    "y": 715.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e0154f38.db2ba",
-        "85671ae.a18b1e8"
+        "3e901a8b.2e5bae",
+        "fa86abe3.b1432"
       ]
     ]
   },
   {
-    "id": "1ea1c70f.8279e9",
+    "id": "94706e58.1662e",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4368.883331298828,
-    "y": 1124.8833312988281,
-    "z": "7062000.f761",
+    "x": 4391.565933227539,
+    "y": 729.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "85671ae.a18b1e8",
+    "id": "fa86abe3.b1432",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4371.883331298828,
-    "y": 1215.8833312988281,
-    "z": "7062000.f761",
+    "x": 4394.565933227539,
+    "y": 820.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7278edf2.b8b58c",
+    "id": "86d40228.e6791",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3743.883331298828,
-    "y": 2425.883331298828,
-    "z": "7062000.f761",
+    "x": 3550.566665649414,
+    "y": 1766.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3fae525c.90658e",
-        "13c312d5.234edd"
+        "6a32c154.ba6f4",
+        "1782aa9f.237955"
       ]
     ]
   },
   {
-    "id": "2fa6509a.e12468",
+    "id": "9ec80efb.c2577",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3571.216827392578,
-    "y": 2426.883331298828,
-    "z": "7062000.f761",
+    "x": 3377.900161743164,
+    "y": 1767.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7278edf2.b8b58c"
+        "86d40228.e6791"
       ]
     ]
   },
   {
-    "id": "2125c96e.09934e",
+    "id": "43e3fed6.1297b8",
     "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": 3387.391128540039,
+    "y": 1809.6597290039062,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "68c9e27f.22495c"
+        "334a1379.e9843c"
       ]
     ]
   },
   {
-    "id": "be5c9f7d.6c274",
+    "id": "1f47b68f.a8eef1",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3569.216827392578,
-    "y": 2515.883331298828,
-    "z": "7062000.f761",
+    "x": 3375.900161743164,
+    "y": 1856.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "dc663a75.10e1e"
+        "5bb133ac.e78e0c"
       ]
     ]
   },
   {
-    "id": "68c9e27f.22495c",
+    "id": "334a1379.e9843c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3734.2792053222656,
-    "y": 2472.7431030273438,
-    "z": "7062000.f761",
+    "x": 3540.9625396728516,
+    "y": 1812.9454650878906,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "dc663a75.10e1e",
+    "id": "5bb133ac.e78e0c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3738.216827392578,
-    "y": 2516.883331298828,
-    "z": "7062000.f761",
+    "x": 3544.900161743164,
+    "y": 1857.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3fae525c.90658e",
+    "id": "6a32c154.ba6f4",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4030.216827392578,
-    "y": 2429.8834533691406,
-    "z": "7062000.f761",
+    "x": 3836.900161743164,
+    "y": 1770.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f8506393.ef4d48",
-        "ae1a7fe2.9ff988"
+        "ca43a356.ba0b08",
+        "e66d0b8d.a97b4"
       ]
     ]
   },
   {
-    "id": "ae1a7fe2.9ff988",
+    "id": "e66d0b8d.a97b4",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4253.216827392578,
-    "y": 2384.8834533691406,
-    "z": "7062000.f761",
+    "x": 4059.900161743164,
+    "y": 1725.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bd5252ed.d0e86"
+        "fd8de530.926928"
       ]
     ]
   },
   {
-    "id": "f8506393.ef4d48",
+    "id": "ca43a356.ba0b08",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4255.216827392578,
-    "y": 2448.8834533691406,
-    "z": "7062000.f761",
+    "x": 4061.900161743164,
+    "y": 1789.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7b56fdc4.718894"
+        "ac8c9391.216608"
       ]
     ]
   },
   {
-    "id": "7b56fdc4.718894",
+    "id": "ac8c9391.216608",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4414.216827392578,
-    "y": 2467.8834533691406,
-    "z": "7062000.f761",
+    "x": 4220.900161743164,
+    "y": 1808.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bd5252ed.d0e86",
+    "id": "fd8de530.926928",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4418.216827392578,
-    "y": 2381.8834533691406,
-    "z": "7062000.f761",
+    "x": 4224.900161743164,
+    "y": 1722.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a04df249.3edf9",
-        "4445456b.4ef0dc"
+        "23cc210e.ee0c06",
+        "6fca06b.e0d07f8"
       ]
     ]
   },
   {
-    "id": "dfb0d610.c67228",
-    "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",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "a9b19647.ecdf6",
-    "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",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "d1080dc6.5d411",
-    "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",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "52e7c1a.b628dc",
+    "id": "8c4c723a.871028",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3343.216827392578,
-    "y": 2461.883331298828,
-    "z": "7062000.f761",
+    "x": 3149.900161743164,
+    "y": 1802.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2fa6509a.e12468",
-        "2125c96e.09934e",
-        "be5c9f7d.6c274"
+        "9ec80efb.c2577",
+        "43e3fed6.1297b8",
+        "1f47b68f.a8eef1"
       ]
     ]
   },
   {
-    "id": "534c4b07.5a4374",
+    "id": "24043c86.21d3b4",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3304.216827392578,
-    "y": 2405.883331298828,
-    "z": "7062000.f761",
+    "x": 3110.900161743164,
+    "y": 1746.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "59b35d49.e5c194",
+    "id": "b53436ed.4e5d8",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3361.216827392578,
-    "y": 2124.8832092285156,
-    "z": "7062000.f761",
+    "x": 3162.900161743164,
+    "y": 1548.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8468812d.ab7d98",
-        "832feae1.441b18"
+        "b0d17fd7.22179",
+        "dd9d4fb5.ef81d"
       ]
     ]
   },
   {
-    "id": "832feae1.441b18",
+    "id": "dd9d4fb5.ef81d",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3584.216827392578,
-    "y": 2110.8832092285156,
-    "z": "7062000.f761",
+    "x": 3385.900161743164,
+    "y": 1534.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "45b67ba7.081314"
+        "b04c1433.ec2b4"
       ]
     ]
   },
   {
-    "id": "8468812d.ab7d98",
+    "id": "b0d17fd7.22179",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3586.216827392578,
-    "y": 2143.8832092285156,
-    "z": "7062000.f761",
+    "x": 3387.900161743164,
+    "y": 1567.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "71974a85.bc9554"
+        "774ab139.4714d"
       ]
     ]
   },
   {
-    "id": "71974a85.bc9554",
+    "id": "774ab139.4714d",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3729.216827392578,
-    "y": 2140.8832092285156,
-    "z": "7062000.f761",
+    "x": 3530.900161743164,
+    "y": 1564.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "45b67ba7.081314",
+    "id": "b04c1433.ec2b4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3732.216827392578,
-    "y": 2103.8832092285156,
-    "z": "7062000.f761",
+    "x": 3533.900161743164,
+    "y": 1527.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "10560f97.9ccdb",
-        "fb974250.3eaa5"
+        "1e9a896f.f9bc1f",
+        "93b99c7d.fb3988"
       ]
     ]
   },
   {
-    "id": "10560f97.9ccdb",
+    "id": "1e9a896f.f9bc1f",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3926.216827392578,
-    "y": 2106.883331298828,
-    "z": "7062000.f761",
+    "x": 3727.900161743164,
+    "y": 1530.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "13c312d5.234edd",
+    "id": "1782aa9f.237955",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3989.216827392578,
-    "y": 2738.883331298828,
-    "z": "7062000.f761",
+    "x": 3780.900161743164,
+    "y": 1889.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4f9cbec5.496d9"
+        "2e3481a6.9bb10e"
       ]
     ]
   },
   {
-    "id": "4f9cbec5.496d9",
+    "id": "2e3481a6.9bb10e",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4195.216827392578,
-    "y": 2738.883331298828,
-    "z": "7062000.f761",
+    "x": 3986.900161743164,
+    "y": 1889.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b238117c.f6854"
+        "6540c5f1.0a5994"
       ]
     ]
   },
   {
-    "id": "b238117c.f6854",
+    "id": "6540c5f1.0a5994",
     "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": 4204.185806274414,
+    "y": 1887.907470703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3bbc3c62.de1f1c"
+        "95bcf360.d32c3"
       ]
     ]
   },
   {
-    "id": "fb974250.3eaa5",
+    "id": "93b99c7d.fb3988",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3948.216827392578,
-    "y": 2174.883331298828,
-    "z": "7062000.f761",
+    "x": 3749.900161743164,
+    "y": 1598.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8b8a9b87.c8a068",
-        "46f3b355.657d1c",
-        "789bb9ae.3c411"
+        "56130ba2.c1cf54",
+        "ae8939cc.fc31",
+        "2a03aebc.9defb2"
       ]
     ]
   },
   {
-    "id": "8b8a9b87.c8a068",
+    "id": "56130ba2.c1cf54",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4143.716949462891,
-    "y": 2126.883331298828,
-    "z": "7062000.f761",
+    "x": 3945.4002838134766,
+    "y": 1550.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "288864eb.075f34"
+        "d6a55773.4a4c"
       ]
     ]
   },
   {
-    "id": "46f3b355.657d1c",
+    "id": "ae8939cc.fc31",
     "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": 3937.4002838134766,
+    "y": 1605.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f82ba322.6474e"
+        "9b459bcd.2098d"
       ]
     ]
   },
   {
-    "id": "789bb9ae.3c411",
+    "id": "2a03aebc.9defb2",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4140.716949462891,
-    "y": 2238.883331298828,
-    "z": "7062000.f761",
+    "x": 3942.4002838134766,
+    "y": 1662.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "98f52488.0327b8"
+        "649fe73e.2ce088"
       ]
     ]
   },
   {
-    "id": "98f52488.0327b8",
+    "id": "649fe73e.2ce088",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4292.716949462891,
-    "y": 2239.883331298828,
-    "z": "7062000.f761",
+    "x": 4094.4002838134766,
+    "y": 1663.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f82ba322.6474e",
+    "id": "9b459bcd.2098d",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4303.716949462891,
-    "y": 2184.883331298828,
-    "z": "7062000.f761",
+    "x": 4105.400283813477,
+    "y": 1608.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "288864eb.075f34",
+    "id": "d6a55773.4a4c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4288.099273681641,
-    "y": 2124.5390014648438,
-    "z": "7062000.f761",
+    "x": 4089.7826080322266,
+    "y": 1547.7414855957031,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ce45d16c.d5e628"
+        "bede9152.115d78"
       ]
     ]
   },
   {
-    "id": "a04df249.3edf9",
+    "id": "23cc210e.ee0c06",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
     "comments": "",
-    "x": 4588.216827392578,
-    "y": 2342.8834533691406,
-    "z": "7062000.f761",
+    "x": 4394.900161743164,
+    "y": 1683.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4445456b.4ef0dc",
+    "id": "6fca06b.e0d07f8",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
     "comments": "",
-    "x": 4589.216827392578,
-    "y": 2447.8834533691406,
-    "z": "7062000.f761",
+    "x": 4395.900161743164,
+    "y": 1788.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c559d0ff.64e92",
+    "id": "69bceee8.94dc1",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4584.216827392578,
-    "y": 2396.8834533691406,
-    "z": "7062000.f761",
+    "x": 4390.900161743164,
+    "y": 1737.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3bbc3c62.de1f1c",
+    "id": "95bcf360.d32c3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4619.334014892578,
-    "y": 2727.2237854003906,
-    "z": "7062000.f761",
+    "x": 4411.017349243164,
+    "y": 1877.4261474609375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f4fc0b3b.90cef8",
-        "6738a6d1.eac328",
-        "94eb5da4.00ce9"
+        "d7309d49.1473f8",
+        "2eed2e93.5097fa",
+        "930eaed5.6d5ba"
       ]
     ]
   },
   {
-    "id": "f4fc0b3b.90cef8",
+    "id": "d7309d49.1473f8",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4834.334014892578,
-    "y": 2689.2237854003906,
-    "z": "7062000.f761",
+    "x": 4626.017349243164,
+    "y": 1839.4261474609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6738a6d1.eac328",
+    "id": "2eed2e93.5097fa",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4831.334014892578,
-    "y": 2728.2237854003906,
-    "z": "7062000.f761",
+    "x": 4623.017349243164,
+    "y": 1878.4261474609375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "99dab506.61b3a8"
+        "2f95459c.265a5a"
       ]
     ]
   },
   {
-    "id": "94eb5da4.00ce9",
+    "id": "930eaed5.6d5ba",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4786.834014892578,
-    "y": 2770.2237854003906,
-    "z": "7062000.f761",
+    "x": 4578.517349243164,
+    "y": 1920.4261474609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "99dab506.61b3a8",
+    "id": "2f95459c.265a5a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5011.834014892578,
-    "y": 2727.2237854003906,
-    "z": "7062000.f761",
+    "x": 4803.517349243164,
+    "y": 1877.4261474609375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d09db1ae.3d50e8"
+        "d078b0a.68a52d"
       ]
     ]
   },
   {
-    "id": "d09db1ae.3d50e8",
+    "id": "d078b0a.68a52d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5169.834014892578,
-    "y": 2727.2237854003906,
-    "z": "7062000.f761",
+    "x": 4961.517349243164,
+    "y": 1877.4261474609375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b4fea58e.4d08b"
+        "30e98951.5e07a6"
       ]
     ]
   },
   {
-    "id": "b4fea58e.4d08b",
+    "id": "30e98951.5e07a6",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5376.834014892578,
-    "y": 2727.2237854003906,
-    "z": "7062000.f761",
+    "x": 5168.517349243164,
+    "y": 1877.4261474609375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9cb60767.3dae68",
+    "id": "981701b9.ec871",
     "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": 4671.900161743164,
+    "y": 1566.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "20305f15.4fc8"
+        "d77b06b.6f4d6f8"
       ]
     ]
   },
   {
-    "id": "20305f15.4fc8",
+    "id": "d77b06b.6f4d6f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5047.216827392578,
-    "y": 2134.883331298828,
-    "z": "7062000.f761",
+    "x": 4848.900161743164,
+    "y": 1558.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f06ad939.b3afb8",
-        "eb592a74.9250f"
+        "3a0f923c.08de3e",
+        "973e1032.2176f8"
       ]
     ]
   },
   {
-    "id": "ce45d16c.d5e628",
+    "id": "bede9152.115d78",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4472.216827392578,
-    "y": 2138.883331298828,
-    "z": "7062000.f761",
+    "x": 4273.900161743164,
+    "y": 1562.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "836b2028.73fa6"
+        "fdc36db2.a87e28"
       ]
     ]
   },
   {
-    "id": "836b2028.73fa6",
+    "id": "fdc36db2.a87e28",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4667.216827392578,
-    "y": 2138.883331298828,
-    "z": "7062000.f761",
+    "x": 4468.900161743164,
+    "y": 1562.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9cb60767.3dae68",
-        "1e4a18fb.74350f"
+        "981701b9.ec871",
+        "be6d1ad1.f19078"
       ]
     ]
   },
   {
-    "id": "eb592a74.9250f",
+    "id": "973e1032.2176f8",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5255.216827392578,
-    "y": 2141.883331298828,
-    "z": "7062000.f761",
+    "x": 5056.900161743164,
+    "y": 1565.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b94c1f46.28b1b8",
-        "73a98c16.ea7094",
-        "1e6cb9ce.e34866"
+        "ca9140fb.c087c8",
+        "6d0312aa.d002b4",
+        "f05eee5.baf501"
       ]
     ]
   },
   {
-    "id": "4be3f63c.7d65d8",
+    "id": "6e647d31.2d49bc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5049.216827392578,
-    "y": 2207.883331298828,
-    "z": "7062000.f761",
+    "x": 4850.900161743164,
+    "y": 1631.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "573bcde0.7ae984"
+        "e3a19b14.5a697"
       ]
     ]
   },
   {
-    "id": "1e4a18fb.74350f",
+    "id": "be6d1ad1.f19078",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4872.216827392578,
-    "y": 2215.883331298828,
-    "z": "7062000.f761",
+    "x": 4673.900161743164,
+    "y": 1639.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4be3f63c.7d65d8"
+        "6e647d31.2d49bc"
       ]
     ]
   },
   {
-    "id": "f06ad939.b3afb8",
+    "id": "3a0f923c.08de3e",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainB id",
     "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5285.216827392578,
-    "y": 2089.883331298828,
-    "z": "7062000.f761",
+    "x": 5086.900161743164,
+    "y": 1513.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "573bcde0.7ae984",
+    "id": "e3a19b14.5a697",
     "type": "set",
     "name": "set domainB ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5284.216827392578,
-    "y": 2331.883331298828,
-    "z": "7062000.f761",
+    "x": 5032.900161743164,
+    "y": 1695.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b94c1f46.28b1b8",
+    "id": "ca9140fb.c087c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5465.216827392578,
-    "y": 2132.883331298828,
-    "z": "7062000.f761",
+    "x": 5266.900161743164,
+    "y": 1556.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9cca84a4.69e27"
+        "b8d407f0.fa2f2"
       ]
     ]
   },
   {
-    "id": "73a98c16.ea7094",
+    "id": "6d0312aa.d002b4",
     "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": 5258.900161743164,
+    "y": 1611.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e1e079f9.7a9848"
+        "4b944ffd.e25418"
       ]
     ]
   },
   {
-    "id": "1e6cb9ce.e34866",
+    "id": "f05eee5.baf501",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5462.216827392578,
-    "y": 2244.883331298828,
-    "z": "7062000.f761",
+    "x": 5263.900161743164,
+    "y": 1668.0858154296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9609b4db.95e4f"
+        "ee8e04d7.272aa8"
       ]
     ]
   },
   {
-    "id": "9609b4db.95e4f",
+    "id": "ee8e04d7.272aa8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5614.216827392578,
-    "y": 2245.883331298828,
-    "z": "7062000.f761",
+    "x": 5415.900161743164,
+    "y": 1669.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e1e079f9.7a9848",
+    "id": "4b944ffd.e25418",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5625.216827392578,
-    "y": 2190.883331298828,
-    "z": "7062000.f761",
+    "x": 5426.900161743164,
+    "y": 1614.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9cca84a4.69e27",
+    "id": "b8d407f0.fa2f2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5609.599151611328,
-    "y": 2130.5390014648438,
-    "z": "7062000.f761",
+    "x": 5411.282485961914,
+    "y": 1553.7414855957031,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b8027aff.eb46b"
+        "6d9ea0b0.8eb598"
       ]
     ]
   },
   {
-    "id": "b8027aff.eb46b",
+    "id": "6d9ea0b0.8eb598",
     "type": "set",
     "name": "set controller domainB data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5824.216827392578,
-    "y": 2126.883331298828,
-    "z": "7062000.f761",
+    "x": 5625.900161743164,
+    "y": 1550.0858154296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "cdada9b0.2f3a48",
+    "id": "af5ed41e.3d53d8",
     "type": "set",
     "name": "set LEAF stuff",
-    "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop`\" />\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": 3214.566665649414,
+    "y": 1372.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "95e31216.278c48",
+    "id": "8ca11cdb.f07238",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4544.883331298828,
-    "y": 1019.8833312988281,
-    "z": "7062000.f761",
+    "x": 4491.566177368164,
+    "y": 512.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e1b848f1.cea8f8",
+    "id": "d8ad8c3e.d0237",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4536.883331298828,
-    "y": 1109.8833312988281,
-    "z": "7062000.f761",
+    "x": 4559.565933227539,
+    "y": 714.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "850e2800.badf2",
+    "id": "ad7d5348.0e5498",
     "type": "set",
     "name": "set ROOT stuff",
-    "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop`\" />\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": 3110.566665649414,
+    "y": 1933.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2b1064a0.eade7c",
+    "id": "36740b66.98fa4c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3454.883331298828,
-    "y": 2840.883331298828,
-    "z": "7062000.f761",
+    "x": 3372.566665649414,
+    "y": 2846.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a5bcbd5b.23b83",
+    "id": "344dee20.fc9faa",
     "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": 3249.566665649414,
+    "y": 2956.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6b05a347.83dffc",
-        "734dd518.f869ec"
+        "ae20b5d5.d95098",
+        "c9495f1c.3bc2f8"
       ]
     ]
   },
   {
-    "id": "6b05a347.83dffc",
+    "id": "ae20b5d5.d95098",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3515.883331298828,
-    "y": 2929.883331298828,
-    "z": "7062000.f761",
+    "x": 3433.566665649414,
+    "y": 2935.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "81013cf2.231a08"
+        "dbad0754.935cf"
       ]
     ]
   },
   {
-    "id": "734dd518.f869ec",
+    "id": "c9495f1c.3bc2f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3051.883331298828,
-    "y": 4515.883331298828,
-    "z": "7062000.f761",
+    "x": 2969.566665649414,
+    "y": 4521.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "adcb6448.ea7478"
+        "89fb91c7.4bd6f"
       ]
     ]
   },
   {
-    "id": "68da37f9.05cc18",
+    "id": "10e6ecec.11b933",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3562.883331298828,
-    "y": 5100.883331298828,
-    "z": "7062000.f761",
+    "x": 3480.566665649414,
+    "y": 5106.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d849eb29.b778b",
-        "fb71ca0a.fe8928",
-        "c01640bb.f526e8",
-        "298d7f45.2553b",
-        "4ebb86dc.a0713"
+        "965aea89.b04fc8",
+        "f18404c6.f7135",
+        "e65dde18.8f2e28",
+        "1e648504.a919f3",
+        "518cc181.03ac48",
+        "3f0ddd6.f3f1022"
       ]
     ]
   },
   {
-    "id": "81013cf2.231a08",
+    "id": "dbad0754.935cf",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6634.883331298828,
-    "y": 2959.883331298828,
-    "z": "7062000.f761",
+    "x": 6146.566665649414,
+    "y": 1755.085693359375,
+    "z": "9718fe15.98603",
     "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"
+        "36824bf8.d68ef4",
+        "2dc163c.5688f1c",
+        "aefc0847.3297e8",
+        "f9d64859.5035b",
+        "378565ef.1147ba",
+        "ea2b2456.c327d",
+        "41693c79.da7d5c",
+        "632a01d1.5b8d1",
+        "3ebd5a04.12a166",
+        "f08579e.3888c08",
+        "c49cd07d.45dca",
+        "64b31039.d88b18",
+        "9f309da2.930198",
+        "bc5b333d.5b219",
+        "4ee4ed66.f0512c",
+        "11738810.45add",
+        "997f20e4.966598",
+        "90ca3b9e.d9782",
+        "99bc893b.a732e",
+        "98d8658a.1dab08",
+        "d8f4cd5c.153e9",
+        "96928e3.987df7"
       ]
     ]
   },
   {
-    "id": "12533815.a962b",
+    "id": "3ebd5a04.12a166",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainB",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6945.883331298828,
-    "y": 3314.883331298828,
-    "z": "7062000.f761",
+    "x": 6517.566665649414,
+    "y": 1678.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "8a2aea1.11dcc18",
+    "id": "36824bf8.d68ef4",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6899.883331298828,
-    "y": 3412.883331298828,
-    "z": "7062000.f761",
+    "x": 6471.566665649414,
+    "y": 1776.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f98cf202.f36e28",
+    "id": "2dc163c.5688f1c",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 7035.883331298828,
-    "y": 3459.883331298828,
-    "z": "7062000.f761",
+    "x": 6607.566665649414,
+    "y": 1823.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "c27f6f12.2b7db",
+    "id": "c7f7058b.2d43",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6866.883331298828,
-    "y": 3263.883331298828,
-    "z": "7062000.f761",
+    "x": 6438.566665649414,
+    "y": 1627.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c8ec9937.7e8ac",
+    "id": "288fb927.99235e",
     "type": "comment",
     "name": "create middle man connectivity and ...",
     "info": "1- create middle man connectivity\n2- create relation with all connectivities\n   in the path\n3- put srcTtp (+dstTtp) somewhere in the\n   vpn-binding -> this is for later on to find\n   which OTN tunnel's bandwidth has to be increased.\n5- create UNIs\n4- create relationship to UNIs",
     "comments": "",
-    "x": 7392.883331298828,
-    "y": 3754.883331298828,
-    "z": "7062000.f761",
+    "x": 6934.566665649414,
+    "y": 2363.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "90c516f3.625c7",
+    "id": "aefc0847.3297e8",
     "type": "execute",
     "name": "execute UUID generator for connectivity middle-man",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6956.883331298828,
-    "y": 3793.883331298828,
-    "z": "7062000.f761",
+    "x": 6498.566665649414,
+    "y": 2402.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f838a6e.450ff6",
+    "id": "f9d64859.5035b",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6904.883331298828,
-    "y": 3844.883331298828,
-    "z": "7062000.f761",
+    "x": 6446.566665649414,
+    "y": 2453.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "1aed0e7e.f8efea",
+    "id": "378565ef.1147ba",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-middle-man-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-middle-man-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 7040.883331298828,
-    "y": 3891.883331298828,
-    "z": "7062000.f761",
+    "x": 6582.566665649414,
+    "y": 2500.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "26cc918c.53f13e",
+    "id": "718897ce.fb3b1",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 6897.883331298828,
-    "y": 3753.883331298828,
-    "z": "7062000.f761",
+    "x": 6439.566665649414,
+    "y": 2362.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4f7a1677.0cc04",
+    "id": "42817fe0.95098",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 7327.883331298828,
-    "y": 3950.883331298828,
-    "z": "7062000.f761",
+    "x": 6869.566665649414,
+    "y": 2559.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "c314ffe6.755b68",
+    "id": "ea2b2456.c327d",
     "type": "save",
     "name": "get middle-man connectivity from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $prop.connectivity-middle-man-uuid\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"middle-man-conn\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 6918.883331298828,
-    "y": 3997.883331298828,
-    "z": "7062000.f761",
+    "x": 6460.566665649414,
+    "y": 2606.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b94a6109.4587b8",
-        "244569e0.e8b39e",
-        "f408fad5.acd5c"
+        "7708ed16.f5264c",
+        "77c895d1.87f4a4",
+        "866d7f4e.404768"
       ]
     ]
   },
   {
-    "id": "b94a6109.4587b8",
+    "id": "7708ed16.f5264c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7165.883331298828,
-    "y": 3951.883331298828,
-    "z": "7062000.f761",
+    "x": 6707.566665649414,
+    "y": 2560.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4f7a1677.0cc04"
+        "42817fe0.95098"
       ]
     ]
   },
   {
-    "id": "244569e0.e8b39e",
+    "id": "77c895d1.87f4a4",
     "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": 6708.057632446289,
+    "y": 2605.6597290039062,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c4e6aa20.1e07c8"
+        "372888d7.b266f8"
       ]
     ]
   },
   {
-    "id": "f408fad5.acd5c",
+    "id": "866d7f4e.404768",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7163.883331298828,
-    "y": 4040.883331298828,
-    "z": "7062000.f761",
+    "x": 6705.566665649414,
+    "y": 2649.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5ee0d1d0.ddd63"
+        "5cb60ec5.ffb7e8"
       ]
     ]
   },
   {
-    "id": "c4e6aa20.1e07c8",
+    "id": "372888d7.b266f8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 7328.945709228516,
-    "y": 3997.7431030273438,
-    "z": "7062000.f761",
+    "x": 6870.629043579102,
+    "y": 2605.9454650878906,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5ee0d1d0.ddd63",
+    "id": "5cb60ec5.ffb7e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 7332.883331298828,
-    "y": 4041.883331298828,
-    "z": "7062000.f761",
+    "x": 6874.566665649414,
+    "y": 2650.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ca7cd34b.bc2bf",
+    "id": "4ee4ed66.f0512c",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6975.883331298828,
-    "y": 4276.883331298828,
-    "z": "7062000.f761",
+    "x": 6514.566665649414,
+    "y": 2922.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "139339a2.2c6a06",
+    "id": "11738810.45add",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6978.883331298828,
-    "y": 4321.883331298828,
-    "z": "7062000.f761",
+    "x": 6517.566665649414,
+    "y": 2967.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9ce39c8b.582fa",
+    "id": "90ca3b9e.d9782",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6967.883331298828,
-    "y": 4112.883331298828,
-    "z": "7062000.f761",
+    "x": 6509.566665649414,
+    "y": 2721.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "79c8e0a2.e2d0f",
+    "id": "99bc893b.a732e",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6969.883331298828,
-    "y": 4159.883331298828,
-    "z": "7062000.f761",
+    "x": 6511.566665649414,
+    "y": 2768.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a0361928.318ac8",
+    "id": "ce999bfb.8752f",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 6891.883331298828,
-    "y": 4229.883331298828,
-    "z": "7062000.f761",
+    "x": 6430.566665649414,
+    "y": 2875.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d342acdf.02b8f",
+    "id": "618f9b48.ad8ea4",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4521.883087158203,
-    "y": 5380.883331298828,
-    "z": "7062000.f761",
+    "x": 4430.566909790039,
+    "y": 5268.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "d849eb29.b778b",
+    "id": "965aea89.b04fc8",
     "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": 3695.566665649414,
+    "y": 5087.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ef9ce74a.0aa3e",
-        "75834f94.5997b"
+        "c53bf166.c2e718",
+        "936c4fdb.103588"
       ]
     ]
   },
   {
-    "id": "75834f94.5997b",
+    "id": "936c4fdb.103588",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3949.883331298828,
-    "y": 5078.883331298828,
-    "z": "7062000.f761",
+    "x": 3867.566665649414,
+    "y": 5084.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f997d531.6d1e2"
+        "8b1c5fc9.627c"
       ]
     ]
   },
   {
-    "id": "ef9ce74a.0aa3e",
+    "id": "c53bf166.c2e718",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3901.883331298828,
-    "y": 5925.883331298828,
-    "z": "7062000.f761",
+    "x": 3819.566665649414,
+    "y": 5931.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7f678eb1.f9d898"
+        "eab327e7.a5f748"
       ]
     ]
   },
   {
-    "id": "94fb7d78.dd39a8",
+    "id": "3f493e72.b6d702",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3962.883331298828,
-    "y": 5048.883331298828,
-    "z": "7062000.f761",
+    "x": 3880.566665649414,
+    "y": 5054.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d898a291.dc858",
+    "id": "4859c2db.d9b9e4",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3972.883331298828,
-    "y": 5883.883331298828,
-    "z": "7062000.f761",
+    "x": 3890.566665649414,
+    "y": 5889.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "92f41cb.d6037e",
+    "id": "41693c79.da7d5c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6975.883331298828,
-    "y": 4385.883331298828,
-    "z": "7062000.f761",
+    "x": 6516.566665649414,
+    "y": 3101.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f997d531.6d1e2",
+    "id": "8b1c5fc9.627c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4125.883331298828,
-    "y": 5080.883331298828,
-    "z": "7062000.f761",
+    "x": 4043.566665649414,
+    "y": 5086.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "baabeea4.9ec638",
-        "fd2de0c3.4119c8",
-        "7962decb.29a4b8",
-        "1df2ddf.d8fc4a2",
-        "bb9baf34.d0edd",
-        "983065a0.b74e08",
-        "d342acdf.02b8f"
+        "a815fc28.26a0f",
+        "8b2580e9.dc4908",
+        "63429691.f224b",
+        "2532ed2.07c3292",
+        "d070f297.71c91",
+        "d66ee6cb.59aee8",
+        "618f9b48.ad8ea4",
+        "4f6ebd11.7928d4",
+        "53cb53b2.198aa4"
       ]
     ]
   },
   {
-    "id": "4b2297b2.c2986",
+    "id": "7eea77d.c16dd08",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5569.883087158203,
-    "y": 5005.883331298828,
-    "z": "7062000.f761",
+    "x": 5487.566421508789,
+    "y": 5011.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "baabeea4.9ec638",
+    "id": "a815fc28.26a0f",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4516.883087158203,
-    "y": 5683.883331298828,
-    "z": "7062000.f761",
+    "x": 4289.566909790039,
+    "y": 5767.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "1663311a.25772f",
+    "id": "632a01d1.5b8d1",
     "type": "save",
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6951.883331298828,
-    "y": 3653.883331298828,
-    "z": "7062000.f761",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "ac7755ab.b0ef2",
-    "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",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "2976ed1.40d8712",
-    "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": 6523.566665649414,
+    "y": 2017.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "7c3bd1f7.b32788",
+    "id": "5eff9d93.842974",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid=tmp.ROOT.uni-p-interface-long",
     "xml": "<set>\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />\n",
     "comments": "",
-    "x": 7001.883331298828,
-    "y": 3356.883331298828,
-    "z": "7062000.f761",
+    "x": 6573.566665649414,
+    "y": 1720.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "110e6104.d57bd7",
+    "id": "f08579e.3888c08",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6948.883331298828,
-    "y": 2944.883331298828,
-    "z": "7062000.f761",
+    "x": 6520.566665649414,
+    "y": 1308.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9037ac75.0bc238",
+    "id": "c49cd07d.45dca",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6896.883331298828,
-    "y": 2992.883331298828,
-    "z": "7062000.f761",
+    "x": 6468.566665649414,
+    "y": 1356.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "3017f19.9b8270e",
+    "id": "64b31039.d88b18",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 7024.883331298828,
-    "y": 3039.883331298828,
-    "z": "7062000.f761",
+    "x": 6596.566665649414,
+    "y": 1403.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "2b4caca8.ebe43c",
+    "id": "6013e30e.dd851c",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 6861.883331298828,
-    "y": 2902.883331298828,
-    "z": "7062000.f761",
+    "x": 6433.566665649414,
+    "y": 1266.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b384a7be.8178a",
+    "id": "9f309da2.930198",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6858.883331298828,
-    "y": 3130.883331298828,
-    "z": "7062000.f761",
+    "x": 6430.566665649414,
+    "y": 1494.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "bc57a86f.472ff",
+    "id": "bc5b333d.5b219",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6951.883331298828,
-    "y": 3183.883331298828,
-    "z": "7062000.f761",
+    "x": 6523.566665649414,
+    "y": 1547.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a5d38ce2.eac838",
+    "id": "cdd019be.ce295",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 6842.883331298828,
-    "y": 3086.883331298828,
-    "z": "7062000.f761",
+    "x": 6414.566665649414,
+    "y": 1450.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "232bd10a.a8b54e",
+    "id": "aeaa5a0f.0b3cf",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 6848.883331298828,
-    "y": 3536.883331298828,
-    "z": "7062000.f761",
+    "x": 6420.566665649414,
+    "y": 1900.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1df2ddf.d8fc4a2",
+    "id": "2532ed2.07c3292",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4438.883087158203,
-    "y": 5013.883331298828,
-    "z": "7062000.f761",
+    "x": 4356.566421508789,
+    "y": 5019.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "5696f41b.05cf84",
+    "id": "3a34d279.a99216",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4422.883087158203,
-    "y": 4969.883331298828,
-    "z": "7062000.f761",
+    "x": 4340.566421508789,
+    "y": 4975.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "462a954a.4cebb4",
+    "id": "4c6450c4.cdb8b8",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5169.883087158203,
-    "y": 5000.883331298828,
-    "z": "7062000.f761",
+    "x": 5087.566421508789,
+    "y": 5006.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5bab7896.e13d9",
+    "id": "d6b231ff.4e48",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5256.883087158203,
-    "y": 5042.883331298828,
-    "z": "7062000.f761",
+    "x": 5174.566421508789,
+    "y": 5048.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ec708b2b.d3c6e",
+    "id": "e479d260.5097c",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5204.883087158203,
-    "y": 5090.883331298828,
-    "z": "7062000.f761",
+    "x": 5122.566421508789,
+    "y": 5096.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "dea6b450.126ae",
+    "id": "c8a578a.1c83e08",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5332.883087158203,
-    "y": 5137.883331298828,
-    "z": "7062000.f761",
+    "x": 5250.566421508789,
+    "y": 5143.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "983065a0.b74e08",
+    "id": "d66ee6cb.59aee8",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4509.883087158203,
-    "y": 5422.883331298828,
-    "z": "7062000.f761",
+    "x": 4418.566909790039,
+    "y": 5310.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "e263a78e.c8cba",
+    "id": "85a1c373.0d0068",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4492.883087158203,
-    "y": 5484.883331298828,
-    "z": "7062000.f761",
+    "x": 4401.566909790039,
+    "y": 5372.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "fd2de0c3.4119c8",
+    "id": "8b2580e9.dc4908",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4603.883087158203,
-    "y": 5526.883331298828,
-    "z": "7062000.f761",
+    "x": 4512.566909790039,
+    "y": 5414.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "631f5baa.6a836c",
+    "id": "2bc22db1.d483d2",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5051.883087158203,
-    "y": 5579.883331298828,
-    "z": "7062000.f761",
+    "x": 4969.566421508789,
+    "y": 5585.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4505fb5a.3099fc",
+    "id": "47c00ee.a0fdbf",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4361.883087158203,
-    "y": 6277.883331298828,
-    "z": "7062000.f761",
+    "x": 4279.566421508789,
+    "y": 6283.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "78bf173f.567498",
+    "id": "afc7e373.9dd788",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4294.883087158203,
-    "y": 6231.883331298828,
-    "z": "7062000.f761",
+    "x": 4212.566421508789,
+    "y": 6237.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "79075338.970b1c",
+    "id": "13eeaed2.223169",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4243.883087158203,
-    "y": 6182.883331298828,
-    "z": "7062000.f761",
+    "x": 4161.566421508789,
+    "y": 6188.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "552d64d8.079684",
+    "id": "9fd3ad0c.c5f0a",
     "type": "save",
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5026.883331298828,
-    "y": 6388.883331298828,
-    "z": "7062000.f761",
+    "x": 4944.566665649414,
+    "y": 6394.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "7962decb.29a4b8",
+    "id": "63429691.f224b",
     "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": 4339.566909790039,
+    "y": 5471.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a8868823.64a65",
-        "f3d79a89.da5f"
+        "4766abce.851ac4",
+        "ca35b158.85d38"
       ]
     ]
   },
   {
-    "id": "a8868823.64a65",
+    "id": "4766abce.851ac4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4641.883087158203,
-    "y": 5583.883331298828,
-    "z": "7062000.f761",
+    "x": 4550.566909790039,
+    "y": 5471.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8c7e9ec3.edd538"
+        "2ab4c487.b40124"
       ]
     ]
   },
   {
-    "id": "8c7e9ec3.edd538",
+    "id": "2ab4c487.b40124",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4797.883087158203,
-    "y": 5579.883331298828,
-    "z": "7062000.f761",
+    "x": 4706.566909790039,
+    "y": 5467.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "631f5baa.6a836c",
-        "e719db8e.3b76c8",
-        "63d85a3d.4103fc"
+        "2bc22db1.d483d2",
+        "b27ea187.400a38",
+        "ca1c65a6.dca85"
       ]
     ]
   },
   {
-    "id": "f3d79a89.da5f",
+    "id": "ca35b158.85d38",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4637.883087158203,
-    "y": 5631.883331298828,
-    "z": "7062000.f761",
+    "x": 4546.566909790039,
+    "y": 5519.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c9509718.d9f2e8"
+        "e1bf2cff.d57f2"
       ]
     ]
   },
   {
-    "id": "c9509718.d9f2e8",
+    "id": "e1bf2cff.d57f2",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 4785.883087158203,
-    "y": 5626.883331298828,
-    "z": "7062000.f761",
+    "x": 4694.566909790039,
+    "y": 5514.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "10f1aa00.faee3e",
+    "id": "b408049f.7933a",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5293.883087158203,
-    "y": 5208.883331298828,
-    "z": "7062000.f761",
+    "x": 5211.566421508789,
+    "y": 5214.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "dca67cc5.30d2f8",
+    "id": "4f8a0bf3.f76a6c",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2460.883331298828,
-    "y": 167.88333129882812,
-    "z": "7062000.f761",
+    "x": 2378.566665649414,
+    "y": 173.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce64f5e6.94469",
+    "id": "6a76544b.f753cc",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 2394.883331298828,
-    "y": 203.88333129882812,
-    "z": "7062000.f761",
+    "x": 2312.566665649414,
+    "y": 209.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "10c1b340.47f61d",
+    "id": "23b662d9.16701e",
     "type": "comment",
     "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
     "info": "",
     "comments": "",
-    "x": 2579.883331298828,
-    "y": 130.88333129882812,
-    "z": "7062000.f761",
+    "x": 2497.566665649414,
+    "y": 136.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7299a42e.833c84",
+    "id": "3d0b458a.f9a2a2",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 4328.883087158203,
-    "y": 6343.883331298828,
-    "z": "7062000.f761",
+    "x": 4246.566421508789,
+    "y": 6349.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "14b14bf.2fcb6b4",
+    "id": "a3e7b437.8026b",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4461.883087158203,
-    "y": 6391.883331298828,
-    "z": "7062000.f761",
+    "x": 4379.566421508789,
+    "y": 6397.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "787fc902.6b8688",
+    "id": "2ab2c1b2.c4462e",
     "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": 4198.566421508789,
+    "y": 6455.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "17a7dc18.0b8f9c",
-        "f762f.a378f1d18"
+        "6310145f.4f2a84",
+        "deaf1bfa.406858"
       ]
     ]
   },
   {
-    "id": "17a7dc18.0b8f9c",
+    "id": "6310145f.4f2a84",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4473.883087158203,
-    "y": 6450.883331298828,
-    "z": "7062000.f761",
+    "x": 4391.566421508789,
+    "y": 6456.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "22a4f0b9.5cc3f"
+        "92986ec9.51c668"
       ]
     ]
   },
   {
-    "id": "22a4f0b9.5cc3f",
+    "id": "92986ec9.51c668",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",
     "comments": "",
-    "x": 4629.883087158203,
-    "y": 6447.883331298828,
-    "z": "7062000.f761",
+    "x": 4547.566421508789,
+    "y": 6453.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f762f.a378f1d18",
+    "id": "deaf1bfa.406858",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4477.883087158203,
-    "y": 6494.883331298828,
-    "z": "7062000.f761",
+    "x": 4395.566421508789,
+    "y": 6500.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "82673a8f.5388f"
+        "a4ec2716.41f19"
       ]
     ]
   },
   {
-    "id": "82673a8f.5388f",
+    "id": "a4ec2716.41f19",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4616.883087158203,
-    "y": 6489.883331298828,
-    "z": "7062000.f761",
+    "x": 4534.566421508789,
+    "y": 6495.085693359375,
+    "z": "9718fe15.98603",
     "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"
+        "9fd3ad0c.c5f0a",
+        "4aae1198.db26d8",
+        "b8ff0583.7b229",
+        "35f40d66.777f92",
+        "4c2ed97e.80e7a8",
+        "1d9d64e4.a08beb",
+        "fb131710.b3fbe",
+        "fa9aa1ff.8bf6e",
+        "c8446998.29dfe",
+        "a215a7d6.657bc8",
+        "977f17a0.9f41a",
+        "5d58f01d.864e08",
+        "ecfaffd6.100b2"
       ]
     ]
   },
   {
-    "id": "5a7c34be.0eee64",
+    "id": "fb131710.b3fbe",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4813.883087158203,
-    "y": 7168.883331298828,
-    "z": "7062000.f761",
+    "x": 4731.566421508789,
+    "y": 7174.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8d3fe228.0e9ab8",
-        "92f94e1c.33687",
-        "710bd5c.e65692c"
+        "cd8a8557.f7b3c8",
+        "49f465a0.b6d20c",
+        "5fdb4c32.46cfb4"
       ]
     ]
   },
   {
-    "id": "8d3fe228.0e9ab8",
+    "id": "cd8a8557.f7b3c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5018.883087158203,
-    "y": 7165.883331298828,
-    "z": "7062000.f761",
+    "x": 4926.566635131836,
+    "y": 7150.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "867b5387.a77e68"
+        "7e4f80d.5c6488"
       ]
     ]
   },
   {
-    "id": "92f94e1c.33687",
+    "id": "49f465a0.b6d20c",
     "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": 4919.057601928711,
+    "y": 7186.659698486328,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "32a9210e.f5a66e"
+        "80117652.9958b8"
       ]
     ]
   },
   {
-    "id": "710bd5c.e65692c",
+    "id": "5fdb4c32.46cfb4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4999.883087158203,
-    "y": 7270.883331298828,
-    "z": "7062000.f761",
+    "x": 4916.566635131836,
+    "y": 7230.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5f13dad2.143724"
+        "7193c18c.ae073"
       ]
     ]
   },
   {
-    "id": "867b5387.a77e68",
+    "id": "7e4f80d.5c6488",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5186.883331298828,
-    "y": 7160.883331298828,
-    "z": "7062000.f761",
+    "x": 5098.566635131836,
+    "y": 7148.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a6483ec8.fd095"
+        "d9a6ee9f.5c31f8"
       ]
     ]
   },
   {
-    "id": "32a9210e.f5a66e",
+    "id": "80117652.9958b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5164.945465087891,
-    "y": 7227.743103027344,
-    "z": "7062000.f761",
+    "x": 5081.629013061523,
+    "y": 7186.9454345703125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5f13dad2.143724",
+    "id": "7193c18c.ae073",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5166.883087158203,
-    "y": 7269.883331298828,
-    "z": "7062000.f761",
+    "x": 5083.566635131836,
+    "y": 7229.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a6483ec8.fd095",
+    "id": "d9a6ee9f.5c31f8",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5421.883087158203,
-    "y": 7176.883331298828,
-    "z": "7062000.f761",
+    "x": 5339.566421508789,
+    "y": 7182.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2bfd9e0f.b0b65a"
+        "9aea7b31.b501a8"
       ]
     ]
   },
   {
-    "id": "2bfd9e0f.b0b65a",
+    "id": "9aea7b31.b501a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5658.883087158203,
-    "y": 7172.883331298828,
-    "z": "7062000.f761",
+    "x": 5576.566421508789,
+    "y": 7178.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f7d1e8ad.4dc7b8"
+        "686e53e3.1ad1dc"
       ]
     ]
   },
   {
-    "id": "58dab986.f5f5a",
+    "id": "2df6b745.3fe8d",
     "type": "switchNode",
     "name": "switch vpnuuid is for this slice",
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5925.883087158203,
-    "y": 7138.883331298828,
-    "z": "7062000.f761",
+    "x": 5843.566421508789,
+    "y": 7144.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "25d3132f.f14084",
-        "88844ebd.a9a5b"
+        "3835a5ae.8b815a",
+        "a4db2f80.721418"
       ]
     ]
   },
   {
-    "id": "25d3132f.f14084",
+    "id": "3835a5ae.8b815a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6106.883087158203,
-    "y": 7164.883331298828,
-    "z": "7062000.f761",
+    "x": 6024.566421508789,
+    "y": 7170.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f7d1e8ad.4dc7b8"
+        "686e53e3.1ad1dc"
       ]
     ]
   },
   {
-    "id": "88844ebd.a9a5b",
+    "id": "a4db2f80.721418",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6105.883087158203,
-    "y": 7117.883331298828,
-    "z": "7062000.f761",
+    "x": 6023.566421508789,
+    "y": 7123.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f7d1e8ad.4dc7b8",
+    "id": "686e53e3.1ad1dc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4849.883087158203,
-    "y": 7439.883331298828,
-    "z": "7062000.f761",
+    "x": 4540.566635131836,
+    "y": 7318.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a21574dc.7f1048"
+        "a6487ee6.2cb7c"
       ]
     ]
   },
   {
-    "id": "da2d189.a0c85e8",
+    "id": "380ab70.5227a4a",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 5698.883087158203,
-    "y": 7344.883331298828,
-    "z": "7062000.f761",
+    "x": 5616.566421508789,
+    "y": 7350.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9ec2c103.e591",
+    "id": "a81b3e84.443f78",
     "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": 4829.566635131836,
+    "y": 7086.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4ac1ad89.6ecd0c",
+    "id": "1d9d64e4.a08beb",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4795.883087158203,
-    "y": 6964.883331298828,
-    "z": "7062000.f761",
+    "x": 4713.566421508789,
+    "y": 6970.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2add06b4.24634a",
+    "id": "b1c30fd3.1d3b28",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5140.883087158203,
-    "y": 6795.883331298828,
-    "z": "7062000.f761",
+    "x": 5058.566421508789,
+    "y": 6801.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a410e22f.bcf42"
+        "886001f.2b8eb8"
       ]
     ]
   },
   {
-    "id": "a410e22f.bcf42",
+    "id": "886001f.2b8eb8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5360.883087158203,
-    "y": 6801.883331298828,
-    "z": "7062000.f761",
+    "x": 5278.566421508789,
+    "y": 6807.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "22269296.bf623e"
+        "7a4c6acb.556084"
       ]
     ]
   },
   {
-    "id": "22269296.bf623e",
+    "id": "7a4c6acb.556084",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5545.883087158203,
-    "y": 6800.883331298828,
-    "z": "7062000.f761",
+    "x": 5463.566421508789,
+    "y": 6806.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "66b1e6be.5824e"
+        "801921d3.c16518"
       ]
     ]
   },
   {
-    "id": "66b1e6be.5824e",
+    "id": "801921d3.c16518",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5737.883087158203,
-    "y": 6803.883331298828,
-    "z": "7062000.f761",
+    "x": 5655.566421508789,
+    "y": 6809.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "19dd27ef.ab039"
+        "a260b342.bdfc38"
       ]
     ]
   },
   {
-    "id": "19dd27ef.ab039",
+    "id": "a260b342.bdfc38",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5946.883087158203,
-    "y": 6801.883331298828,
-    "z": "7062000.f761",
+    "x": 5864.566421508789,
+    "y": 6807.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f8b3148.1a90a68",
+    "id": "fa9aa1ff.8bf6e",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4847.883087158203,
-    "y": 6789.883331298828,
-    "z": "7062000.f761",
+    "x": 4765.566421508789,
+    "y": 6795.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2add06b4.24634a"
+        "b1c30fd3.1d3b28"
       ]
     ]
   },
   {
-    "id": "df3932b1.5cfd1",
+    "id": "b8ff0583.7b229",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4855.883087158203,
-    "y": 6682.883331298828,
-    "z": "7062000.f761",
+    "x": 4773.566421508789,
+    "y": 6688.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6d632da3.ca2994",
-        "65bd7037.bc9ea",
-        "29b67365.cad774"
+        "be4d0129.981f9",
+        "ca7acc4e.a2f178",
+        "e6834a18.c1bb18"
       ]
     ]
   },
   {
-    "id": "6d632da3.ca2994",
+    "id": "be4d0129.981f9",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5091.883087158203,
-    "y": 6665.883331298828,
-    "z": "7062000.f761",
+    "x": 5009.566421508789,
+    "y": 6671.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "65bd7037.bc9ea",
+    "id": "ca7acc4e.a2f178",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5088.883087158203,
-    "y": 6706.883331298828,
-    "z": "7062000.f761",
+    "x": 5006.566421508789,
+    "y": 6712.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "29b67365.cad774",
+    "id": "e6834a18.c1bb18",
     "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": 5020.566421508789,
+    "y": 6752.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "dd853f0d.c675b",
+    "id": "35f40d66.777f92",
     "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": 4709.566421508789,
+    "y": 6847.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6a2f520.9e626b",
+    "id": "4c2ed97e.80e7a8",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4799.883087158203,
-    "y": 6899.883331298828,
-    "z": "7062000.f761",
+    "x": 4717.566421508789,
+    "y": 6905.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b152a028.0e0e48",
+    "id": "4aae1198.db26d8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4804.883087158203,
-    "y": 6639.883331298828,
-    "z": "7062000.f761",
+    "x": 4722.566421508789,
+    "y": 6645.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3d7b7763.09cfd",
+    "id": "3d77fed3.ca6eba",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4919.883087158203,
-    "y": 6591.883331298828,
-    "z": "7062000.f761",
+    "x": 4837.566421508789,
+    "y": 6597.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a21574dc.7f1048",
+    "id": "a6487ee6.2cb7c",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5092.883087158203,
-    "y": 7436.883331298828,
-    "z": "7062000.f761",
+    "x": 4830.566635131836,
+    "y": 7313.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b03df3ba.8ce8d8",
-        "c15c4a9f.54e778"
+        "ae63bb37.54dac",
+        "b4511f5d.149aa8"
       ]
     ]
   },
   {
-    "id": "b03df3ba.8ce8d8",
+    "id": "ae63bb37.54dac",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5321.883087158203,
-    "y": 7413.883331298828,
-    "z": "7062000.f761",
+    "x": 5086.566635131836,
+    "y": 7285.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b68c7fcf.24567"
+        "81398bf4.473028"
       ]
     ]
   },
   {
-    "id": "c15c4a9f.54e778",
+    "id": "b4511f5d.149aa8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5321.883087158203,
-    "y": 7462.883331298828,
-    "z": "7062000.f761",
+    "x": 5086.566635131836,
+    "y": 7334.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "b68c7fcf.24567",
+    "id": "7de65a32.2588c4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5482.883087158203,
-    "y": 7418.883331298828,
-    "z": "7062000.f761",
+    "x": 5352.566635131836,
+    "y": 7326.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "57615513.3c37ac",
-        "da2d189.a0c85e8",
-        "aa5be19c.b28bd"
+        "f817cc8b.d031a",
+        "380ab70.5227a4a",
+        "c6c09e71.9092c"
       ]
     ]
   },
   {
-    "id": "41927c2c.53b90c",
+    "id": "1d61af20.5c7829",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 5826.883087158203,
-    "y": 7398.883331298828,
-    "z": "7062000.f761",
+    "x": 5744.566421508789,
+    "y": 7404.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "aa5be19c.b28bd",
+    "id": "c6c09e71.9092c",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\n\n<parameter name='operational-status' value='Modified' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5796.883087158203,
-    "y": 7458.883331298828,
-    "z": "7062000.f761",
+    "x": 5714.566421508789,
+    "y": 7464.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "57615513.3c37ac",
+    "id": "f817cc8b.d031a",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5703.883087158203,
-    "y": 7286.883331298828,
-    "z": "7062000.f761",
+    "x": 5621.566421508789,
+    "y": 7292.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7f678eb1.f9d898",
+    "id": "eab327e7.a5f748",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4053.883331298828,
-    "y": 5924.883331298828,
-    "z": "7062000.f761",
+    "x": 3971.566665649414,
+    "y": 5930.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "78bf173f.567498",
-        "7299a42e.833c84",
-        "14b14bf.2fcb6b4",
-        "787fc902.6b8688",
-        "4505fb5a.3099fc"
+        "afc7e373.9dd788",
+        "3d0b458a.f9a2a2",
+        "a3e7b437.8026b",
+        "2ab2c1b2.c4462e",
+        "47c00ee.a0fdbf"
       ]
     ]
   },
   {
-    "id": "950e3220.8c6648",
+    "id": "b8d2a9f2.b00c88",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4796.883087158203,
-    "y": 6739.883331298828,
-    "z": "7062000.f761",
+    "x": 4714.566421508789,
+    "y": 6745.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "506cbb81.2befbc",
+    "id": "c8446998.29dfe",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4919.883331298828,
-    "y": 6469.883331298828,
-    "z": "7062000.f761",
+    "x": 4837.566665649414,
+    "y": 6475.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce6bcae6.279bf",
+    "id": "13d35835.cdbb2",
     "type": "comment",
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "comments": "",
-    "x": 5056.883331298828,
-    "y": 6419.883331298828,
-    "z": "7062000.f761",
+    "x": 4974.566665649414,
+    "y": 6425.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3b830a4d.e803be",
+    "id": "997f20e4.966598",
     "type": "save",
     "name": "save ROOT UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6864.883331298828,
-    "y": 3595.883331298828,
-    "z": "7062000.f761",
+    "x": 6436.566665649414,
+    "y": 1959.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "debea5ca.c5efb8",
+    "id": "5c8518bd.0a436",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 4070.883331298828,
-    "y": 1820.8833312988281,
-    "z": "7062000.f761",
+    "x": 3702.566665649414,
+    "y": 1353.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "dcf5d1.89c23a3",
+    "id": "53a463ea.1b0834",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 4048.883331298828,
-    "y": 2690.883331298828,
-    "z": "7062000.f761",
+    "x": 3840.566665649414,
+    "y": 1841.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3dc14de7.91d75a",
+    "id": "53592f4d.08ea8",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 6855.883331298828,
-    "y": 4062.883331298828,
-    "z": "7062000.f761",
+    "x": 6397.566665649414,
+    "y": 2671.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2530e84c.0abb78",
-    "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",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "fb71ca0a.fe8928",
+    "id": "f18404c6.f7135",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 3771.883331298828,
-    "y": 4941.883331298828,
-    "z": "7062000.f761",
+    "x": 3689.566665649414,
+    "y": 4947.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c01640bb.f526e8",
+    "id": "e65dde18.8f2e28",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3904.883331298828,
-    "y": 4989.883331298828,
-    "z": "7062000.f761",
+    "x": 3822.566665649414,
+    "y": 4995.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "bb9baf34.d0edd",
+    "id": "d070f297.71c91",
     "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": 4367.566421508789,
+    "y": 5075.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9b70cfc4.c55e3",
-        "fdbb8f8a.783248"
+        "dbaff1f0.67394",
+        "46c5a5e9.bca6a4"
       ]
     ]
   },
   {
-    "id": "9b70cfc4.c55e3",
+    "id": "dbaff1f0.67394",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4642.883087158203,
-    "y": 5070.883331298828,
-    "z": "7062000.f761",
+    "x": 4560.566421508789,
+    "y": 5076.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c1e58440.70184"
+        "df79a6f0.9fe378"
       ]
     ]
   },
   {
-    "id": "fdbb8f8a.783248",
+    "id": "46c5a5e9.bca6a4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4646.883087158203,
-    "y": 5114.883331298828,
-    "z": "7062000.f761",
+    "x": 4564.566421508789,
+    "y": 5120.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "75c1affe.0ddba8"
+        "6414d7e3.ee4fd8"
       ]
     ]
   },
   {
-    "id": "75c1affe.0ddba8",
+    "id": "6414d7e3.ee4fd8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4785.883087158203,
-    "y": 5109.883331298828,
-    "z": "7062000.f761",
+    "x": 4703.566421508789,
+    "y": 5115.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4c2b44d5.f7301c",
-        "6ccb98db.74d4e8",
-        "d416487a.185998"
+        "49c135f9.c35534",
+        "bf0f6300.a67238",
+        "fa0dda8.0253328"
       ]
     ]
   },
   {
-    "id": "c1e58440.70184",
+    "id": "df79a6f0.9fe378",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4785.883087158203,
-    "y": 5066.883331298828,
-    "z": "7062000.f761",
+    "x": 4703.566421508789,
+    "y": 5072.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5bab7896.e13d9",
-        "ec708b2b.d3c6e",
-        "dea6b450.126ae",
-        "10f1aa00.faee3e"
+        "d6b231ff.4e48",
+        "e479d260.5097c",
+        "c8a578a.1c83e08",
+        "b408049f.7933a"
       ]
     ]
   },
   {
-    "id": "4c2b44d5.f7301c",
+    "id": "49c135f9.c35534",
     "type": "set",
     "name": "set prop.connectivity-domainA-uuid",
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5179.883087158203,
-    "y": 5360.883331298828,
-    "z": "7062000.f761",
+    "x": 5097.566421508789,
+    "y": 5366.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "eb20f196.54125",
+    "id": "f2d57861.b7d18",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5186.883087158203,
-    "y": 5314.883331298828,
-    "z": "7062000.f761",
+    "x": 5104.566421508789,
+    "y": 5320.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e29af13.61a371",
+    "id": "a215a7d6.657bc8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4984.883087158203,
-    "y": 7064.883331298828,
-    "z": "7062000.f761",
+    "x": 4894.566635131836,
+    "y": 7035.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "6ccb98db.74d4e8",
+    "id": "bf0f6300.a67238",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5298.883087158203,
-    "y": 5413.883331298828,
-    "z": "7062000.f761",
+    "x": 5216.566421508789,
+    "y": 5419.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "e719db8e.3b76c8",
+    "id": "b27ea187.400a38",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5180.883087158203,
-    "y": 5631.883331298828,
-    "z": "7062000.f761",
+    "x": 5098.566421508789,
+    "y": 5637.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "d1afb38c.0141a8",
+    "id": "737e14df.0bf7ac",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3735.883331298828,
-    "y": 4539.883331298828,
-    "z": "7062000.f761",
+    "x": 3644.566665649414,
+    "y": 4396.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "42d36cb1.4fa424",
+    "id": "fe6ea6fb.83ee2",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4069.883331298828,
-    "y": 4722.883331298828,
-    "z": "7062000.f761",
+    "x": 3978.566665649414,
+    "y": 4579.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "298d7f45.2553b",
+    "id": "1e648504.a919f3",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3681.883331298828,
-    "y": 4589.883331298828,
-    "z": "7062000.f761",
+    "x": 3590.566665649414,
+    "y": 4446.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9ef5d43.2b0bca8",
-        "3ef07e30.e6e7da",
-        "f6dffd82.1f8af"
+        "dc9ef631.89f33",
+        "9e45960a.d8b928",
+        "febbc6eb.2448e"
       ]
     ]
   },
   {
-    "id": "3ef07e30.e6e7da",
+    "id": "9e45960a.d8b928",
     "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": 3818.057632446289,
+    "y": 4418.65966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "afd7cfee.d60a88"
+        "5d25632c.1d5374"
       ]
     ]
   },
   {
-    "id": "f6dffd82.1f8af",
+    "id": "febbc6eb.2448e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3904.883331298828,
-    "y": 4606.883270263672,
-    "z": "7062000.f761",
+    "x": 3813.566665649414,
+    "y": 4463.085632324219,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "718ca986.9a7a48"
+        "e99a952e.00d7c"
       ]
     ]
   },
   {
-    "id": "afd7cfee.d60a88",
+    "id": "5d25632c.1d5374",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4071.945831298828,
-    "y": 4561.743011474609,
-    "z": "7062000.f761",
+    "x": 3980.629165649414,
+    "y": 4417.945373535156,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "718ca986.9a7a48",
+    "id": "e99a952e.00d7c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4072.883331298828,
-    "y": 4606.883270263672,
-    "z": "7062000.f761",
+    "x": 3981.566665649414,
+    "y": 4463.085632324219,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bbe16e71.3e09e8",
+    "id": "1d77f10f.5baf67",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3857.883331298828,
-    "y": 4679.883331298828,
-    "z": "7062000.f761",
+    "x": 3766.566665649414,
+    "y": 4536.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "2abf34d.6a0b3cc",
-        "42d36cb1.4fa424"
+        "35c9f98a.610e5e",
+        "fe6ea6fb.83ee2"
       ]
     ]
   },
   {
-    "id": "9ef5d43.2b0bca8",
+    "id": "dc9ef631.89f33",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3688.883331298828,
-    "y": 4679.883331298828,
-    "z": "7062000.f761",
+    "x": 3597.566665649414,
+    "y": 4536.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bbe16e71.3e09e8"
+        "1d77f10f.5baf67"
       ]
     ]
   },
   {
-    "id": "2abf34d.6a0b3cc",
+    "id": "35c9f98a.610e5e",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4046.883331298828,
-    "y": 4671.883331298828,
-    "z": "7062000.f761",
+    "x": 3955.566665649414,
+    "y": 4528.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "4ebb86dc.a0713",
+    "id": "518cc181.03ac48",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $middle-man-conn.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$middle-man-conn.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3879.883331298828,
-    "y": 4817.883331298828,
-    "z": "7062000.f761",
+    "x": 3797.566665649414,
+    "y": 4823.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "e230ac3e.9cb188",
+    "id": "5a5e18e8.ffce08",
     "type": "comment",
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",
     "info": "",
     "comments": "",
-    "x": 3662.883331298828,
-    "y": 2900.883331298828,
-    "z": "7062000.f761",
+    "x": 3580.566665649414,
+    "y": 2906.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3d29417.d2eee3e",
+    "id": "47f11a92.b8ee4c",
     "type": "comment",
     "name": "We are doing modify and middle man exists, check if LEAF UNI already exists in AAI or not. If yes, consider the possible bw change. If it does not, then it is a new link needs to be added",
     "info": "",
     "comments": "",
-    "x": 3517.883331298828,
-    "y": 4467.883331298828,
-    "z": "7062000.f761",
+    "x": 2785.566665649414,
+    "y": 4468.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "c01a7bbf.331a48",
+    "id": "a9808de.46ae97",
     "type": "exists",
     "name": "exists LEAF UNI",
     "xml": "<exists plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3290.883331298828,
-    "y": 4735.883331298828,
-    "z": "7062000.f761",
+    "x": 3208.566665649414,
+    "y": 4741.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "19c2896c.95fdb7",
-        "cde01ebb.100c6"
+        "8236161f.361ec",
+        "f42c8ef.5dab47"
       ]
     ]
   },
   {
-    "id": "adcb6448.ea7478",
+    "id": "89fb91c7.4bd6f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3122.883331298828,
-    "y": 4738.883331298828,
-    "z": "7062000.f761",
+    "x": 3040.566665649414,
+    "y": 4744.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c01a7bbf.331a48"
+        "a9808de.46ae97"
       ]
     ]
   },
   {
-    "id": "cde01ebb.100c6",
+    "id": "f42c8ef.5dab47",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3453.883331298828,
-    "y": 4754.883331298828,
-    "z": "7062000.f761",
+    "x": 3371.566665649414,
+    "y": 4760.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "68da37f9.05cc18"
+        "10e6ecec.11b933"
       ]
     ]
   },
   {
-    "id": "19c2896c.95fdb7",
+    "id": "8236161f.361ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3489.883331298828,
-    "y": 3361.883331298828,
-    "z": "7062000.f761",
+    "x": 3407.566665649414,
+    "y": 3367.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b19d09a1.5b2a5"
+        "ac1b2d90.391b98"
       ]
     ]
   },
   {
-    "id": "e9cce0c6.04cdf8",
+    "id": "f9e3f20c.6b5eb8",
     "type": "switchNode",
     "name": "switch leafuni.data-source == gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3805.883331298828,
-    "y": 3413.883331298828,
-    "z": "7062000.f761",
+    "x": 3756.566665649414,
+    "y": 3209.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "24dd4d51.dc7852",
-        "a81116be.6c3738"
+        "872bd81a.d26528",
+        "9b2249c8.bc9018"
       ]
     ]
   },
   {
-    "id": "24dd4d51.dc7852",
+    "id": "872bd81a.d26528",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4010.883331298828,
-    "y": 3409.883331298828,
-    "z": "7062000.f761",
+    "x": 3961.566665649414,
+    "y": 3205.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a81116be.6c3738",
+    "id": "9b2249c8.bc9018",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4012.883331298828,
-    "y": 3459.883331298828,
-    "z": "7062000.f761",
+    "x": 3963.566665649414,
+    "y": 3255.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "29997430.010c94"
+        "dff51b02.8733d8"
       ]
     ]
   },
   {
-    "id": "29997430.010c94",
+    "id": "dff51b02.8733d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4168.883331298828,
-    "y": 3465.883331298828,
-    "z": "7062000.f761",
+    "x": 4119.566665649414,
+    "y": 3261.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f4475341.93d378",
-        "4264dea0.b43bb8",
-        "5f09d2da.19bfa4",
-        "c71fd59.dfc0428"
+        "5f4129be.00541",
+        "7f1b37a2.172688",
+        "71ab4f0e.2a007",
+        "8aeeffc.718ae8"
       ]
     ]
   },
   {
-    "id": "f4475341.93d378",
+    "id": "5f4129be.00541",
     "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": 4345.566909790039,
+    "y": 3002.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5f1f0cb4.e46a84",
+    "id": "d8ea64.968cf5a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4926.883056640625,
-    "y": 4293.88330078125,
-    "z": "7062000.f761",
+    "x": 4844.566390991211,
+    "y": 4299.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "293be2f2.0d66a6",
-        "898be63d.63497"
+        "140b25e4.abc76a",
+        "c4a242e7.6ad35"
       ]
     ]
   },
   {
-    "id": "898be63d.63497",
+    "id": "c4a242e7.6ad35",
     "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": 5046.566146850586,
+    "y": 4266.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "853d7a8b.2e02f",
+    "id": "f3c554f9.aa8de8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4812.88330078125,
-    "y": 4470.883056640625,
-    "z": "7062000.f761",
+    "x": 4730.566635131836,
+    "y": 4476.085418701172,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1915e47b.7ebf64",
+    "id": "a2deddc2.51b4b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4809.9454345703125,
-    "y": 4419.743072509766,
-    "z": "7062000.f761",
+    "x": 4727.628768920898,
+    "y": 4424.9454345703125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "caf66330.b1b298",
+    "id": "2a1af9c0.1651de",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4392.883056640625,
-    "y": 4293.88330078125,
-    "z": "7062000.f761",
+    "x": 4310.566390991211,
+    "y": 4299.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ee97b865.b6783"
+        "6645febe.81a0d"
       ]
     ]
   },
   {
-    "id": "ee97b865.b6783",
+    "id": "6645febe.81a0d",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4597.883056640625,
-    "y": 4293.88330078125,
-    "z": "7062000.f761",
+    "x": 4515.566390991211,
+    "y": 4299.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c8ca8353.4e5678"
+        "1ad63798.bccb8"
       ]
     ]
   },
   {
-    "id": "c8ca8353.4e5678",
+    "id": "1ad63798.bccb8",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4763.883056640625,
-    "y": 4293.88330078125,
-    "z": "7062000.f761",
+    "x": 4681.566390991211,
+    "y": 4299.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5f1f0cb4.e46a84"
+        "d8ea64.968cf5a"
       ]
     ]
   },
   {
-    "id": "293be2f2.0d66a6",
+    "id": "140b25e4.abc76a",
     "type": "save",
     "name": "get vpn-binding from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4435.883056640625,
-    "y": 4371.88330078125,
-    "z": "7062000.f761",
+    "x": 4353.566390991211,
+    "y": 4377.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "82c1720.e28a61",
-        "745eb7b1.5e824",
-        "fa83b701.248a2"
+        "d5aa2b23.abf14",
+        "b25d8065.0eeb5",
+        "2e5be567.2683ca"
       ]
     ]
   },
   {
-    "id": "82c1720.e28a61",
+    "id": "d5aa2b23.abf14",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4646.883056640625,
-    "y": 4373.88330078125,
-    "z": "7062000.f761",
+    "x": 4564.566390991211,
+    "y": 4379.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "74de082.69b8bf8"
+        "dbaf0410.536798"
       ]
     ]
   },
   {
-    "id": "745eb7b1.5e824",
+    "id": "b25d8065.0eeb5",
     "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": 4565.057357788086,
+    "y": 4424.659698486328,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1915e47b.7ebf64"
+        "a2deddc2.51b4b8"
       ]
     ]
   },
   {
-    "id": "fa83b701.248a2",
+    "id": "2e5be567.2683ca",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4644.883056640625,
-    "y": 4462.88330078125,
-    "z": "7062000.f761",
+    "x": 4562.566390991211,
+    "y": 4468.085662841797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "853d7a8b.2e02f"
+        "f3c554f9.aa8de8"
       ]
     ]
   },
   {
-    "id": "b19d09a1.5b2a5",
+    "id": "ac1b2d90.391b98",
     "type": "save",
     "name": "get LEAF uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.LEAF.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.leafuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3679.883331298828,
-    "y": 3256.883331298828,
-    "z": "7062000.f761",
+    "x": 3630.566665649414,
+    "y": 3052.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9b46823e.72756",
-        "35aaafce.bf5cc8",
-        "d1f12cfb.14a2c8"
+        "518020a8.e5908",
+        "2f37bf62.6d766",
+        "1d68f74a.0ce429"
       ]
     ]
   },
   {
-    "id": "35aaafce.bf5cc8",
+    "id": "2f37bf62.6d766",
     "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": 3858.057632446289,
+    "y": 3024.65966796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c379ee48.9a04a"
+        "a23311e6.197e98"
       ]
     ]
   },
   {
-    "id": "d1f12cfb.14a2c8",
+    "id": "1d68f74a.0ce429",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3902.883331298828,
-    "y": 3273.883270263672,
-    "z": "7062000.f761",
+    "x": 3853.566665649414,
+    "y": 3069.0856323242188,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7e073ce5.e1fbec"
+        "1f7edc05.06419c"
       ]
     ]
   },
   {
-    "id": "c379ee48.9a04a",
+    "id": "a23311e6.197e98",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4069.945831298828,
-    "y": 3228.7430114746094,
-    "z": "7062000.f761",
+    "x": 4020.629165649414,
+    "y": 3023.9453735351562,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7e073ce5.e1fbec",
+    "id": "1f7edc05.06419c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4070.883331298828,
-    "y": 3273.883270263672,
-    "z": "7062000.f761",
+    "x": 4021.566665649414,
+    "y": 3069.0856323242188,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9b46823e.72756",
+    "id": "518020a8.e5908",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3914.883331298828,
-    "y": 3323.883331298828,
-    "z": "7062000.f761",
+    "x": 3865.566665649414,
+    "y": 3119.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e9cce0c6.04cdf8"
+        "f9e3f20c.6b5eb8"
       ]
     ]
   },
   {
-    "id": "715dcd2e.3d9a6c",
+    "id": "3597d7fb.9d9fd",
     "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": 3755.449996948242,
+    "y": 3309.969024658203,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "b78f20d3.5b466",
+    "id": "8b55165.21410e8",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 3819.483428955078,
-    "y": 3866.566680908203,
-    "z": "7062000.f761",
+    "x": 3737.166763305664,
+    "y": 3871.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9e72dea1.067a48",
+    "id": "d35d1b04.286b5",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3957.483428955078,
-    "y": 3924.566680908203,
-    "z": "7062000.f761",
+    "x": 3875.166763305664,
+    "y": 3929.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4264dea0.b43bb8",
+    "id": "7f1b37a2.172688",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3535.483428955078,
-    "y": 3605.966583251953,
-    "z": "7062000.f761",
+    "x": 3453.166763305664,
+    "y": 3611.1689453125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ea9a5f5d.8f9bf8",
-        "1c248a70.8f6db6",
-        "1f0e75d7.8b5a2a"
+        "2d37a713.1c4278",
+        "c7b27212.2f5b88",
+        "aaa5f9ec.d9ed6"
       ]
     ]
   },
   {
-    "id": "d32411c9.b56a18",
+    "id": "26c98beb.9e8714",
     "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": 3694.166763305664,
+    "y": 4039.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e283eb67.9ec4b",
-        "f5e18bc8.e6b668"
+        "757df358.1ab404",
+        "46ca33dc.1a72ec"
       ]
     ]
   },
   {
-    "id": "e283eb67.9ec4b",
+    "id": "757df358.1ab404",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3969.483428955078,
-    "y": 4035.366729736328,
-    "z": "7062000.f761",
+    "x": 3887.166763305664,
+    "y": 4040.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ead422bf.e71108"
+        "43e4ef70.2c83f"
       ]
     ]
   },
   {
-    "id": "f5e18bc8.e6b668",
+    "id": "46ca33dc.1a72ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3973.483428955078,
-    "y": 4079.366729736328,
-    "z": "7062000.f761",
+    "x": 3891.166763305664,
+    "y": 4084.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c6dc9f70.44622"
+        "7ecc7e99.a8f718"
       ]
     ]
   },
   {
-    "id": "c6dc9f70.44622",
+    "id": "7ecc7e99.a8f718",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4112.483428955078,
-    "y": 4074.366729736328,
-    "z": "7062000.f761",
+    "x": 4030.166763305664,
+    "y": 4079.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "caf66330.b1b298"
+        "2a1af9c0.1651de"
       ]
     ]
   },
   {
-    "id": "ead422bf.e71108",
+    "id": "43e4ef70.2c83f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",
     "comments": "",
-    "x": 4113.483428955078,
-    "y": 4031.566680908203,
-    "z": "7062000.f761",
+    "x": 4031.166763305664,
+    "y": 4036.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5f09d2da.19bfa4",
+    "id": "71ab4f0e.2a007",
     "type": "switchNode",
     "name": "switch leafuni.data-source > gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4428.600372314453,
-    "y": 3463.166778564453,
-    "z": "7062000.f761",
+    "x": 4379.283706665039,
+    "y": 3258.369140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d442302c.ca32e",
-        "7bb1b9a.4551dc8"
+        "e5e20266.b6ad18",
+        "fa7ec0d3.484e4"
       ]
     ]
   },
   {
-    "id": "d442302c.ca32e",
+    "id": "e5e20266.b6ad18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4627.767364501953,
-    "y": 3529.766632080078,
-    "z": "7062000.f761",
+    "x": 4578.450698852539,
+    "y": 3324.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7e28b551.d4ae3c"
+        "c400bc3c.ac5968"
       ]
     ]
   },
   {
-    "id": "7bb1b9a.4551dc8",
+    "id": "fa7ec0d3.484e4",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4649.767364501953,
-    "y": 3374.766632080078,
-    "z": "7062000.f761",
+    "x": 4600.450698852539,
+    "y": 3169.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ff62768e.03d4d"
+        "f79a9470.53a4c8"
       ]
     ]
   },
   {
-    "id": "c71fd59.dfc0428",
+    "id": "8aeeffc.718ae8",
     "type": "save",
     "name": "update LEAF UNI in AAI",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4427.600372314453,
-    "y": 3318.366729736328,
-    "z": "7062000.f761",
+    "x": 4378.283706665039,
+    "y": 3113.569091796875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "5004b561.86b324",
+    "id": "b6c5ddb8.eb856",
     "type": "comment",
     "name": "update LEAF UNI with the new bw",
     "info": "",
     "comments": "",
-    "x": 4443.767364501953,
-    "y": 3271.766632080078,
-    "z": "7062000.f761",
+    "x": 4394.450698852539,
+    "y": 3066.968994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3679700e.bfb9b8",
+    "id": "ab07d3e7.b0f788",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5112.533966064453,
-    "y": 3248.766632080078,
-    "z": "7062000.f761",
+    "x": 4949.216567993164,
+    "y": 2521.968994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "180c72db.e0ca25",
+    "id": "6a6aa672.a79588",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5714.533966064453,
-    "y": 3353.766632080078,
-    "z": "7062000.f761",
+    "x": 5551.216567993164,
+    "y": 2626.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "eaf2956b.f5da68",
+    "id": "cbbe95bb.3b672",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5104.533721923828,
-    "y": 3294.766632080078,
-    "z": "7062000.f761",
+    "x": 4941.216323852539,
+    "y": 2567.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "94b5c3f.97615c",
-        "5f9fd4c2.f09244",
-        "be126d8d.81e41"
+        "29f0d39b.7868dc",
+        "a9cdc9f3.565c48",
+        "bb4a2538.1336f8"
       ]
     ]
   },
   {
-    "id": "5f9fd4c2.f09244",
+    "id": "a9cdc9f3.565c48",
     "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": 5168.707290649414,
+    "y": 2540.54296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7b864f73.0d50b8"
+        "1908939b.bd4034"
       ]
     ]
   },
   {
-    "id": "be126d8d.81e41",
+    "id": "bb4a2538.1336f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5327.533721923828,
-    "y": 3311.766571044922,
-    "z": "7062000.f761",
+    "x": 5164.216323852539,
+    "y": 2584.9689331054688,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "20abe4f.26a359c"
+        "92667393.c53a48"
       ]
     ]
   },
   {
-    "id": "7b864f73.0d50b8",
+    "id": "1908939b.bd4034",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5494.596221923828,
-    "y": 3266.6263122558594,
-    "z": "7062000.f761",
+    "x": 5331.278823852539,
+    "y": 2539.8286743164062,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "20abe4f.26a359c",
+    "id": "92667393.c53a48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5495.533721923828,
-    "y": 3311.766571044922,
-    "z": "7062000.f761",
+    "x": 5332.216323852539,
+    "y": 2584.9689331054688,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "cd6b80d0.dac0d8",
+    "id": "881aa049.c716c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5492.533721923828,
-    "y": 3361.766632080078,
-    "z": "7062000.f761",
+    "x": 5329.216323852539,
+    "y": 2634.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c08f6988.b1e668",
-        "180c72db.e0ca25"
+        "462dc669.256da8",
+        "6a6aa672.a79588"
       ]
     ]
   },
   {
-    "id": "94b5c3f.97615c",
+    "id": "29f0d39b.7868dc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5323.533721923828,
-    "y": 3361.766632080078,
-    "z": "7062000.f761",
+    "x": 5160.216323852539,
+    "y": 2634.968994140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cd6b80d0.dac0d8"
+        "881aa049.c716c"
       ]
     ]
   },
   {
-    "id": "c08f6988.b1e668",
+    "id": "462dc669.256da8",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",
     "comments": "",
-    "x": 5674.534454345703,
-    "y": 3303.766632080078,
-    "z": "7062000.f761",
+    "x": 5511.217056274414,
+    "y": 2576.968994140625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "96b13181.04b1f8",
+    "id": "cf90a66f.fda158",
     "type": "comment",
     "name": "bw+ has increased ",
     "info": "",
     "comments": "",
-    "x": 4641.766662597656,
-    "y": 3336.7666625976562,
-    "z": "7062000.f761",
+    "x": 4592.449996948242,
+    "y": 3131.969024658203,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a39bd08a.5e567",
+    "id": "55a0d7dc.286418",
     "type": "comment",
     "name": "bw- has decreased",
     "info": "",
     "comments": "",
-    "x": 4640.600372314453,
-    "y": 3493.566680908203,
-    "z": "7062000.f761",
+    "x": 4591.283706665039,
+    "y": 3288.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "ca05c492.e4ea9",
+    "id": "4d5920d6.13a668",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5089.600372314453,
-    "y": 3451.566680908203,
-    "z": "7062000.f761",
+    "x": 5040.282974243164,
+    "y": 2861.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6af65c6b.88b2a4",
+    "id": "88d6c65c.cf7f08",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5691.600372314453,
-    "y": 3556.566680908203,
-    "z": "7062000.f761",
+    "x": 5642.282974243164,
+    "y": 2966.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "e7dc732b.754658",
+    "id": "d0b2cf41.bca298",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5081.600128173828,
-    "y": 3497.566680908203,
-    "z": "7062000.f761",
+    "x": 5032.282730102539,
+    "y": 2907.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5192fc04.bc79ac",
-        "9675a219.e39ec8",
-        "491e7a3e.fd6efc"
+        "8d492b8.9c23958",
+        "7af8c9ac.4fdff",
+        "8f5e4c1.c47c63"
       ]
     ]
   },
   {
-    "id": "9675a219.e39ec8",
+    "id": "7af8c9ac.4fdff",
     "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": 5259.773696899414,
+    "y": 2880.343017578125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "9eb1719c.df987"
+        "a556ac9c.f99378"
       ]
     ]
   },
   {
-    "id": "491e7a3e.fd6efc",
+    "id": "8f5e4c1.c47c63",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5304.600128173828,
-    "y": 3514.566619873047,
-    "z": "7062000.f761",
+    "x": 5255.282730102539,
+    "y": 2924.7689819335938,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "73d5ba80.efe18c"
+        "fb5f5c18.d85868"
       ]
     ]
   },
   {
-    "id": "9eb1719c.df987",
+    "id": "a556ac9c.f99378",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5471.662628173828,
-    "y": 3469.4263610839844,
-    "z": "7062000.f761",
+    "x": 5422.345230102539,
+    "y": 2879.6287231445312,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "73d5ba80.efe18c",
+    "id": "fb5f5c18.d85868",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5472.600128173828,
-    "y": 3514.566619873047,
-    "z": "7062000.f761",
+    "x": 5423.282730102539,
+    "y": 2924.7689819335938,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "49e14e2.90e413",
+    "id": "1055bce3.28f203",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5469.600128173828,
-    "y": 3564.566680908203,
-    "z": "7062000.f761",
+    "x": 5420.282730102539,
+    "y": 2974.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fc162869.747088",
-        "6af65c6b.88b2a4"
+        "67fafdaf.ff6be4",
+        "88d6c65c.cf7f08"
       ]
     ]
   },
   {
-    "id": "5192fc04.bc79ac",
+    "id": "8d492b8.9c23958",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5300.600128173828,
-    "y": 3564.566680908203,
-    "z": "7062000.f761",
+    "x": 5251.282730102539,
+    "y": 2974.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "49e14e2.90e413"
+        "1055bce3.28f203"
       ]
     ]
   },
   {
-    "id": "fc162869.747088",
+    "id": "67fafdaf.ff6be4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",
     "comments": "",
-    "x": 5651.600860595703,
-    "y": 3506.566680908203,
-    "z": "7062000.f761",
+    "x": 5602.283462524414,
+    "y": 2916.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "af7611a6.c24d8",
+    "id": "16d60a9.8d32af5",
     "type": "set",
     "name": "set delta",
     "xml": "<set>\n<parameter name='tmp.delta' value='`$tmp.aai.leafuni.data-source - $gfp`' />\n<parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.isBwIncreased' value='false' />\n\n\n",
     "comments": "",
-    "x": 5006.600128173828,
-    "y": 3410.566680908203,
-    "z": "7062000.f761",
+    "x": 4957.282730102539,
+    "y": 2820.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "7e28b551.d4ae3c",
+    "id": "c400bc3c.ac5968",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4799.766662597656,
-    "y": 3518.7666625976562,
-    "z": "7062000.f761",
+    "x": 4750.449996948242,
+    "y": 3313.969024658203,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "af7611a6.c24d8",
-        "e7dc732b.754658"
+        "16d60a9.8d32af5",
+        "d0b2cf41.bca298",
+        "8414e4a1.38b9c8"
       ]
     ]
   },
   {
-    "id": "ff62768e.03d4d",
+    "id": "f79a9470.53a4c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4820.500030517578,
-    "y": 3345.566680908203,
-    "z": "7062000.f761",
+    "x": 4771.183364868164,
+    "y": 3140.76904296875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d835bd5d.93ef8",
-        "eaf2956b.f5da68"
+        "117ea4ef.18b79b",
+        "cbbe95bb.3b672",
+        "ba199ac4.fb848"
       ]
     ]
   },
   {
-    "id": "d835bd5d.93ef8",
+    "id": "117ea4ef.18b79b",
     "type": "set",
     "name": "set delta",
     "xml": "<set>\n<parameter name='tmp.delta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.isBwIncreased' value='true' />\n",
     "comments": "",
-    "x": 5019.333526611328,
-    "y": 3163.366729736328,
-    "z": "7062000.f761",
+    "x": 4906.016128540039,
+    "y": 2446.569091796875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "2025b954.4fbac6",
+    "id": "c54ad09e.8bf3a",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4414.649932861328,
-    "y": 3418.566680908203,
-    "z": "7062000.f761",
+    "x": 4365.333267211914,
+    "y": 3213.76904296875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "976feb0e.893a98",
+    "id": "2dd0c0ce.4b6dd8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3916.9833984375,
-    "y": 4197.3671875,
-    "z": "7062000.f761",
+    "x": 3834.666732788086,
+    "y": 4202.569549560547,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "a99b9bcd.cfe81",
+    "id": "f75e3970.5d2918",
     "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": 3669.666732788086,
+    "y": 4274.769500732422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "98f48307.654f08",
-        "d531b9e1.8374e"
+        "6558c3a1.aee6ec",
+        "615d888.e8de878"
       ]
     ]
   },
   {
-    "id": "98f48307.654f08",
+    "id": "6558c3a1.aee6ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3962.9833984375,
-    "y": 4269.567138671875,
-    "z": "7062000.f761",
+    "x": 3880.666732788086,
+    "y": 4274.769500732422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c74f3bbd.636d88"
+        "dbe2bb07.4ff"
       ]
     ]
   },
   {
-    "id": "d531b9e1.8374e",
+    "id": "615d888.e8de878",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3958.9833984375,
-    "y": 4317.567138671875,
-    "z": "7062000.f761",
+    "x": 3876.666732788086,
+    "y": 4322.769500732422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7e7563eb.7c66dc"
+        "981910a2.c0ad4"
       ]
     ]
   },
   {
-    "id": "c74f3bbd.636d88",
+    "id": "dbe2bb07.4ff",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4118.9833984375,
-    "y": 4265.567138671875,
-    "z": "7062000.f761",
+    "x": 4036.666732788086,
+    "y": 4270.769500732422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "6a777147.b443f8"
+        "d5500d79.08788"
       ]
     ]
   },
   {
-    "id": "7e7563eb.7c66dc",
+    "id": "981910a2.c0ad4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found but it should have been!' />\n",
     "comments": "",
-    "x": 4106.9833984375,
-    "y": 4312.567138671875,
-    "z": "7062000.f761",
+    "x": 4024.666732788086,
+    "y": 4317.769500732422,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d69512d3.73027",
+    "id": "3bc11366.fbbc34",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4959.949493408203,
-    "y": 4579.765899658203,
-    "z": "7062000.f761",
+    "x": 4877.632827758789,
+    "y": 4584.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "cae5635c.9a1e2",
-        "6f0b5fb4.a1fb4"
+        "dd06399c.007818",
+        "d4fdd67a.a817c8"
       ]
     ]
   },
   {
-    "id": "6f0b5fb4.a1fb4",
+    "id": "d4fdd67a.a817c8",
     "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": 5120.633071899414,
+    "y": 4553.96826171875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e903ccd1.487f98",
+    "id": "2be00ed8.b483fa",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4819.949493408203,
-    "y": 4689.765899658203,
-    "z": "7062000.f761",
+    "x": 4737.632827758789,
+    "y": 4694.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e80670f4.672e68"
+        "97d72fe9.69bac8"
       ]
     ]
   },
   {
-    "id": "c7ea39a3.498988",
+    "id": "91c8662a.32a768",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4807.949737548828,
-    "y": 4782.766143798828,
-    "z": "7062000.f761",
+    "x": 4725.633071899414,
+    "y": 4787.968505859375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3f0dd5a.ea39aaa",
+    "id": "d203ac94.87b14",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4810.011871337891,
-    "y": 4737.625671386719,
-    "z": "7062000.f761",
+    "x": 4727.695205688477,
+    "y": 4742.828033447266,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "6a777147.b443f8",
+    "id": "d5500d79.08788",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.ROOT.connectivity.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4425.949493408203,
-    "y": 4579.765899658203,
-    "z": "7062000.f761",
+    "x": 4343.632827758789,
+    "y": 4584.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b25b3b22.1646d"
+        "c8667f42.17971"
       ]
     ]
   },
   {
-    "id": "b25b3b22.1646d",
+    "id": "c8667f42.17971",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4630.949493408203,
-    "y": 4579.765899658203,
-    "z": "7062000.f761",
+    "x": 4548.632827758789,
+    "y": 4584.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e858f590.02822"
+        "459caa2c.0e6e04"
       ]
     ]
   },
   {
-    "id": "e858f590.02822",
+    "id": "459caa2c.0e6e04",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4796.949493408203,
-    "y": 4579.765899658203,
-    "z": "7062000.f761",
+    "x": 4714.632827758789,
+    "y": 4584.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d69512d3.73027"
+        "3bc11366.fbbc34"
       ]
     ]
   },
   {
-    "id": "cae5635c.9a1e2",
+    "id": "dd06399c.007818",
     "type": "save",
     "name": "get vpn-binding from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4435.949493408203,
-    "y": 4689.765899658203,
-    "z": "7062000.f761",
+    "x": 4353.632827758789,
+    "y": 4694.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a8297a32.4725f",
-        "102b4f2b.1cfcf9",
-        "6f0b5913.92db28"
+        "bdef323e.2e743",
+        "8bfc1c1b.2feb4",
+        "6eeff3cb.d5d2dc"
       ]
     ]
   },
   {
-    "id": "a8297a32.4725f",
+    "id": "bdef323e.2e743",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4646.949493408203,
-    "y": 4691.765899658203,
-    "z": "7062000.f761",
+    "x": 4564.632827758789,
+    "y": 4696.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e903ccd1.487f98"
+        "2be00ed8.b483fa"
       ]
     ]
   },
   {
-    "id": "102b4f2b.1cfcf9",
+    "id": "8bfc1c1b.2feb4",
     "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": 4565.123794555664,
+    "y": 4742.542297363281,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3f0dd5a.ea39aaa"
+        "d203ac94.87b14"
       ]
     ]
   },
   {
-    "id": "6f0b5913.92db28",
+    "id": "6eeff3cb.d5d2dc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4644.949493408203,
-    "y": 4780.765899658203,
-    "z": "7062000.f761",
+    "x": 4562.632827758789,
+    "y": 4785.96826171875,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c7ea39a3.498988"
+        "91c8662a.32a768"
       ]
     ]
   },
   {
-    "id": "e8e91e40.c50e3",
+    "id": "b4556ca5.203ec",
     "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": 5973.449722290039,
+    "y": 7084.169189453125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "12a072b1.a1936d",
+    "id": "5b30bbfe.71d1cc",
     "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": 5241.916732788086,
+    "y": 4315.368865966797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "74de082.69b8bf8",
+    "id": "dbaf0410.536798",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4826.233642578125,
-    "y": 4376.16650390625,
-    "z": "7062000.f761",
+    "x": 4743.916976928711,
+    "y": 4381.368865966797,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ac63c59c.83048",
+    "id": "817a92f2.d780d",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5357.2333984375,
-    "y": 4378.16650390625,
-    "z": "7062000.f761",
+    "x": 5274.916732788086,
+    "y": 4383.368865966797,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e6f065d2.aee8e",
-        "6b430222.42764c"
+        "9dfe7d9b.36f16",
+        "6633e166.0ef198"
       ]
     ]
   },
   {
-    "id": "e6f065d2.aee8e",
+    "id": "9dfe7d9b.36f16",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5482.2333984375,
-    "y": 4276.166259765625,
-    "z": "7062000.f761",
+    "x": 5399.916732788086,
+    "y": 4281.368621826172,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3f51a421.f29684"
+        "bef4e32d.a8f0f"
       ]
     ]
   },
   {
-    "id": "6b430222.42764c",
+    "id": "6633e166.0ef198",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5601.233428955078,
-    "y": 4350.166290283203,
-    "z": "7062000.f761",
+    "x": 5518.916763305664,
+    "y": 4355.36865234375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "b946186b.4be33",
+    "id": "13e3cfc5.6c211",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4569.916534423828,
-    "y": 3921.883331298828,
-    "z": "7062000.f761",
+    "x": 4487.599868774414,
+    "y": 3927.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "402f3aa1.dbe4cc",
+    "id": "c04b322f.90f188",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4914.916534423828,
-    "y": 3783.883331298828,
-    "z": "7062000.f761",
+    "x": 4832.599868774414,
+    "y": 3789.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a579376d.bc3"
+        "641a94ad.cf9a7c"
       ]
     ]
   },
   {
-    "id": "d26cf0c5.68acc",
+    "id": "cb16b3c1.554ca8",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4621.916534423828,
-    "y": 3777.883331298828,
-    "z": "7062000.f761",
+    "x": 4539.599868774414,
+    "y": 3783.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "402f3aa1.dbe4cc"
+        "c04b322f.90f188"
       ]
     ]
   },
   {
-    "id": "e2cb41dc.f4c8f8",
+    "id": "61a224f4.1490f4",
     "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": 4794.599868774414,
+    "y": 3740.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "72812dae.8552e4",
+    "id": "79714250.d2dcd4",
     "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": 4483.599868774414,
+    "y": 3835.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "82192f60.51b328",
+    "id": "accca5a7.e8bcb",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4573.916534423828,
-    "y": 3874.883331298828,
-    "z": "7062000.f761",
+    "x": 4491.599868774414,
+    "y": 3880.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "37b8f0e0.bc121",
+    "id": "4917ab18.c68984",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4570.916534423828,
-    "y": 3727.883331298828,
-    "z": "7062000.f761",
+    "x": 4488.599868774414,
+    "y": 3733.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a579376d.bc3",
+    "id": "641a94ad.cf9a7c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4823.916534423828,
-    "y": 3851.883331298828,
-    "z": "7062000.f761",
+    "x": 4741.599868774414,
+    "y": 3857.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "bcbc46d8.da70d8"
+        "a41b4c9c.8533c8"
       ]
     ]
   },
   {
-    "id": "bcbc46d8.da70d8",
+    "id": "a41b4c9c.8533c8",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5008.916534423828,
-    "y": 3850.883331298828,
-    "z": "7062000.f761",
+    "x": 4926.599868774414,
+    "y": 3856.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "df0e838b.1a8"
+        "16d0f836.5619d"
       ]
     ]
   },
   {
-    "id": "df0e838b.1a8",
+    "id": "16d0f836.5619d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5200.916534423828,
-    "y": 3853.883331298828,
-    "z": "7062000.f761",
+    "x": 5118.599868774414,
+    "y": 3859.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "b552c813.211c2"
+        "645ca090.154ad8"
       ]
     ]
   },
   {
-    "id": "b552c813.211c2",
+    "id": "645ca090.154ad8",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5372.916534423828,
-    "y": 3849.883331298828,
-    "z": "7062000.f761",
+    "x": 5290.599868774414,
+    "y": 3855.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "9806e019.ad2a",
+    "id": "67efef93.94a62",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4748.916534423828,
-    "y": 3964.883331298828,
-    "z": "7062000.f761",
+    "x": 4666.599868774414,
+    "y": 3970.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea9a5f5d.8f9bf8",
+    "id": "2d37a713.1c4278",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4265.916534423828,
-    "y": 3749.883331298828,
-    "z": "7062000.f761",
+    "x": 4183.599868774414,
+    "y": 3755.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4c3bbf42.6f3d68",
-        "e37c29b1.ce632",
-        "72812dae.8552e4",
-        "82192f60.51b328",
-        "b946186b.4be33",
-        "d26cf0c5.68acc",
-        "9806e019.ad2a"
+        "fc1ea1ac.e5e448",
+        "e72f0644.170c1",
+        "79714250.d2dcd4",
+        "accca5a7.e8bcb",
+        "13e3cfc5.6c211",
+        "cb16b3c1.554ca8",
+        "67efef93.94a62"
       ]
     ]
   },
   {
-    "id": "805d495b.3d6b18",
+    "id": "9d25224b.2344f8",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4250.916534423828,
-    "y": 3683.883331298828,
-    "z": "7062000.f761",
+    "x": 4168.599868774414,
+    "y": 3689.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e37c29b1.ce632",
+    "id": "e72f0644.170c1",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4629.916534423828,
-    "y": 3670.883331298828,
-    "z": "7062000.f761",
+    "x": 4547.599868774414,
+    "y": 3676.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "942a4caf.d868d8",
-        "8905a79d.0fb76",
-        "e2cb41dc.f4c8f8"
+        "e651547d.d99b88",
+        "9ee7d7c1.7baf1",
+        "61a224f4.1490f4"
       ]
     ]
   },
   {
-    "id": "942a4caf.d868d8",
+    "id": "e651547d.d99b88",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4865.916534423828,
-    "y": 3653.883331298828,
-    "z": "7062000.f761",
+    "x": 4783.599868774414,
+    "y": 3659.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "8905a79d.0fb76",
+    "id": "9ee7d7c1.7baf1",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4862.916534423828,
-    "y": 3694.883331298828,
-    "z": "7062000.f761",
+    "x": 4780.599868774414,
+    "y": 3700.085693359375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "4c3bbf42.6f3d68",
+    "id": "fc1ea1ac.e5e448",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4578.916534423828,
-    "y": 3627.883331298828,
-    "z": "7062000.f761",
+    "x": 4496.599868774414,
+    "y": 3633.085693359375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "94da922f.c01d98",
+    "id": "7b5e5ce4.837894",
     "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": 5225.999771118164,
+    "y": 4682.485595703125,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e80670f4.672e68",
+    "id": "97d72fe9.69bac8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5097.316436767578,
-    "y": 4739.283233642578,
-    "z": "7062000.f761",
+    "x": 5014.999771118164,
+    "y": 4744.485595703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ed69a679.8ddb2"
+        "9a139c6f.7e9338"
       ]
     ]
   },
   {
-    "id": "ed69a679.8ddb2",
+    "id": "9a139c6f.7e9338",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5341.316436767578,
-    "y": 4745.283233642578,
-    "z": "7062000.f761",
+    "x": 5258.999771118164,
+    "y": 4750.485595703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "90bf5e35.d23788",
-        "6659c466.b510dc"
+        "f77309ba.c91088",
+        "14cb90c5.a4f8ff"
       ]
     ]
   },
   {
-    "id": "90bf5e35.d23788",
+    "id": "f77309ba.c91088",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5572.316436767578,
-    "y": 4723.283233642578,
-    "z": "7062000.f761",
+    "x": 5489.999771118164,
+    "y": 4728.485595703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5ef895fb.b1bf7c"
+        "d9be22a0.00a98"
       ]
     ]
   },
   {
-    "id": "6659c466.b510dc",
+    "id": "14cb90c5.a4f8ff",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5577.316436767578,
-    "y": 4790.283233642578,
-    "z": "7062000.f761",
+    "x": 5494.999771118164,
+    "y": 4795.485595703125,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ef985380.75ae68",
+    "id": "414056d.7db8ba8",
     "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": 5743.883529663086,
+    "y": 4293.167938232422,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "76a7bc4a.dd01dc",
-        "c64cf61b.17568"
+        "7fdfcb8f.16a5bc",
+        "c3a97bf3.cec48"
       ]
     ]
   },
   {
-    "id": "76a7bc4a.dd01dc",
+    "id": "7fdfcb8f.16a5bc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5981.200225830078,
-    "y": 4215.965850830078,
-    "z": "7062000.f761",
+    "x": 5898.883560180664,
+    "y": 4221.168212890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "79b64e60.35626"
+        "b797878.bae0cf8"
       ]
     ]
   },
   {
-    "id": "c64cf61b.17568",
+    "id": "c3a97bf3.cec48",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5982.200225830078,
-    "y": 4348.965850830078,
-    "z": "7062000.f761",
+    "x": 5899.883560180664,
+    "y": 4354.168212890625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "d1f760ec.7590a"
+        "e250ecc5.35ab28"
       ]
     ]
   },
   {
-    "id": "79b64e60.35626",
+    "id": "b797878.bae0cf8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6126.200225830078,
-    "y": 4215.966094970703,
-    "z": "7062000.f761",
+    "x": 6043.883560180664,
+    "y": 4221.16845703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "a1fc801a.8dde7",
-        "f7199aa1.5a0618"
+        "424fa95d.ed7fe",
+        "75e1d3fe.929f74"
       ]
     ]
   },
   {
-    "id": "a1fc801a.8dde7",
+    "id": "424fa95d.ed7fe",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6419.200225830078,
-    "y": 4193.965850830078,
-    "z": "7062000.f761",
+    "x": 6336.883560180664,
+    "y": 4199.168212890625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "f7199aa1.5a0618",
+    "id": "75e1d3fe.929f74",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6370.850128173828,
-    "y": 4241.282745361328,
-    "z": "7062000.f761",
+    "x": 6288.533462524414,
+    "y": 4246.485107421875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "598a3c97.c62cd4",
+    "id": "5dd8867f.439e3",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6443.200225830078,
-    "y": 4154.965850830078,
-    "z": "7062000.f761",
+    "x": 6361.883529663086,
+    "y": 4148.167938232422,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d1f760ec.7590a",
+    "id": "e250ecc5.35ab28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6138.200225830078,
-    "y": 4347.966094970703,
-    "z": "7062000.f761",
+    "x": 6055.883560180664,
+    "y": 4353.16845703125,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e43682b5.56552",
-        "8aed809d.a72bd8"
+        "417900a8.821de",
+        "be5a71f5.125bd8"
       ]
     ]
   },
   {
-    "id": "e43682b5.56552",
+    "id": "417900a8.821de",
     "type": "save",
     "name": "update the-vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6431.200225830078,
-    "y": 4325.965850830078,
-    "z": "7062000.f761",
+    "x": 6348.883560180664,
+    "y": 4331.168212890625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "8aed809d.a72bd8",
+    "id": "be5a71f5.125bd8",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6382.850128173828,
-    "y": 4373.282745361328,
-    "z": "7062000.f761",
+    "x": 6300.533462524414,
+    "y": 4378.485107421875,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "3a2ab7c7.d2dab8",
+    "id": "a603f2dd.a46cd8",
     "type": "comment",
     "name": "decrease the bw of the-vpn-binding and change status to modified",
     "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6455.200225830078,
-    "y": 4286.965850830078,
-    "z": "7062000.f761",
+    "x": 6372.883560180664,
+    "y": 4292.168212890625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5ef895fb.b1bf7c",
+    "id": "d9be22a0.00a98",
     "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": 5695.116470336914,
+    "y": 4735.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "3e55897.59031f6",
-        "a1d97b4a.208e4"
+        "c2b73899.5086",
+        "f61c39ed.e925c8"
       ]
     ]
   },
   {
-    "id": "3e55897.59031f6",
+    "id": "c2b73899.5086",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5972.433135986328,
-    "y": 4658.166534423828,
-    "z": "7062000.f761",
+    "x": 5890.116470336914,
+    "y": 4663.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "1661a8d0.f6d65f"
+        "d6c79c19.937aa"
       ]
     ]
   },
   {
-    "id": "a1d97b4a.208e4",
+    "id": "f61c39ed.e925c8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5973.433135986328,
-    "y": 4791.166534423828,
-    "z": "7062000.f761",
+    "x": 5891.116470336914,
+    "y": 4796.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "5810f31a.0a9ed4"
+        "4edaf13a.b4d9f"
       ]
     ]
   },
   {
-    "id": "1661a8d0.f6d65f",
+    "id": "d6c79c19.937aa",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6117.433135986328,
-    "y": 4658.166778564453,
-    "z": "7062000.f761",
+    "x": 6035.116470336914,
+    "y": 4663.369140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "da6580ac.af986",
-        "ee810baa.63495"
+        "d6b8ba93.8ff92",
+        "f1f742e0.7a641"
       ]
     ]
   },
   {
-    "id": "da6580ac.af986",
+    "id": "d6b8ba93.8ff92",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6410.433135986328,
-    "y": 4636.166534423828,
-    "z": "7062000.f761",
+    "x": 6328.116470336914,
+    "y": 4641.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "ee810baa.63495",
+    "id": "f1f742e0.7a641",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6362.083038330078,
-    "y": 4683.483428955078,
-    "z": "7062000.f761",
+    "x": 6279.766372680664,
+    "y": 4688.685791015625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "87cf660.a2b3f18",
+    "id": "d36450e6.6d57c8",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6434.433135986328,
-    "y": 4597.166534423828,
-    "z": "7062000.f761",
+    "x": 6352.116470336914,
+    "y": 4602.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5810f31a.0a9ed4",
+    "id": "4edaf13a.b4d9f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6129.433135986328,
-    "y": 4790.166778564453,
-    "z": "7062000.f761",
+    "x": 6047.116470336914,
+    "y": 4795.369140625,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "80c260b2.6af7a",
-        "9a874787.276bd"
+        "7a3b5a2.2e1f624",
+        "1ba425ad.b54daa"
       ]
     ]
   },
   {
-    "id": "80c260b2.6af7a",
+    "id": "7a3b5a2.2e1f624",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6422.433135986328,
-    "y": 4768.166534423828,
-    "z": "7062000.f761",
+    "x": 6340.116470336914,
+    "y": 4773.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "9a874787.276bd",
+    "id": "1ba425ad.b54daa",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6374.083038330078,
-    "y": 4815.483428955078,
-    "z": "7062000.f761",
+    "x": 6291.766372680664,
+    "y": 4820.685791015625,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "815fc293.94d2f8",
+    "id": "22900b75.03f974",
     "type": "comment",
     "name": "decrease the bw of the-vpn-binding and change status to modified",
     "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6446.433135986328,
-    "y": 4729.166534423828,
-    "z": "7062000.f761",
+    "x": 6364.116470336914,
+    "y": 4734.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a537e9a.90f0c98",
+    "id": "ef554fdd.c7de28",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5185.283233642578,
-    "y": 5470.366729736328,
-    "z": "7062000.f761",
+    "x": 5102.966567993164,
+    "y": 5475.569091796875,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "d416487a.185998",
+    "id": "fa0dda8.0253328",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5183.066436767578,
-    "y": 5510.566925048828,
-    "z": "7062000.f761",
+    "x": 5100.749771118164,
+    "y": 5515.769287109375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "7898de27.66a698",
+    "id": "f06e1df.64a1e6",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5058.316680908203,
-    "y": 5695.049835205078,
-    "z": "7062000.f761",
+    "x": 4976.000015258789,
+    "y": 5700.252197265625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "63d85a3d.4103fc",
+    "id": "ca1c65a6.dca85",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5056.099884033203,
-    "y": 5735.250030517578,
-    "z": "7062000.f761",
+    "x": 4973.783218383789,
+    "y": 5740.452392578125,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "105ea6a7.242f79",
+    "id": "a99f468d.7b18e",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5160.433135986328,
-    "y": 6178.166534423828,
-    "z": "7062000.f761",
+    "x": 5073.116470336914,
+    "y": 6024.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "8f43e7c7.1c41b8",
+    "id": "8488a4f2.44d84",
     "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": 4900.116470336914,
+    "y": 6081.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "4e0d7b1b.4cc2ec",
-        "609ed3b9.40f534"
+        "7fa62708.b47fb8",
+        "8128360f.d5f0f8"
       ]
     ]
   },
   {
-    "id": "4e0d7b1b.4cc2ec",
+    "id": "7fa62708.b47fb8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5198.433135986328,
-    "y": 6235.166534423828,
-    "z": "7062000.f761",
+    "x": 5111.116470336914,
+    "y": 6081.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c2d7112c.1b117"
+        "7522288d.71e8f8"
       ]
     ]
   },
   {
-    "id": "609ed3b9.40f534",
+    "id": "8128360f.d5f0f8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5194.433135986328,
-    "y": 6283.166534423828,
-    "z": "7062000.f761",
+    "x": 5107.116470336914,
+    "y": 6129.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "fd4c4e47.075cf8"
+        "fb9502dd.0e71b"
       ]
     ]
   },
   {
-    "id": "c2d7112c.1b117",
+    "id": "7522288d.71e8f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5354.433135986328,
-    "y": 6231.166534423828,
-    "z": "7062000.f761",
+    "x": 5267.116470336914,
+    "y": 6077.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "c4eacefe.2b5518",
-        "773bf221.e0586c",
-        "f38f117c.80c7b8"
+        "9f8e58e7.89aac",
+        "d14d9fb3.031c",
+        "ade8b0f8.453b68"
       ]
     ]
   },
   {
-    "id": "fd4c4e47.075cf8",
+    "id": "fb9502dd.0e71b",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 5342.433135986328,
-    "y": 6278.166534423828,
-    "z": "7062000.f761",
+    "x": 5255.116470336914,
+    "y": 6124.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "a5cbc756.e321b8",
+    "id": "482690e8.af77d8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5620.316925048828,
-    "y": 6331.049835205078,
-    "z": "7062000.f761",
+    "x": 5533.000259399414,
+    "y": 6177.252197265625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "f38f117c.80c7b8",
+    "id": "ade8b0f8.453b68",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5618.100128173828,
-    "y": 6371.250030517578,
-    "z": "7062000.f761",
+    "x": 5530.783462524414,
+    "y": 6217.452392578125,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "773bf221.e0586c",
+    "id": "d14d9fb3.031c",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5737.433135986328,
-    "y": 6283.166534423828,
-    "z": "7062000.f761",
+    "x": 5650.116470336914,
+    "y": 6129.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "c4eacefe.2b5518",
+    "id": "9f8e58e7.89aac",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5608.433135986328,
-    "y": 6231.166534423828,
-    "z": "7062000.f761",
+    "x": 5521.116470336914,
+    "y": 6077.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "5ff4d90f.61eca8",
+    "id": "b5ec42e6.8d4a38",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5049.433135986328,
-    "y": 6136.166534423828,
-    "z": "7062000.f761",
+    "x": 4962.116470336914,
+    "y": 5982.368896484375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1a8fecd4.39509b",
+    "id": "977f17a0.9f41a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4756.766143798828,
-    "y": 6218.166534423828,
-    "z": "7062000.f761",
+    "x": 4609.449478149414,
+    "y": 6069.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "105ea6a7.242f79",
-        "8f43e7c7.1c41b8"
+        "a99f468d.7b18e",
+        "8488a4f2.44d84",
+        "9cfb7864.e0e548",
+        "98761b9f.ff6118"
       ]
     ]
   },
   {
-    "id": "2374b67.d3b424a",
+    "id": "5d58f01d.864e08",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5035.516632080078,
-    "y": 6533.166534423828,
-    "z": "7062000.f761",
+    "x": 4953.199966430664,
+    "y": 6538.368896484375,
+    "z": "9718fe15.98603",
     "wires": [
       []
     ]
   },
   {
-    "id": "5d1aa304.0ec964",
+    "id": "b7ab7670.8f5828",
     "type": "comment",
     "name": "TODO: BUG -- DONE",
     "info": "momkene connectivity haye vasati ke dummy hastand ham\nvpn-binding dashte bashand ke too in path involve hast pas\nbayad bw aan niz update shavad.",
     "comments": "",
-    "x": 3740.8837890625,
-    "y": 3809.88330078125,
-    "z": "7062000.f761",
+    "x": 3658.567123413086,
+    "y": 3815.085662841797,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "1c248a70.8f6db6",
+    "id": "c7b27212.2f5b88",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4493.4169921875,
-    "y": 4084,
-    "z": "7062000.f761",
+    "x": 4411.100326538086,
+    "y": 4089.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "e8d15ab4.54c49",
-        "20b8f97c.98322e",
-        "6302d7c5.b6ebe8"
+        "88440014.089508",
+        "6850bc1b.9b439c",
+        "ea9e63cb.45924"
       ]
     ]
   },
   {
-    "id": "3d05d16c.2a1566",
+    "id": "46e39fd1.0b23",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4595.4169921875,
-    "y": 4049,
-    "z": "7062000.f761",
+    "x": 4519.100570678711,
+    "y": 4045.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "e8d15ab4.54c49",
+    "id": "88440014.089508",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4698.4169921875,
-    "y": 4081,
-    "z": "7062000.f761",
+    "x": 4616.100326538086,
+    "y": 4086.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "7ec23daa.6a0bc4"
+        "94bd21f9.ba5e08"
       ]
     ]
   },
   {
-    "id": "20b8f97c.98322e",
+    "id": "6850bc1b.9b439c",
     "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": 4599.591293334961,
+    "y": 4147.776397705078,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "36ba2eea.c2f3b2"
+        "c061eff6.efec1"
       ]
     ]
   },
   {
-    "id": "6302d7c5.b6ebe8",
+    "id": "ea9e63cb.45924",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4679.4169921875,
-    "y": 4186,
-    "z": "7062000.f761",
+    "x": 4597.100326538086,
+    "y": 4191.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "949d59bf.9e67a"
+        "302c462f.876b7a"
       ]
     ]
   },
   {
-    "id": "7ec23daa.6a0bc4",
+    "id": "94bd21f9.ba5e08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4866.417236328125,
-    "y": 4076,
-    "z": "7062000.f761",
+    "x": 4784.100570678711,
+    "y": 4081.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "df77d6a9.222ef"
+        "72fd3d1f.5c9734"
       ]
     ]
   },
   {
-    "id": "36ba2eea.c2f3b2",
+    "id": "c061eff6.efec1",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4844.4793701171875,
-    "y": 4142.859771728516,
-    "z": "7062000.f761",
+    "x": 4762.162704467773,
+    "y": 4148.0621337890625,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "949d59bf.9e67a",
+    "id": "302c462f.876b7a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4846.4169921875,
-    "y": 4185,
-    "z": "7062000.f761",
+    "x": 4764.100326538086,
+    "y": 4190.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "df77d6a9.222ef",
+    "id": "72fd3d1f.5c9734",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5104.417236328125,
-    "y": 4081,
-    "z": "7062000.f761",
+    "x": 5022.100570678711,
+    "y": 4086.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "abc8ebdb.52f0a8"
+        "e265f5c.115d288"
       ]
     ]
   },
   {
-    "id": "abc8ebdb.52f0a8",
+    "id": "e265f5c.115d288",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5338.4169921875,
-    "y": 4088,
-    "z": "7062000.f761",
+    "x": 5256.100326538086,
+    "y": 4093.202362060547,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ac63c59c.83048"
+        "817a92f2.d780d"
       ]
     ]
   },
   {
-    "id": "1f0e75d7.8b5a2a",
+    "id": "aaa5f9ec.d9ed6",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4472.11669921875,
-    "y": 4010,
-    "z": "7062000.f761",
+    "x": 4389.800033569336,
+    "y": 4015.202362060547,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bffd072f.5e512",
+    "id": "4e4373ae.4e8254",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5755.2666015625,
-    "y": 4098.5830078125,
-    "z": "7062000.f761",
+    "x": 5672.949935913086,
+    "y": 4103.785369873047,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "f3f61fe0.c57dd"
+        "8eac4849.2274f8"
       ]
     ]
   },
   {
-    "id": "f3f61fe0.c57dd",
+    "id": "8eac4849.2274f8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5947.2666015625,
-    "y": 4087.583251953125,
-    "z": "7062000.f761",
+    "x": 5864.949935913086,
+    "y": 4092.785614013672,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "8cedd329.3f3c9"
+        "a232365.4dda248"
       ]
     ]
   },
   {
-    "id": "8cedd329.3f3c9",
+    "id": "a232365.4dda248",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6129.2666015625,
-    "y": 4066.583251953125,
-    "z": "7062000.f761",
+    "x": 6046.949935913086,
+    "y": 4071.785614013672,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "86e0777f.9370f"
+        "992af4aa.8e2b6"
       ]
     ]
   },
   {
-    "id": "86e0777f.9370f",
+    "id": "992af4aa.8e2b6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 6291.2666015625,
-    "y": 4055.583251953125,
-    "z": "7062000.f761",
+    "x": 6208.949935913086,
+    "y": 4060.785614013672,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "869c4324.9670f",
-        "bbb484a7.96add8"
+        "1e9c08fd.18a337",
+        "74b54acc.d82234"
       ]
     ]
   },
   {
-    "id": "869c4324.9670f",
+    "id": "1e9c08fd.18a337",
     "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": 6405.949935913086,
+    "y": 3989.785614013672,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "3f51a421.f29684",
+    "id": "b0ee6567.2e3a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5609.216796875,
-    "y": 4214.582763671875,
-    "z": "7062000.f761",
+    "x": 5579.900131225586,
+    "y": 4218.785369873047,
+    "z": "9718fe15.98603",
     "wires": [
       [
-        "ef985380.75ae68",
-        "bffd072f.5e512",
-        "bbf89c4c.2b2c98",
-        "55e59a7f.53654c"
+        "414056d.7db8ba8",
+        "4e4373ae.4e8254",
+        "1071a614.4e5e12",
+        "8f9726f3.06c69"
       ]
     ]
   },
   {
-    "id": "bbf89c4c.2b2c98",
+    "id": "1071a614.4e5e12",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5793.783203125,
-    "y": 3988.800048828125,
-    "z": "7062000.f761",
+    "x": 5711.466537475586,
+    "y": 3994.002410888672,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "55e59a7f.53654c",
+    "id": "8f9726f3.06c69",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 5785.783203125,
-    "y": 4037.800048828125,
-    "z": "7062000.f761",
+    "x": 5703.466537475586,
+    "y": 4043.002410888672,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "74b54acc.d82234",
+    "type": "set",
+    "name": "set tmp.the-connectivity.connectivity-id",
+    "xml": "<set>\n<parameter name='tmp.the-connectivity.connectivity-id' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",
+    "comments": "",
+    "x": 6411.416732788086,
+    "y": 4099.002410888672,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "7fff9c38.345784",
+    "type": "set",
+    "name": "set vpnNameToSearch",
+    "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
+    "comments": "",
+    "x": 5704.683334350586,
+    "y": 3817.202362060547,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "aaa5e7eb.47b75",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5858.683334350586,
+    "y": 3869.202362060547,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bef4e32d.a8f0f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5449.683334350586,
+    "y": 3936.202362060547,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "aaa5e7eb.47b75",
+        "1d5352b7.2fb14d",
+        "7fff9c38.345784"
+      ]
+    ]
+  },
+  {
+    "id": "1d5352b7.2fb14d",
+    "type": "switchNode",
+    "name": "switch $foundVpnName",
+    "xml": "<switch test=\"`$foundVpnName`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5703.683334350586,
+    "y": 3924.202362060547,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "894732f.a692a5"
+      ]
+    ]
+  },
+  {
+    "id": "894732f.a692a5",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5882.683334350586,
+    "y": 3923.202362060547,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "b0ee6567.2e3a8"
+      ]
+    ]
+  },
+  {
+    "id": "81398bf4.473028",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4580.683334350586,
+    "y": 7441.202362060547,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "6a1836f0.9e7b08",
+        "edfac497.39017",
+        "e285b49b.2789f8"
+      ]
+    ]
+  },
+  {
+    "id": "e285b49b.2789f8",
+    "type": "set",
+    "name": "set vpnNameToSearch",
+    "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
+    "comments": "",
+    "x": 4803.683334350586,
+    "y": 7385.202362060547,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "6a1836f0.9e7b08",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4982.683334350586,
+    "y": 7428.202362060547,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "edfac497.39017",
+    "type": "switchNode",
+    "name": "switch $foundVpnName",
+    "xml": "<switch test=\"`$foundVpnName`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4827.683334350586,
+    "y": 7483.202362060547,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "d5b486b.df173f8"
+      ]
+    ]
+  },
+  {
+    "id": "d5b486b.df173f8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5006.683334350586,
+    "y": 7482.202362060547,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "7de65a32.2588c4"
+      ]
+    ]
+  },
+  {
+    "id": "ecfaffd6.100b2",
+    "type": "set",
+    "name": "unset tmp.aai.all-vpn-bindings",
+    "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
+    "comments": "",
+    "x": 4737.683334350586,
+    "y": 7121.202362060547,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "4b552ff.dab62d",
+    "type": "set",
+    "name": "unset secondary related variables",
+    "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
+    "comments": "",
+    "x": 3303.2999420166016,
+    "y": 515.65234375,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "3dcf3da2.14e88a",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4078.399429321289,
+    "y": 576.65234375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "bfde7d38.fed19"
+      ]
+    ]
+  },
+  {
+    "id": "bfde7d38.fed19",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4247.399429321289,
+    "y": 573.65234375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "30447223.2437ce",
+        "12dff897.0ce0bf"
+      ]
+    ]
+  },
+  {
+    "id": "30447223.2437ce",
+    "type": "set",
+    "name": "set network-route-SECONDARY-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
+    "comments": "",
+    "x": 4471.399429321289,
+    "y": 606.65234375,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "12dff897.0ce0bf",
+    "type": "set",
+    "name": "set network-route-C",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
+    "comments": "",
+    "x": 4417.399429321289,
+    "y": 646.65234375,
+    "z": "9718fe15.98603",
     "wires": []
   },
   {
-    "id": "bbb484a7.96add8",
+    "id": "f46ebe04.450d9",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4043.399917602539,
+    "y": 775.8523559570312,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "3c9b9865.e5691"
+      ]
+    ]
+  },
+  {
+    "id": "3c9b9865.e5691",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4208.399185180664,
+    "y": 780.8523559570312,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "4bcd87c1.d1b",
+        "63ed5150.d5d24"
+      ]
+    ]
+  },
+  {
+    "id": "4bcd87c1.d1b",
+    "type": "set",
+    "name": "set network-route-SECONDARY-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4455.399429321289,
+    "y": 862.8523559570312,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "63ed5150.d5d24",
     "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": "set network-route-C",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 6485.7333984375,
-    "y": 4083.800048828125,
-    "z": "7062000.f761",
+    "x": 4401.399429321289,
+    "y": 902.8523559570312,
+    "z": "9718fe15.98603",
     "wires": []
+  },
+  {
+    "id": "76a3b118.862498",
+    "type": "save",
+    "name": "get network-route-three from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 3286.399917602539,
+    "y": 914.8523559570312,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "7adb4c8f.c682bc",
+        "7eb8fd1a.3f3194",
+        "b860a47d.f11fd8"
+      ]
+    ]
+  },
+  {
+    "id": "7adb4c8f.c682bc",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3528.399917602539,
+    "y": 907.8523559570312,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7eb8fd1a.3f3194",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3523.908981323242,
+    "y": 950.2784118652344,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b860a47d.f11fd8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3527.908950805664,
+    "y": 998.2783813476562,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "a6ff06d4.331218"
+      ]
+    ]
+  },
+  {
+    "id": "a6ff06d4.331218",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3689.399917602539,
+    "y": 938.8523559570312,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "32bc585c.c7728"
+      ]
+    ]
+  },
+  {
+    "id": "32bc585c.c7728",
+    "type": "switchNode",
+    "name": "switch nr type",
+    "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3860.399917602539,
+    "y": 938.8525390625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "e312a504.c3346",
+        "450f492a.7498d8",
+        "e7c48999.96bb5"
+      ]
+    ]
+  },
+  {
+    "id": "e312a504.c3346",
+    "type": "outcome",
+    "name": "ROOT",
+    "xml": "<outcome value='ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4027.399673461914,
+    "y": 848.8524780273438,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "e34d64db.7a9328"
+      ]
+    ]
+  },
+  {
+    "id": "450f492a.7498d8",
+    "type": "outcome",
+    "name": "LEAF",
+    "xml": "<outcome value='LEAF'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4029.399673461914,
+    "y": 902.8524780273438,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "f1b929a4.9c9ce"
+      ]
+    ]
+  },
+  {
+    "id": "e34d64db.7a9328",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4155.399673461914,
+    "y": 848.8524780273438,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "d0297dd0.c50e68",
+        "9996be1d.2ba6f"
+      ]
+    ]
+  },
+  {
+    "id": "f1b929a4.9c9ce",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4158.399673461914,
+    "y": 901.8524780273438,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "55ecdb35.0e00cc",
+        "c088cd20.720bd8"
+      ]
+    ]
+  },
+  {
+    "id": "9996be1d.2ba6f",
+    "type": "set",
+    "name": "set network-route-B",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4401.399429321289,
+    "y": 987.8524780273438,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "55ecdb35.0e00cc",
+    "type": "set",
+    "name": "set network-route-LEAF",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4418.399429321289,
+    "y": 1029.8524780273438,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "c088cd20.720bd8",
+    "type": "set",
+    "name": "set network-route-A",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4403.399429321289,
+    "y": 1067.8524780273438,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "d0297dd0.c50e68",
+    "type": "set",
+    "name": "set network-route-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4415.399429321289,
+    "y": 947.8524780273438,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "5eec7036.1519e8",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4580.399429321289,
+    "y": 963.8524780273438,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "e7c48999.96bb5",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3968.399917602539,
+    "y": 993.852294921875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "6b81c811.85e0f8"
+      ]
+    ]
+  },
+  {
+    "id": "6b81c811.85e0f8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4142.399917602539,
+    "y": 988.852294921875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "2495f2a4.688896",
+        "9470a6af.62de2"
+      ]
+    ]
+  },
+  {
+    "id": "9470a6af.62de2",
+    "type": "set",
+    "name": "set network-route-C",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
+    "comments": "",
+    "x": 4375.399429321289,
+    "y": 1157.8522338867188,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "2495f2a4.688896",
+    "type": "set",
+    "name": "set network-route-SECONDARY-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
+    "comments": "",
+    "x": 4429.399429321289,
+    "y": 1117.8522338867188,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "b6c93789.479408",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4543.399429321289,
+    "y": 1142.8522338867188,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "c1d74161.be2c8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3544.066665649414,
+    "y": 2223.085693359375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "855df0cd.9bb95",
+        "434e1396.d595c4"
+      ]
+    ]
+  },
+  {
+    "id": "d130bfb5.a4da88",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3371.400161743164,
+    "y": 2224.085693359375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "c1d74161.be2c8"
+      ]
+    ]
+  },
+  {
+    "id": "bba37dac.291368",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3380.891128540039,
+    "y": 2266.6597290039062,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "730fab1.8beaed4",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3369.400161743164,
+    "y": 2313.085693359375,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "855df0cd.9bb95",
+    "type": "execute",
+    "name": "execute split tp-id to get pnf-name",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3830.400161743164,
+    "y": 2227.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "55a8020a.690a64",
+        "326effaf.bc448"
+      ]
+    ]
+  },
+  {
+    "id": "326effaf.bc448",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4053.400161743164,
+    "y": 2182.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "ab5c47c3.fcb968"
+      ]
+    ]
+  },
+  {
+    "id": "55a8020a.690a64",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4055.400161743164,
+    "y": 2246.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "af7cae04.ba78a"
+      ]
+    ]
+  },
+  {
+    "id": "fbc065ad.333e38",
+    "type": "save",
+    "name": "get p-interface-dst from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3143.400161743164,
+    "y": 2259.085693359375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "d130bfb5.a4da88",
+        "bba37dac.291368",
+        "730fab1.8beaed4"
+      ]
+    ]
+  },
+  {
+    "id": "a720f331.1ff0f",
+    "type": "comment",
+    "name": "Question?",
+    "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
+    "comments": "",
+    "x": 3104.400161743164,
+    "y": 2203.085693359375,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "62eac021.71055",
+    "type": "execute",
+    "name": "execute split tp-id to get pnf-name",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3163.400161743164,
+    "y": 1999.085693359375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "de7e4f57.82469",
+        "33097b2f.e0f6dc"
+      ]
+    ]
+  },
+  {
+    "id": "33097b2f.e0f6dc",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3386.400161743164,
+    "y": 1985.085693359375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "55022710.99c7b"
+      ]
+    ]
+  },
+  {
+    "id": "de7e4f57.82469",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3388.400161743164,
+    "y": 2018.085693359375,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "55022710.99c7b",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3534.400161743164,
+    "y": 1978.085693359375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "225a6795.34ae6",
+        "605cb253.51882c"
+      ]
+    ]
+  },
+  {
+    "id": "225a6795.34ae6",
+    "type": "set",
+    "name": "set pnf-name",
+    "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
+    "comments": "",
+    "x": 3728.400161743164,
+    "y": 1981.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "434e1396.d595c4",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3781.400131225586,
+    "y": 2350.085662841797,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "6aeddc31.02af0c"
+      ]
+    ]
+  },
+  {
+    "id": "6aeddc31.02af0c",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3987.400131225586,
+    "y": 2350.085662841797,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "1d98ffa3.9dac18"
+      ]
+    ]
+  },
+  {
+    "id": "605cb253.51882c",
+    "type": "get-resource",
+    "name": "get-resource src pnf",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3750.400161743164,
+    "y": 2049.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "da783639.0ff76",
+        "86ac0aff.5f3f28",
+        "cebbe4ca.ee77e"
+      ]
+    ]
+  },
+  {
+    "id": "da783639.0ff76",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3945.9002838134766,
+    "y": 2001.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "812fa062.6dc7c"
+      ]
+    ]
+  },
+  {
+    "id": "86ac0aff.5f3f28",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3937.9002838134766,
+    "y": 2056.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "8d0439b3.358a8"
+      ]
+    ]
+  },
+  {
+    "id": "cebbe4ca.ee77e",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3942.9002838134766,
+    "y": 2113.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "ca5c6f17.cf3a7"
+      ]
+    ]
+  },
+  {
+    "id": "ca5c6f17.cf3a7",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+    "comments": "",
+    "x": 4094.9002838134766,
+    "y": 2114.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "812fa062.6dc7c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4090.2826080322266,
+    "y": 1998.7414855957031,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "ad74d99d.0df72"
+      ]
+    ]
+  },
+  {
+    "id": "28bc0683.b68302",
+    "type": "set",
+    "name": "set SECONDARY-ROOT stuff",
+    "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
+    "comments": "",
+    "x": 3166.066665649414,
+    "y": 2338.085693359375,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "9656dd17.9b3ad",
+    "type": "comment",
+    "name": "NOT NEEDED ANYMORE?",
+    "info": "",
+    "comments": "",
+    "x": 3841.066635131836,
+    "y": 2302.085662841797,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "af7cae04.ba78a",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
+    "comments": "",
+    "x": 4214.400161743164,
+    "y": 2265.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "ab5c47c3.fcb968",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4218.400161743164,
+    "y": 2179.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "9a6b61ac.f8e22",
+        "26968708.bf0a2"
+      ]
+    ]
+  },
+  {
+    "id": "1d98ffa3.9dac18",
+    "type": "outcome",
+    "name": "tunnel-termination-point",
+    "xml": "<outcome value='tunnel-termination-point'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4204.685775756836,
+    "y": 2348.907440185547,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "e0a8c937.0da4d"
+      ]
+    ]
+  },
+  {
+    "id": "8d0439b3.358a8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+    "comments": "",
+    "x": 4105.900283813477,
+    "y": 2059.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "9a6b61ac.f8e22",
+    "type": "set",
+    "name": "set ltpId",
+    "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
+    "comments": "",
+    "x": 4388.400161743164,
+    "y": 2140.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "26968708.bf0a2",
+    "type": "set",
+    "name": "set pnf-name",
+    "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
+    "comments": "",
+    "x": 4389.400161743164,
+    "y": 2245.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "826c48fa.181fa",
+    "type": "comment",
+    "name": "TODO: FIXME",
+    "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
+    "comments": "",
+    "x": 4384.400161743164,
+    "y": 2194.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "e0a8c937.0da4d",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4411.517318725586,
+    "y": 2338.4261169433594,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "e11a9a35.e1ef78",
+        "a5abc378.a6c95",
+        "e2067ae4.4ae0a8"
+      ]
+    ]
+  },
+  {
+    "id": "e11a9a35.e1ef78",
+    "type": "set",
+    "name": "set destination ttp-id",
+    "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 4626.517318725586,
+    "y": 2300.4261169433594,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "a5abc378.a6c95",
+    "type": "get-resource",
+    "name": "get-resource src TTP",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4623.517318725586,
+    "y": 2339.4261169433594,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "153d06ec.f14b19"
+      ]
+    ]
+  },
+  {
+    "id": "e2067ae4.4ae0a8",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 4579.017318725586,
+    "y": 2381.4261169433594,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "ff2bf803.a9fa88",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4672.400161743164,
+    "y": 2017.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "a1443a9c.9bc758"
+      ]
+    ]
+  },
+  {
+    "id": "ad74d99d.0df72",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4274.400161743164,
+    "y": 2013.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "aec2208e.63a7a"
+      ]
+    ]
+  },
+  {
+    "id": "aec2208e.63a7a",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4469.400161743164,
+    "y": 2013.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "ff2bf803.a9fa88",
+        "8efacaf4.128aa8"
+      ]
+    ]
+  },
+  {
+    "id": "8efacaf4.128aa8",
+    "type": "outcome",
+    "name": "network-resource",
+    "xml": "<outcome value='network-resource'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 4674.400161743164,
+    "y": 2090.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "2140dc16.b34c34"
+      ]
+    ]
+  },
+  {
+    "id": "153d06ec.f14b19",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4804.017318725586,
+    "y": 2338.4261169433594,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "dc9300dc.915278"
+      ]
+    ]
+  },
+  {
+    "id": "dc9300dc.915278",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4962.017318725586,
+    "y": 2338.4261169433594,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "1236d7b2.067398"
+      ]
+    ]
+  },
+  {
+    "id": "1236d7b2.067398",
+    "type": "set",
+    "name": "set destination tunnel tp ip",
+    "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
+    "comments": "",
+    "x": 5169.017318725586,
+    "y": 2338.4261169433594,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "a1443a9c.9bc758",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4849.400161743164,
+    "y": 2009.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "206cd74a.090e9",
+        "743406a2.17f9a"
+      ]
+    ]
+  },
+  {
+    "id": "743406a2.17f9a",
+    "type": "execute",
+    "name": "get esr-thirdparty-sdnc",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
+    "comments": "",
+    "outputs": 1,
+    "x": 5057.400161743164,
+    "y": 2016.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "c6f1bea4.57dda",
+        "1229be89.7bda19",
+        "b62eac2a.e73c5"
+      ]
+    ]
+  },
+  {
+    "id": "2140dc16.b34c34",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4851.400161743164,
+    "y": 2082.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "348e5ae6.fa6196"
+      ]
+    ]
+  },
+  {
+    "id": "206cd74a.090e9",
+    "type": "set",
+    "name": "set esr-thirdparty-sdnc domainC id",
+    "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 5087.400161743164,
+    "y": 1964.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "348e5ae6.fa6196",
+    "type": "set",
+    "name": "set domainC ethernet layer network-id",
+    "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 5086.400161743164,
+    "y": 2206.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "c6f1bea4.57dda",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5267.400161743164,
+    "y": 2007.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "55a3e51f.c94c6c"
+      ]
+    ]
+  },
+  {
+    "id": "1229be89.7bda19",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5259.400161743164,
+    "y": 2062.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "dd96fb81.a1be5"
+      ]
+    ]
+  },
+  {
+    "id": "b62eac2a.e73c5",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5264.400161743164,
+    "y": 2119.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "367deba0.342ae4"
+      ]
+    ]
+  },
+  {
+    "id": "367deba0.342ae4",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+    "comments": "",
+    "x": 5416.400161743164,
+    "y": 2120.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "dd96fb81.a1be5",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+    "comments": "",
+    "x": 5427.400161743164,
+    "y": 2065.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "55a3e51f.c94c6c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5411.782485961914,
+    "y": 2004.7414855957031,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "37dd91fc.28526e"
+      ]
+    ]
+  },
+  {
+    "id": "37dd91fc.28526e",
+    "type": "set",
+    "name": "set controller domainC data",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
+    "comments": "",
+    "x": 5626.400161743164,
+    "y": 2001.0858154296875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "d0d8e8f0.a69bb8",
+    "type": "comment",
+    "name": "Create SECONDARY-ROOT UNI",
+    "info": "",
+    "comments": "",
+    "x": 5655.900161743164,
+    "y": 2123.852294921875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "98d8658a.1dab08",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5628.016860961914,
+    "y": 2172.968994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "420f2345.5b5d34"
+      ]
+    ]
+  },
+  {
+    "id": "420f2345.5b5d34",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5819.016860961914,
+    "y": 2176.968994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "661df626.a6b8e8"
+      ]
+    ]
+  },
+  {
+    "id": "661df626.a6b8e8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5946.016860961914,
+    "y": 2175.968994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "329453e7.3a09dc",
+        "8b47742b.726f38"
+      ]
+    ]
+  },
+  {
+    "id": "8b47742b.726f38",
+    "type": "save",
+    "name": "save SECONDARY-ROOT UNI in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6168.016860961914,
+    "y": 2064.968994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "329453e7.3a09dc",
+    "type": "switchNode",
+    "name": "switch 2-ROOTS in same domain?",
+    "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6163.900161743164,
+    "y": 2123.852294921875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "7670a585.4e8fa4",
+        "7f78162d.05f38"
+      ]
+    ]
+  },
+  {
+    "id": "7670a585.4e8fa4",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6373.900161743164,
+    "y": 2100.852294921875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "36156797.814718"
+      ]
+    ]
+  },
+  {
+    "id": "36156797.814718",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 6499.900161743164,
+    "y": 2100.852294921875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "c10b0555.a1cbe"
+      ]
+    ]
+  },
+  {
+    "id": "802f927b.0dcdb",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 6504.900161743164,
+    "y": 2149.852294921875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "2a6e1393.0f0b94",
+        "ec798eb.b40ea7",
+        "21b7fb79.312cdc",
+        "b8684fe1.88dea8"
+      ]
+    ]
+  },
+  {
+    "id": "7f78162d.05f38",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6378.900161743164,
+    "y": 2149.852294921875,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "802f927b.0dcdb"
+      ]
+    ]
+  },
+  {
+    "id": "c10b0555.a1cbe",
+    "type": "save",
+    "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 6827.900161743164,
+    "y": 2097.852294921875,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2a6e1393.0f0b94",
+    "type": "execute",
+    "name": "execute UUID generator for connectivity domainC",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6780.900161743164,
+    "y": 2188.852294921875,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ec798eb.b40ea7",
+    "type": "save",
+    "name": "save connectivity resource in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6728.900161743164,
+    "y": 2230.852294921875,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "21b7fb79.312cdc",
+    "type": "save",
+    "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
+    "comments": "",
+    "outputs": 1,
+    "x": 6857.900161743164,
+    "y": 2272.852294921875,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9b3b3d66.43cb88",
+    "type": "comment",
+    "name": "Create SECONDARY-ROOT connectivity",
+    "info": "",
+    "comments": "",
+    "x": 6743.900161743164,
+    "y": 2145.852294921875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "b8684fe1.88dea8",
+    "type": "save",
+    "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 6835.900161743164,
+    "y": 2320.852294921875,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d8f4cd5c.153e9",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6399.900161743164,
+    "y": 2817.65234375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "1ca77427.cfd00c"
+      ]
+    ]
+  },
+  {
+    "id": "1ca77427.cfd00c",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6591.900161743164,
+    "y": 2812.65234375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "d48a28e3.978788"
+      ]
+    ]
+  },
+  {
+    "id": "d48a28e3.978788",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 6720.900161743164,
+    "y": 2812.65234375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "cd4e9669.2bbe38"
+      ]
+    ]
+  },
+  {
+    "id": "cd4e9669.2bbe38",
+    "type": "save",
+    "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 7052.900161743164,
+    "y": 2810.65234375,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "96928e3.987df7",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5984.900161743164,
+    "y": 3029.65234375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "181572ea.9107d5"
+      ]
+    ]
+  },
+  {
+    "id": "181572ea.9107d5",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6164.900161743164,
+    "y": 3028.65234375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "8cd8419f.cb3a9"
+      ]
+    ]
+  },
+  {
+    "id": "8cd8419f.cb3a9",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 6293.900161743164,
+    "y": 3028.65234375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "d6cc041.8a7c3f8"
+      ]
+    ]
+  },
+  {
+    "id": "d6cc041.8a7c3f8",
+    "type": "switchNode",
+    "name": "switch 2-ROOTS in same domain?",
+    "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6511.783462524414,
+    "y": 3027.53564453125,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "b0604621.14aa3"
+      ]
+    ]
+  },
+  {
+    "id": "b0604621.14aa3",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6726.783462524414,
+    "y": 3027.53564453125,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "1b23239.265d75c"
+      ]
+    ]
+  },
+  {
+    "id": "1b23239.265d75c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 6858.783462524414,
+    "y": 3027.53564453125,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "e0661126.3d63c"
+      ]
+    ]
+  },
+  {
+    "id": "e0661126.3d63c",
+    "type": "save",
+    "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 7222.900161743164,
+    "y": 3026.65234375,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ba199ac4.fb848",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4955.399185180664,
+    "y": 2677.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "3b9234ec.069ca4"
+      ]
+    ]
+  },
+  {
+    "id": "3b9234ec.069ca4",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5135.399185180664,
+    "y": 2676.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "9eae322e.b63d4"
+      ]
+    ]
+  },
+  {
+    "id": "9eae322e.b63d4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5264.399185180664,
+    "y": 2676.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "d93117f0.529c08"
+      ]
+    ]
+  },
+  {
+    "id": "eef4e51b.ad8f08",
+    "type": "comment",
+    "name": "Update SECONDARY-ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 5000.399185180664,
+    "y": 2735.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "d93117f0.529c08",
+    "type": "save",
+    "name": "get S-root uni from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5030.399185180664,
+    "y": 2768.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "cef39c15.c2efe8",
+        "19cfaa23.53868e",
+        "3979c231.eba74e"
+      ]
+    ]
+  },
+  {
+    "id": "19cfaa23.53868e",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5211.890151977539,
+    "y": 2745.793212890625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "11983801.6e819"
+      ]
+    ]
+  },
+  {
+    "id": "3979c231.eba74e",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5200.399185180664,
+    "y": 2785.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "df1ec346.4539a"
+      ]
+    ]
+  },
+  {
+    "id": "11983801.6e819",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+    "comments": "",
+    "x": 5371.461685180664,
+    "y": 2744.078857421875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "df1ec346.4539a",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 5361.399185180664,
+    "y": 2786.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "cef39c15.c2efe8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5205.399185180664,
+    "y": 2822.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "ce54950d.a0123"
+      ]
+    ]
+  },
+  {
+    "id": "ce54950d.a0123",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5363.399185180664,
+    "y": 2830.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "f7f8d3b0.147e88",
+        "b341778e.b63ef8"
+      ]
+    ]
+  },
+  {
+    "id": "f7f8d3b0.147e88",
+    "type": "set",
+    "name": "set new bw",
+    "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
+    "comments": "",
+    "x": 5524.399185180664,
+    "y": 2762.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "b341778e.b63ef8",
+    "type": "save",
+    "name": "update S-ROOT UNI in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5566.399185180664,
+    "y": 2834.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "8414e4a1.38b9c8",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5042.399185180664,
+    "y": 3035.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "671d16b.b80a7e8"
+      ]
+    ]
+  },
+  {
+    "id": "671d16b.b80a7e8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5222.399185180664,
+    "y": 3034.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "119e2009.a17608"
+      ]
+    ]
+  },
+  {
+    "id": "119e2009.a17608",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5351.399185180664,
+    "y": 3034.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "473f5087.37a1e8"
+      ]
+    ]
+  },
+  {
+    "id": "5e936e89.558fa8",
+    "type": "comment",
+    "name": "Update SECONDARY-ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 5087.399185180664,
+    "y": 3093.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "473f5087.37a1e8",
+    "type": "save",
+    "name": "get S-root uni from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5117.399185180664,
+    "y": 3126.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "d9f85915.dda38",
+        "24241f4e.c44408",
+        "225969a9.a7207e"
+      ]
+    ]
+  },
+  {
+    "id": "24241f4e.c44408",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5298.890151977539,
+    "y": 3103.793212890625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "96c74d33.8dbf8"
+      ]
+    ]
+  },
+  {
+    "id": "225969a9.a7207e",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5287.399185180664,
+    "y": 3143.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "591af841.3626"
+      ]
+    ]
+  },
+  {
+    "id": "96c74d33.8dbf8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+    "comments": "",
+    "x": 5458.461685180664,
+    "y": 3102.078857421875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "591af841.3626",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 5448.399185180664,
+    "y": 3144.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "d9f85915.dda38",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5292.399185180664,
+    "y": 3180.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "211d205d.25f7f"
+      ]
+    ]
+  },
+  {
+    "id": "211d205d.25f7f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5450.399185180664,
+    "y": 3188.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "d0bfd54a.d36bc8",
+        "7dc2fca0.94494c"
+      ]
+    ]
+  },
+  {
+    "id": "d0bfd54a.d36bc8",
+    "type": "set",
+    "name": "set new bw",
+    "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
+    "comments": "",
+    "x": 5611.399185180664,
+    "y": 3120.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "7dc2fca0.94494c",
+    "type": "save",
+    "name": "update S-ROOT UNI in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5653.399185180664,
+    "y": 3192.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3f0ddd6.f3f1022",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3524.066665649414,
+    "y": 4617.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "358e9751.c712f"
+      ]
+    ]
+  },
+  {
+    "id": "358e9751.c712f",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3704.066665649414,
+    "y": 4616.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "6884e019.44294"
+      ]
+    ]
+  },
+  {
+    "id": "6884e019.44294",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3833.066665649414,
+    "y": 4616.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "5116cf4b.8d29a"
+      ]
+    ]
+  },
+  {
+    "id": "bd6b4020.6dbe8",
+    "type": "comment",
+    "name": "Update SECONDARY-ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 3569.066665649414,
+    "y": 4675.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "5116cf4b.8d29a",
+    "type": "save",
+    "name": "get S-root uni from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3599.066665649414,
+    "y": 4708.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "2e2530b5.6396c8",
+        "a3a43577.5b69d",
+        "ed68f855.e91bf8"
+      ]
+    ]
+  },
+  {
+    "id": "a3a43577.5b69d",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3780.557632446289,
+    "y": 4685.793212890625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "86842579.52f86"
+      ]
+    ]
+  },
+  {
+    "id": "ed68f855.e91bf8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3769.066665649414,
+    "y": 4725.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "73eac34a.dab10c"
+      ]
+    ]
+  },
+  {
+    "id": "86842579.52f86",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+    "comments": "",
+    "x": 3940.129165649414,
+    "y": 4684.078857421875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "73eac34a.dab10c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3930.066665649414,
+    "y": 4726.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "2e2530b5.6396c8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3774.066665649414,
+    "y": 4762.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "744d2f9d.2ccba"
+      ]
+    ]
+  },
+  {
+    "id": "744d2f9d.2ccba",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3932.066665649414,
+    "y": 4770.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "e108af78.2fc248",
+        "9bbc731d.e00988"
+      ]
+    ]
+  },
+  {
+    "id": "e108af78.2fc248",
+    "type": "set",
+    "name": "set new bw",
+    "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
+    "comments": "",
+    "x": 4093.066665649414,
+    "y": 4702.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "9bbc731d.e00988",
+    "type": "save",
+    "name": "update S-ROOT UNI in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4135.066665649414,
+    "y": 4774.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "75777f0a.fb1b9",
+    "type": "comment",
+    "name": "populate connectivity-C variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4215.733657836914,
+    "y": 5572.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "4f6ebd11.7928d4",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4370.733657836914,
+    "y": 5613.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "53cb53b2.198aa4",
+    "type": "switchNode",
+    "name": "switch found-secondary-root-connectivity",
+    "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4186.733657836914,
+    "y": 5671.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "7b1794a5.b1fc24",
+        "60cb3386.52366c"
+      ]
+    ]
+  },
+  {
+    "id": "7b1794a5.b1fc24",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4422.733657836914,
+    "y": 5655.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "d1b5ec1f.66461"
+      ]
+    ]
+  },
+  {
+    "id": "60cb3386.52366c",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4421.733657836914,
+    "y": 5703.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d1b5ec1f.66461",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4566.733657836914,
+    "y": 5657.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "2e676cc9.ce26a4",
+        "6e286f3d.8e0a28",
+        "e2964af9.ec57d8"
+      ]
+    ]
+  },
+  {
+    "id": "2e676cc9.ce26a4",
+    "type": "set",
+    "name": "set prop.connectivity-domainC-uuid",
+    "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
+    "comments": "",
+    "x": 4978.733901977539,
+    "y": 5792.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "6e286f3d.8e0a28",
+    "type": "save",
+    "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
+    "comments": "",
+    "outputs": 1,
+    "x": 5099.733901977539,
+    "y": 5839.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a459d12f.16fa1",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 4982.617691040039,
+    "y": 5883.102294921875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "e2964af9.ec57d8",
+    "type": "save",
+    "name": "update connectivity resource in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4981.400894165039,
+    "y": 5924.302490234375,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f2f8d85f.c68ad8",
+    "type": "comment",
+    "name": "populate connectivity-C variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4842.066665649414,
+    "y": 6178.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "9cfb7864.e0e548",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5008.066665649414,
+    "y": 6217.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "98761b9f.ff6118",
+    "type": "switchNode",
+    "name": "switch found-secondary-root-connectivity",
+    "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4847.066665649414,
+    "y": 6267.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "ebc03603.139de",
+        "22cd6c36.3aa1dc"
+      ]
+    ]
+  },
+  {
+    "id": "ebc03603.139de",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5080.066665649414,
+    "y": 6261.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "3bf7ac87.926a04"
+      ]
+    ]
+  },
+  {
+    "id": "22cd6c36.3aa1dc",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5081.066665649414,
+    "y": 6311.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3bf7ac87.926a04",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5227.066665649414,
+    "y": 6269.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "7682c7bc.9b0958",
+        "fc925053.188248",
+        "d17759a6.e157b"
+      ]
+    ]
+  },
+  {
+    "id": "7682c7bc.9b0958",
+    "type": "set",
+    "name": "set prop.connectivity-domainC-uuid",
+    "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
+    "comments": "",
+    "x": 5474.066665649414,
+    "y": 6257.218994140625,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "fc925053.188248",
+    "type": "save",
+    "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
+    "comments": "",
+    "outputs": 1,
+    "x": 5595.066665649414,
+    "y": 6304.218994140625,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a868892a.829a98",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 5477.950454711914,
+    "y": 6348.102294921875,
+    "z": "9718fe15.98603",
+    "wires": []
+  },
+  {
+    "id": "d17759a6.e157b",
+    "type": "save",
+    "name": "update connectivity resource in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5476.733657836914,
+    "y": 6389.302490234375,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b6de4106.8135",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3604.066665649414,
+    "y": 6162.652587890625,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "37dc60ca.62221",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2941.316665649414,
+    "y": 6160.902587890625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "196d7b7.c07cd85",
+        "bc377eb3.be507"
+      ]
+    ]
+  },
+  {
+    "id": "196d7b7.c07cd85",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3132.316665649414,
+    "y": 6164.902587890625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "65fedbab.47a65c"
+      ]
+    ]
+  },
+  {
+    "id": "65fedbab.47a65c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3259.316665649414,
+    "y": 6163.902587890625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "b6de4106.8135"
+      ]
+    ]
+  },
+  {
+    "id": "bc377eb3.be507",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3128.316665649414,
+    "y": 6234.902587890625,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "e0efce2f.f6bfe"
+      ]
+    ]
+  },
+  {
+    "id": "7ecde40.b1b951c",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3677.816665649414,
+    "y": 6233.986083984375,
+    "z": "9718fe15.98603",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e0efce2f.f6bfe",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3261.816665649414,
+    "y": 6236.986083984375,
+    "z": "9718fe15.98603",
+    "wires": [
+      [
+        "7ecde40.b1b951c"
+      ]
+    ]
   }
 ]
\ No newline at end of file