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;fp=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json;h=6b46d3262f52ff57dac24e471ce2e3499a868bec;hb=a6c6776d93ee0ec6bd8aefa23ac107262cf93154;hp=19a9e993c5f7fa2184783f8d2a1bafcbc99b2b6b;hpb=b0ec399c096b8d4ccdd5adff17fd4fd59d0f72d1;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 19a9e993..6b46d326 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": "2f28023e.39f0ce",
+    "id": "9b0ef60b.7214f",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 96.5,
-    "y": 107,
-    "z": "4138d8f7.da252",
+    "x": 179.56666564941406,
+    "y": 189.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "73cc7959.44f0a"
+        "fb71b372.446598"
       ]
     ]
   },
   {
-    "id": "73cc7959.44f0a",
+    "id": "fb71b372.446598",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,10540 +22,10540 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 380.7856903076172,
-    "y": 168.23810863494873,
-    "z": "4138d8f7.da252",
+    "x": 463.85235595703125,
+    "y": 250.52385997772217,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "22ecaa15.62efee"
+        "661c7873.62c16"
       ]
     ]
   },
   {
-    "id": "22ecaa15.62efee",
+    "id": "661c7873.62c16",
     "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": 386.92860412597656,
-    "y": 253.00003051757812,
-    "z": "4138d8f7.da252",
+    "x": 469.9952697753906,
+    "y": 335.28578186035156,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c060beae.bc9e28"
+        "f0354603.74586"
       ]
     ]
   },
   {
-    "id": "c060beae.bc9e28",
+    "id": "f0354603.74586",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 736.5,
-    "y": 312,
-    "z": "4138d8f7.da252",
+    "x": 819.5666656494141,
+    "y": 394.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "915751c1.614528",
-        "36f6973a.34e678",
-        "493b4ec5.6de3"
+        "729f4799.a6df6",
+        "82d86696.e8f5a",
+        "381a9eda.91673a"
       ]
     ]
   },
   {
-    "id": "915751c1.614528",
+    "id": "729f4799.a6df6",
     "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": 1037.83349609375,
-    "y": 582.9302978515625,
-    "z": "4138d8f7.da252",
+    "x": 1120.900161743164,
+    "y": 665.2160491943359,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "36f6973a.34e678",
+    "id": "82d86696.e8f5a",
     "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": 1059.261962890625,
-    "y": 285.33331298828125,
-    "z": "4138d8f7.da252",
+    "x": 1142.328628540039,
+    "y": 367.6190643310547,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "488c3b3e.f19244",
-        "775f6bb9.6a72cc",
-        "cd7c45c1.b6f318"
+        "19e3f412.c2895c",
+        "22e3b9e.2e85d46",
+        "d1fd3935.e60aa8"
       ]
     ]
   },
   {
-    "id": "488c3b3e.f19244",
+    "id": "19e3f412.c2895c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1284.261962890625,
-    "y": 143.33331298828125,
-    "z": "4138d8f7.da252",
+    "x": 1367.328628540039,
+    "y": 225.6190643310547,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "86fe6a1f.5037f8"
+        "bdfafca5.bdc978"
       ]
     ]
   },
   {
-    "id": "775f6bb9.6a72cc",
+    "id": "22e3b9e.2e85d46",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1279.7529296875,
-    "y": 212.9073486328125,
-    "z": "4138d8f7.da252",
+    "x": 1362.819595336914,
+    "y": 295.19309997558594,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "de07150f.9aa728"
+        "f555968c.0ca438"
       ]
     ]
   },
   {
-    "id": "cd7c45c1.b6f318",
+    "id": "d1fd3935.e60aa8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1268.261962890625,
-    "y": 259.33331298828125,
-    "z": "4138d8f7.da252",
+    "x": 1351.328628540039,
+    "y": 341.6190643310547,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "45b0306e.39dc08"
+        "cd958c5e.148ca8"
       ]
     ]
   },
   {
-    "id": "354c5c1b.22efdc",
+    "id": "60f90238.97edc4",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1038.261962890625,
-    "y": 173.33331298828125,
-    "z": "4138d8f7.da252",
+    "x": 1121.328628540039,
+    "y": 255.6190643310547,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "493b4ec5.6de3",
+    "id": "381a9eda.91673a",
     "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": 1026.261962890625,
-    "y": 225.33331298828125,
-    "z": "4138d8f7.da252",
+    "x": 1109.328628540039,
+    "y": 307.6190643310547,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "86fe6a1f.5037f8",
+    "id": "bdfafca5.bdc978",
     "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": 1524.5,
-    "y": 140,
-    "z": "4138d8f7.da252",
+    "x": 1607.566665649414,
+    "y": 222.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ee0543f9.1cf788",
-        "5497352b.e1aeec"
+        "1d20e341.a27c1d",
+        "5ce58924.9a36f"
       ]
     ]
   },
   {
-    "id": "de07150f.9aa728",
+    "id": "f555968c.0ca438",
     "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": 1434.5623779296875,
-    "y": 215.85977172851562,
-    "z": "4138d8f7.da252",
+    "x": 1517.6290435791016,
+    "y": 298.14552307128906,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "45b0306e.39dc08",
+    "id": "cd958c5e.148ca8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1438.5,
-    "y": 260,
-    "z": "4138d8f7.da252",
+    "x": 1521.566665649414,
+    "y": 342.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ee0543f9.1cf788",
+    "id": "1d20e341.a27c1d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1729.5,
-    "y": 177,
-    "z": "4138d8f7.da252",
+    "x": 1812.566665649414,
+    "y": 259.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6345f4d0.12f85c"
+        "e28a7a1e.c07b78"
       ]
     ]
   },
   {
-    "id": "5497352b.e1aeec",
+    "id": "5ce58924.9a36f",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1739.5,
-    "y": 104,
-    "z": "4138d8f7.da252",
+    "x": 1822.566665649414,
+    "y": 186.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "6345f4d0.12f85c",
+    "id": "e28a7a1e.c07b78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1722.5,
-    "y": 252,
-    "z": "4138d8f7.da252",
+    "x": 1805.566665649414,
+    "y": 334.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c2cf8029.375a4",
-        "3a106a22.349b86",
-        "f24d529e.b55f9",
-        "26407648.4cfd4a",
-        "5e06fc8.b063184"
+        "fd95487b.da105",
+        "526e7fc2.050288",
+        "a11cf219.9bf18",
+        "8ac4fdd4.d603a8",
+        "c717d5f4.4fddc8"
       ]
     ]
   },
   {
-    "id": "34fb97ab.b3686",
+    "id": "324358a6.ea813",
     "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": 2208.5,
-    "y": 303,
-    "z": "4138d8f7.da252",
+    "x": 2291.566665649414,
+    "y": 385.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4a2e58a2.751648",
-        "c91e93c5.362468",
-        "ad2e905e.658598"
+        "6086efb9.edfcd",
+        "9b93dfe7.0d77",
+        "a7f7b2f5.24504"
       ]
     ]
   },
   {
-    "id": "4a2e58a2.751648",
+    "id": "6086efb9.edfcd",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2424.5,
-    "y": 370,
-    "z": "4138d8f7.da252",
+    "x": 2507.566665649414,
+    "y": 452.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2d931b81.0000fc"
+        "a12dc51a.620ef"
       ]
     ]
   },
   {
-    "id": "c91e93c5.362468",
+    "id": "9b93dfe7.0d77",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2424.990966796875,
-    "y": 269.573974609375,
-    "z": "4138d8f7.da252",
+    "x": 2508.057632446289,
+    "y": 351.85972595214844,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2c737e52.6b21f2"
+        "adc977fa.7cd608"
       ]
     ]
   },
   {
-    "id": "ad2e905e.658598",
+    "id": "a7f7b2f5.24504",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2420.5,
-    "y": 319,
-    "z": "4138d8f7.da252",
+    "x": 2503.566665649414,
+    "y": 401.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "81005112.39dbe"
+        "4d4bdb5a.3763ac"
       ]
     ]
   },
   {
-    "id": "c2cf8029.375a4",
+    "id": "fd95487b.da105",
     "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": 1925.5,
-    "y": 284,
-    "z": "4138d8f7.da252",
+    "x": 2008.566665649414,
+    "y": 366.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9843a.b676f3c68",
-        "34fb97ab.b3686",
-        "cf6d7172.69b4b8",
-        "326038f4.f291a"
+        "cc186f28.ba2c9",
+        "324358a6.ea813",
+        "ab78fc6f.8a0998",
+        "1e0dcc9a.c7d15b"
       ]
     ]
   },
   {
-    "id": "9843a.b676f3c68",
+    "id": "cc186f28.ba2c9",
     "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": 2205.5,
-    "y": 222,
-    "z": "4138d8f7.da252",
+    "x": 2288.566665649414,
+    "y": 304.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "26407648.4cfd4a",
+    "id": "8ac4fdd4.d603a8",
     "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": 1899.5,
-    "y": 234,
-    "z": "4138d8f7.da252",
+    "x": 1982.566665649414,
+    "y": 316.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3a106a22.349b86",
+    "id": "526e7fc2.050288",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1942.5,
-    "y": 93,
-    "z": "4138d8f7.da252",
+    "x": 2025.566665649414,
+    "y": 175.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f24d529e.b55f9",
+    "id": "a11cf219.9bf18",
     "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": 1954.5,
-    "y": 134,
-    "z": "4138d8f7.da252",
+    "x": 2037.566665649414,
+    "y": 216.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "a7bf0e61.b8215",
+    "id": "2d1a927f.4e32b6",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 1979.5,
-    "y": 46,
-    "z": "4138d8f7.da252",
+    "x": 2062.566665649414,
+    "y": 128.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "68130b3.2f48af4",
+    "id": "9e25d87e.938588",
     "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": 1899.5,
-    "y": 180,
-    "z": "4138d8f7.da252",
+    "x": 1982.566665649414,
+    "y": 262.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2c737e52.6b21f2",
+    "id": "adc977fa.7cd608",
     "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": 2603.5,
-    "y": 272,
-    "z": "4138d8f7.da252",
+    "x": 2686.566665649414,
+    "y": 354.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "81005112.39dbe",
+    "id": "4d4bdb5a.3763ac",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2603.4375,
-    "y": 321.1402587890625,
-    "z": "4138d8f7.da252",
+    "x": 2686.504165649414,
+    "y": 403.42601013183594,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2d931b81.0000fc",
+    "id": "a12dc51a.620ef",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2605.4375,
-    "y": 372.1402587890625,
-    "z": "4138d8f7.da252",
+    "x": 2688.504165649414,
+    "y": 454.42601013183594,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4511b10b.b4e2e8"
+        "e28b2f59.3a0188"
       ]
     ]
   },
   {
-    "id": "4511b10b.b4e2e8",
+    "id": "e28b2f59.3a0188",
     "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": 2940.4375,
-    "y": 141.14027404785156,
-    "z": "4138d8f7.da252",
+    "x": 3023.504165649414,
+    "y": 223.426025390625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9fb16699.1235d",
-        "da567395.79b6d8",
-        "8ed0fbe8.03e31"
+        "5b54194d.44ebe",
+        "aebf4283.d1be78",
+        "4cc0a7b0.54364"
       ]
     ]
   },
   {
-    "id": "da567395.79b6d8",
+    "id": "aebf4283.d1be78",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3213.928466796875,
-    "y": 33.71424865722656,
-    "z": "4138d8f7.da252",
+    "x": 3296.995132446289,
+    "y": 116,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1dbb6caf.82e0eb"
+        "bfbb6bff.50e7e8"
       ]
     ]
   },
   {
-    "id": "1dbb6caf.82e0eb",
+    "id": "bfbb6bff.50e7e8",
     "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": 3391.5,
-    "y": 34.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3474.566665649414,
+    "y": 116.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8ed0fbe8.03e31",
+    "id": "4cc0a7b0.54364",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3209.4375,
-    "y": 83.14027404785156,
-    "z": "4138d8f7.da252",
+    "x": 3292.504165649414,
+    "y": 165.426025390625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1a97687b.99c02"
+        "8ce95b42.618ca8"
       ]
     ]
   },
   {
-    "id": "1a97687b.99c02",
+    "id": "8ce95b42.618ca8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3391.4375,
-    "y": 83.14027404785156,
-    "z": "4138d8f7.da252",
+    "x": 3474.504165649414,
+    "y": 165.426025390625,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9fb16699.1235d",
+    "id": "5b54194d.44ebe",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3213.4375,
-    "y": 134.14027404785156,
-    "z": "4138d8f7.da252",
+    "x": 3296.504165649414,
+    "y": 216.426025390625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "470c276f.ad2f08"
+        "6f465aa6.4f1ee4"
       ]
     ]
   },
   {
-    "id": "470c276f.ad2f08",
+    "id": "6f465aa6.4f1ee4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3393.4375,
-    "y": 134.14027404785156,
-    "z": "4138d8f7.da252",
+    "x": 3476.504165649414,
+    "y": 216.426025390625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ece8c0f8.d3abf8"
+        "7a127cf4.cf8b34"
       ]
     ]
   },
   {
-    "id": "ece8c0f8.d3abf8",
+    "id": "7a127cf4.cf8b34",
     "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": 2959.5,
-    "y": 269.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3042.566665649414,
+    "y": 351.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "dba346c3.39c8a8",
-        "4ccdd4a0.9c665c"
+        "9cc4aaf6.859c",
+        "9d86e661.45c7f"
       ]
     ]
   },
   {
-    "id": "4ccdd4a0.9c665c",
+    "id": "9d86e661.45c7f",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3269.5,
-    "y": 276.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3352.566665649414,
+    "y": 358.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "dba346c3.39c8a8",
+    "id": "9cc4aaf6.859c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3268.5,
-    "y": 330.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3351.566665649414,
+    "y": 412.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e2cad6e.ad95028"
+        "c9c4f2a.9305f9"
       ]
     ]
   },
   {
-    "id": "fde9905b.0e0dc",
+    "id": "af10f438.0ffb48",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4013.5,
-    "y": 284.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 4096.566665649414,
+    "y": 366.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "be0ed66c.68b118"
+        "96cf18f1.1cad5"
       ]
     ]
   },
   {
-    "id": "be0ed66c.68b118",
+    "id": "96cf18f1.1cad5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4190.4998779296875,
-    "y": 276.99989318847656,
-    "z": "4138d8f7.da252",
+    "x": 4273.566543579102,
+    "y": 359.28564453125,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1aebcc98.e81703",
-        "a36c8474.3e9148"
+        "c590372d.ec562",
+        "d84bff3f.0a18c8"
       ]
     ]
   },
   {
-    "id": "e2cad6e.ad95028",
+    "id": "c9c4f2a.9305f9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3432.5,
-    "y": 256.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3515.566665649414,
+    "y": 338.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f52b5162.d3155",
-        "28c7d65.67fb0aa"
+        "ec6a7a84.d65408",
+        "7d25e53c.8a468c"
       ]
     ]
   },
   {
-    "id": "f52b5162.d3155",
+    "id": "ec6a7a84.d65408",
     "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": 3713.5,
-    "y": 212.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3796.566665649414,
+    "y": 294.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "40678a93.0b11fc"
+        "7204f6fc.5ab2"
       ]
     ]
   },
   {
-    "id": "40678a93.0b11fc",
+    "id": "7204f6fc.5ab2",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3975.5,
-    "y": 212.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 4058.566665649414,
+    "y": 294.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "fde9905b.0e0dc"
+        "af10f438.0ffb48"
       ]
     ]
   },
   {
-    "id": "1aebcc98.e81703",
+    "id": "c590372d.ec562",
     "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": 4433.4998779296875,
-    "y": 233.99989318847656,
-    "z": "4138d8f7.da252",
+    "x": 4516.566543579102,
+    "y": 316.28564453125,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a36c8474.3e9148",
+    "id": "d84bff3f.0a18c8",
     "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": 4422.4998779296875,
-    "y": 288.99989318847656,
-    "z": "4138d8f7.da252",
+    "x": 4505.566543579102,
+    "y": 371.28564453125,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f4703396.8f997",
-        "c4863aea.39d3c",
-        "3f105248.ebf0a6"
+        "bcf7cb3d.813c08",
+        "241d629e.3937f6",
+        "ab4a02d2.dd63f8"
       ]
     ]
   },
   {
-    "id": "3f105248.ebf0a6",
+    "id": "ab4a02d2.dd63f8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4753.5,
-    "y": 197,
-    "z": "4138d8f7.da252",
+    "x": 4836.566665649414,
+    "y": 279.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f39e3f38.4d2868"
+        "6fe3d858.7ad19"
       ]
     ]
   },
   {
-    "id": "f39e3f38.4d2868",
+    "id": "6fe3d858.7ad19",
     "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": 4902.071533203125,
-    "y": 197.2857666015625,
-    "z": "4138d8f7.da252",
+    "x": 4985.138198852539,
+    "y": 279.57151794433594,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9b475b7a.781198",
+    "id": "3cab2fad.4b6d28",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4901.009033203125,
-    "y": 241.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 4984.075698852539,
+    "y": 323.71177673339844,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c4863aea.39d3c",
+    "id": "241d629e.3937f6",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4742.009033203125,
-    "y": 241.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 4825.075698852539,
+    "y": 323.71177673339844,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9b475b7a.781198"
+        "3cab2fad.4b6d28"
       ]
     ]
   },
   {
-    "id": "f4703396.8f997",
+    "id": "bcf7cb3d.813c08",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4749.009033203125,
-    "y": 320.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 4832.075698852539,
+    "y": 402.71177673339844,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a4728a38.a45e8"
+        "c61a87d8.32a11"
       ]
     ]
   },
   {
-    "id": "a4728a38.a45e8",
+    "id": "c61a87d8.32a11",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4888.009033203125,
-    "y": 320.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 4971.075698852539,
+    "y": 402.71177673339844,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6805f17a.2a0698",
-        "a9ae4e95.32ef88"
+        "ab565ac9.d97978",
+        "cf0bc947.03a4d"
       ]
     ]
   },
   {
-    "id": "6805f17a.2a0698",
+    "id": "ab565ac9.d97978",
     "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": 5093.5,
-    "y": 318,
-    "z": "4138d8f7.da252",
+    "x": 5176.566665649414,
+    "y": 400.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a9ae4e95.32ef88",
+    "id": "cf0bc947.03a4d",
     "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": 5092.5,
-    "y": 364,
-    "z": "4138d8f7.da252",
+    "x": 5175.566665649414,
+    "y": 446.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "28c7d65.67fb0aa",
+    "id": "7d25e53c.8a468c",
     "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": 3530.5,
-    "y": 328.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3613.566665649414,
+    "y": 410.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ebdf975.aa03968"
+        "95ed8dc.322967"
       ]
     ]
   },
   {
-    "id": "ebdf975.aa03968",
+    "id": "95ed8dc.322967",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3810.5,
-    "y": 328.00001525878906,
-    "z": "4138d8f7.da252",
+    "x": 3893.566665649414,
+    "y": 410.2857666015625,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3f67ae4e.a2076a"
+        "e85bd9f4.7a28d"
       ]
     ]
   },
   {
-    "id": "3f67ae4e.a2076a",
+    "id": "e85bd9f4.7a28d",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2181.5001220703125,
-    "y": 759.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 2264.5667877197266,
+    "y": 841.2858734130859,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f83af2f7.dfb288"
+        "53210c7d.ec4f8c"
       ]
     ]
   },
   {
-    "id": "f83af2f7.dfb288",
+    "id": "53210c7d.ec4f8c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2358.5,
-    "y": 752,
-    "z": "4138d8f7.da252",
+    "x": 2441.566665649414,
+    "y": 834.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a0742463.c2c6f8",
-        "25034b30.dd6634"
+        "6d10b617.947758",
+        "dd67d7f2.9348e"
       ]
     ]
   },
   {
-    "id": "a0742463.c2c6f8",
+    "id": "6d10b617.947758",
     "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": 2601.5,
-    "y": 709,
-    "z": "4138d8f7.da252",
+    "x": 2684.566665649414,
+    "y": 791.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "25034b30.dd6634",
+    "id": "dd67d7f2.9348e",
     "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": 2590.5,
-    "y": 764,
-    "z": "4138d8f7.da252",
+    "x": 2673.566665649414,
+    "y": 846.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b3267bc2.0ab17",
-        "e3342c37.4e1e3",
-        "349e46c.d16cb3a"
+        "7e4e9434.83a0d4",
+        "9cee4acb.003668",
+        "47c07099.1b14a8"
       ]
     ]
   },
   {
-    "id": "b3267bc2.0ab17",
+    "id": "7e4e9434.83a0d4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2881.990966796875,
-    "y": 742.573974609375,
-    "z": "4138d8f7.da252",
+    "x": 2965.057632446289,
+    "y": 824.8597259521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "504883f4.bc132c"
+        "bc050886.d2a05"
       ]
     ]
   },
   {
-    "id": "e3342c37.4e1e3",
+    "id": "9cee4acb.003668",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2870.5,
-    "y": 787,
-    "z": "4138d8f7.da252",
+    "x": 2953.566665649414,
+    "y": 869.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6ff791fd.bff34"
+        "c31212b9.83f5f8"
       ]
     ]
   },
   {
-    "id": "504883f4.bc132c",
+    "id": "bc050886.d2a05",
     "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": 3030.5625,
-    "y": 742.8597412109375,
-    "z": "4138d8f7.da252",
+    "x": 3113.629165649414,
+    "y": 825.1454925537109,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6ff791fd.bff34",
+    "id": "c31212b9.83f5f8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3029.5,
-    "y": 787,
-    "z": "4138d8f7.da252",
+    "x": 3112.566665649414,
+    "y": 869.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "349e46c.d16cb3a",
+    "id": "47c07099.1b14a8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2877.5,
-    "y": 866,
-    "z": "4138d8f7.da252",
+    "x": 2960.566665649414,
+    "y": 948.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "947e25fa.d00b28"
+        "a66b0cd4.00b53"
       ]
     ]
   },
   {
-    "id": "947e25fa.d00b28",
+    "id": "a66b0cd4.00b53",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3016.5,
-    "y": 866,
-    "z": "4138d8f7.da252",
+    "x": 3099.566665649414,
+    "y": 948.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b5aabe11.88e5f",
-        "8b8aaeb1.46c568",
-        "32905edb.461e7a",
-        "2f0ef70c.178628",
-        "6eaf37e0.1fb3a8",
-        "1abb3e71.7e1362",
-        "29e42279.9aaa7e",
-        "363ba934.edbd4e",
-        "ec67f0f.b56539",
-        "631e76e1.71afc",
-        "b17f4ff2.75d93",
-        "8048035e.723ef",
-        "d590aba5.94aa48",
-        "44b9c5d0.dda044",
-        "46e10049.e35348",
-        "f55201f.0be188",
-        "6834572.668ee28",
-        "fa7f428c.6d6b2",
-        "8c5d257.6a579d8"
+        "628231dc.fe1998",
+        "40f53355.15a3d4",
+        "6e7728cd.6d606",
+        "591f4762.52be1",
+        "72ab083b.a6528",
+        "be414195.9b77c",
+        "8abc6705.827928",
+        "5f587418.c46734",
+        "da60761c.d9f04",
+        "fd9bd7ab.c92bd8",
+        "b37c5dee.6ca208",
+        "1bc9df09.d67e59",
+        "6e895a21.1d4594",
+        "707a9dca.527c64",
+        "9cc0dadb.189ef",
+        "e9c6a99.90dcbd8",
+        "4a92500a.dfe688",
+        "25934f35.38edd",
+        "77f3463a.2b447"
       ]
     ]
   },
   {
-    "id": "479d6fca.4b7c8",
+    "id": "b0809281.c581e8",
     "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": 3328.5,
-    "y": 416,
-    "z": "4138d8f7.da252",
+    "x": 3411.566665649414,
+    "y": 498.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "b5aabe11.88e5f",
+    "id": "628231dc.fe1998",
     "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": 3315.4998779296875,
-    "y": 508,
-    "z": "4138d8f7.da252",
+    "x": 3398.5665435791016,
+    "y": 590.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "44b9c5d0.dda044",
+    "id": "707a9dca.527c64",
     "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": 3272.4998779296875,
-    "y": 553,
-    "z": "4138d8f7.da252",
+    "x": 3355.5665435791016,
+    "y": 635.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8b8aaeb1.46c568",
+    "id": "40f53355.15a3d4",
     "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": 3247.4998779296875,
-    "y": 616,
-    "z": "4138d8f7.da252",
+    "x": 3330.5665435791016,
+    "y": 698.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "32905edb.461e7a",
+    "id": "6e7728cd.6d606",
     "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": 3248.4998779296875,
-    "y": 671,
-    "z": "4138d8f7.da252",
+    "x": 3331.5665435791016,
+    "y": 753.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2f0ef70c.178628",
+    "id": "591f4762.52be1",
     "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": 3264.4998779296875,
-    "y": 719,
-    "z": "4138d8f7.da252",
+    "x": 3347.5665435791016,
+    "y": 801.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "99eab0f2.3508c",
-        "1b8f4bea.ec5e94",
-        "fc9653f8.4449d"
+        "6d204f19.ffc268",
+        "1689d04b.d0aa98",
+        "34ef36cb.86ebd2"
       ]
     ]
   },
   {
-    "id": "6eaf37e0.1fb3a8",
+    "id": "72ab083b.a6528",
     "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": 3259.5,
-    "y": 785.9998779296875,
-    "z": "4138d8f7.da252",
+    "x": 3342.566665649414,
+    "y": 868.2856292724609,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e805b604.ab84e",
-        "a86f3b5b.e29e1",
-        "cbb70d3d.0ef6a"
+        "a5360717.582308",
+        "a764163a.8df268",
+        "84d2b76f.25f11"
       ]
     ]
   },
   {
-    "id": "99eab0f2.3508c",
+    "id": "6d204f19.ffc268",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3505.5,
-    "y": 547,
-    "z": "4138d8f7.da252",
+    "x": 3588.566665649414,
+    "y": 629.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d6e995cd.85fc"
+        "424235f5.63bc3c"
       ]
     ]
   },
   {
-    "id": "1b8f4bea.ec5e94",
+    "id": "1689d04b.d0aa98",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3501.009033203125,
-    "y": 596.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 3584.075698852539,
+    "y": 678.7117767333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e5161935.335138"
+        "3044babb.9a7f0e"
       ]
     ]
   },
   {
-    "id": "fc9653f8.4449d",
+    "id": "34ef36cb.86ebd2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3505.009033203125,
-    "y": 649.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 3588.075698852539,
+    "y": 731.7117767333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "867b315e.a11f4"
+        "e8786087.fc4a5"
       ]
     ]
   },
   {
-    "id": "d6e995cd.85fc",
+    "id": "424235f5.63bc3c",
     "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": 3654.071533203125,
-    "y": 546.2857666015625,
-    "z": "4138d8f7.da252",
+    "x": 3737.138198852539,
+    "y": 628.5715179443359,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e5161935.335138",
+    "id": "3044babb.9a7f0e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3644.009033203125,
-    "y": 596.426025390625,
-    "z": "4138d8f7.da252",
+    "x": 3727.075698852539,
+    "y": 678.7117767333984,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e805b604.ab84e",
+    "id": "a5360717.582308",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3509.5,
-    "y": 702.9998779296875,
-    "z": "4138d8f7.da252",
+    "x": 3592.566665649414,
+    "y": 785.2856292724609,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f25db7d5.d2a2a"
+        "d832daa6.408e"
       ]
     ]
   },
   {
-    "id": "a86f3b5b.e29e1",
+    "id": "a764163a.8df268",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3505.009033203125,
-    "y": 752.4259033203125,
-    "z": "4138d8f7.da252",
+    "x": 3588.075698852539,
+    "y": 834.7116546630859,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "86e45032.893578"
+        "b0e5525.e8ef43"
       ]
     ]
   },
   {
-    "id": "cbb70d3d.0ef6a",
+    "id": "84d2b76f.25f11",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3488.009033203125,
-    "y": 800.4259033203125,
-    "z": "4138d8f7.da252",
+    "x": 3571.075698852539,
+    "y": 882.7116546630859,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "20619d71.889cda"
+        "8b568989.b50038"
       ]
     ]
   },
   {
-    "id": "f25db7d5.d2a2a",
+    "id": "d832daa6.408e",
     "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": 3658.071533203125,
-    "y": 702.28564453125,
-    "z": "4138d8f7.da252",
+    "x": 3741.138198852539,
+    "y": 784.5713958740234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "86e45032.893578",
+    "id": "b0e5525.e8ef43",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3648.009033203125,
-    "y": 752.4259033203125,
-    "z": "4138d8f7.da252",
+    "x": 3731.075698852539,
+    "y": 834.7116546630859,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "867b315e.a11f4",
+    "id": "e8786087.fc4a5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3666.5,
-    "y": 649,
-    "z": "4138d8f7.da252",
+    "x": 3749.566665649414,
+    "y": 731.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2bd95045.b71158"
+        "66efb3a1.9fe73c"
       ]
     ]
   },
   {
-    "id": "20619d71.889cda",
+    "id": "8b568989.b50038",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3641.5,
-    "y": 799.9998779296875,
-    "z": "4138d8f7.da252",
+    "x": 3724.566665649414,
+    "y": 882.2856292724609,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "41de01b2.960a08"
+        "26894e1f.239b9a"
       ]
     ]
   },
   {
-    "id": "2bd95045.b71158",
+    "id": "66efb3a1.9fe73c",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3838.5,
-    "y": 649,
-    "z": "4138d8f7.da252",
+    "x": 3921.566665649414,
+    "y": 731.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6f8555c6.ec1a0c",
-        "994a0acf.d3aed8",
-        "26a90c3.2a56674"
+        "a22f1b0d.edd33",
+        "ab951b61.cb4cb8",
+        "79c99b01.4060a4"
       ]
     ]
   },
   {
-    "id": "41de01b2.960a08",
+    "id": "26894e1f.239b9a",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3833.5,
-    "y": 734,
-    "z": "4138d8f7.da252",
+    "x": 3916.566665649414,
+    "y": 816.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4b5b1a17.b9df6c",
-        "d7a475f3.ea12c",
-        "16154f9d.14a3b"
+        "a2c3d250.fc00d",
+        "aa59cf58.a145d8",
+        "fb5e94da.526bd"
       ]
     ]
   },
   {
-    "id": "6f8555c6.ec1a0c",
+    "id": "a22f1b0d.edd33",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3999.49951171875,
-    "y": 385,
-    "z": "4138d8f7.da252",
+    "x": 4082.566177368164,
+    "y": 467.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "62760f41.c93a2"
+        "2bc1e64e.d59032"
       ]
     ]
   },
   {
-    "id": "994a0acf.d3aed8",
+    "id": "ab951b61.cb4cb8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4001.49951171875,
-    "y": 439,
-    "z": "4138d8f7.da252",
+    "x": 4084.566177368164,
+    "y": 521.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "273e3fee.2bc13"
+        "453522b8.5dbac4"
       ]
     ]
   },
   {
-    "id": "4b5b1a17.b9df6c",
+    "id": "a2c3d250.fc00d",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4014.499267578125,
-    "y": 607,
-    "z": "4138d8f7.da252",
+    "x": 4097.565933227539,
+    "y": 689.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "244a1c4c.c64574"
+        "f5a4f507.86b44"
       ]
     ]
   },
   {
-    "id": "d7a475f3.ea12c",
+    "id": "aa59cf58.a145d8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4016.499267578125,
-    "y": 661,
-    "z": "4138d8f7.da252",
+    "x": 4099.565933227539,
+    "y": 743.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f48105e4.f03428"
+        "8148cd30.75333"
       ]
     ]
   },
   {
-    "id": "92f3b868.34ce6",
+    "id": "fcdd9b76.8fa5f8",
     "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": 4309.49951171875,
-    "y": 337,
-    "z": "4138d8f7.da252",
+    "x": 4392.566177368164,
+    "y": 419.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b6002239.68b828",
+    "id": "a44710c1.f4b4c8",
     "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": 4302.49951171875,
-    "y": 435,
-    "z": "4138d8f7.da252",
+    "x": 4385.566177368164,
+    "y": 517.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "55137534.cd97cc",
+    "id": "5b86250b.1183b4",
     "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": 4378.499267578125,
-    "y": 634,
-    "z": "4138d8f7.da252",
+    "x": 4461.565933227539,
+    "y": 716.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ba173e3c.d3cf48",
+    "id": "154b4953.ab9fcf",
     "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": 4382.499267578125,
-    "y": 727,
-    "z": "4138d8f7.da252",
+    "x": 4465.565933227539,
+    "y": 809.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "4d8d5caa.cdd3ac",
+    "id": "3bb3037a.178754",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3460.5,
-    "y": 1150,
-    "z": "4138d8f7.da252",
+    "x": 3543.566665649414,
+    "y": 1232.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6c40f2a8.47da04"
+        "10e4f75f.914479"
       ]
     ]
   },
   {
-    "id": "f63967f8.5c1d2",
+    "id": "8000d000.35dfa8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3469.990966796875,
-    "y": 1192.5740356445312,
-    "z": "4138d8f7.da252",
+    "x": 3553.057632446289,
+    "y": 1274.8597869873047,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cba887b8.3ba25"
+        "c201e6b8.a3178"
       ]
     ]
   },
   {
-    "id": "f4c1be52.25da4",
+    "id": "89805004.2ac398",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3458.5,
-    "y": 1239,
-    "z": "4138d8f7.da252",
+    "x": 3541.566665649414,
+    "y": 1321.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "43b1688f.a5b798"
+        "f43a00.5422b6"
       ]
     ]
   },
   {
-    "id": "f87008d1.14dd28",
+    "id": "7d1a072.a69ea78",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3160.5,
-    "y": 1112,
-    "z": "4138d8f7.da252",
+    "x": 3243.566665649414,
+    "y": 1194.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "29e42279.9aaa7e",
+    "id": "8abc6705.827928",
     "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": 3203.5,
-    "y": 1177,
-    "z": "4138d8f7.da252",
+    "x": 3286.566665649414,
+    "y": 1259.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4d8d5caa.cdd3ac",
-        "f63967f8.5c1d2",
-        "f4c1be52.25da4"
+        "3bb3037a.178754",
+        "8000d000.35dfa8",
+        "89805004.2ac398"
       ]
     ]
   },
   {
-    "id": "1abb3e71.7e1362",
+    "id": "be414195.9b77c",
     "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": 3192.5,
-    "y": 1027,
-    "z": "4138d8f7.da252",
+    "x": 3275.566665649414,
+    "y": 1109.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "252648ef.3d7f4",
-        "296ca11d.a31fd6"
+        "c53ee6d9.d92aa8",
+        "b00b21f6.61a17"
       ]
     ]
   },
   {
-    "id": "296ca11d.a31fd6",
+    "id": "b00b21f6.61a17",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3415.5,
-    "y": 1013,
-    "z": "4138d8f7.da252",
+    "x": 3498.566665649414,
+    "y": 1095.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2479711d.5bdd66"
+        "42f02ac3.9ec4a4"
       ]
     ]
   },
   {
-    "id": "252648ef.3d7f4",
+    "id": "c53ee6d9.d92aa8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3417.5,
-    "y": 1046,
-    "z": "4138d8f7.da252",
+    "x": 3500.566665649414,
+    "y": 1128.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "90f53fd9.1cbe8"
+        "dd03ebfe.8dbb"
       ]
     ]
   },
   {
-    "id": "6c40f2a8.47da04",
+    "id": "10e4f75f.914479",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3633.16650390625,
-    "y": 1149,
-    "z": "4138d8f7.da252",
+    "x": 3716.233169555664,
+    "y": 1231.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1415c282.916e3d",
-        "2cb5ed40.b34f42"
+        "e44801ab.1590c8",
+        "fa4a5699.5e244"
       ]
     ]
   },
   {
-    "id": "cba887b8.3ba25",
+    "id": "c201e6b8.a3178",
     "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": 3623.5623779296875,
-    "y": 1195.8597717285156,
-    "z": "4138d8f7.da252",
+    "x": 3706.6290435791016,
+    "y": 1278.145523071289,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "43b1688f.a5b798",
+    "id": "f43a00.5422b6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3627.5,
-    "y": 1240,
-    "z": "4138d8f7.da252",
+    "x": 3710.566665649414,
+    "y": 1322.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "1415c282.916e3d",
+    "id": "e44801ab.1590c8",
     "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": 3897.5,
-    "y": 1200,
-    "z": "4138d8f7.da252",
+    "x": 3980.566665649414,
+    "y": 1282.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3e280d70.843922",
-        "95fc8503.11868"
+        "16568eac.f132a9",
+        "e40b1917.8979d8"
       ]
     ]
   },
   {
-    "id": "95fc8503.11868",
+    "id": "e40b1917.8979d8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4073.5,
-    "y": 1250,
-    "z": "4138d8f7.da252",
+    "x": 4156.566665649414,
+    "y": 1332.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "dc902b38.0c7748"
+        "ac556463.ec12b8"
       ]
     ]
   },
   {
-    "id": "3e280d70.843922",
+    "id": "16568eac.f132a9",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4075.5,
-    "y": 1314,
-    "z": "4138d8f7.da252",
+    "x": 4158.566665649414,
+    "y": 1396.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "23310562.1afb82"
+        "97de31bb.b9a118"
       ]
     ]
   },
   {
-    "id": "23310562.1afb82",
+    "id": "97de31bb.b9a118",
     "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": 4237.5,
-    "y": 1310,
-    "z": "4138d8f7.da252",
+    "x": 4320.566665649414,
+    "y": 1392.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "dc902b38.0c7748",
+    "id": "ac556463.ec12b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4238.5,
-    "y": 1247,
-    "z": "4138d8f7.da252",
+    "x": 4321.566665649414,
+    "y": 1329.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cee16453.63cf3",
-        "84ccdaef.588b08"
+        "3ab9a413.979aa4",
+        "75cbb82a.35584"
       ]
     ]
   },
   {
-    "id": "90f53fd9.1cbe8",
+    "id": "dd03ebfe.8dbb",
     "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": 3560.5,
-    "y": 1043,
-    "z": "4138d8f7.da252",
+    "x": 3643.566665649414,
+    "y": 1125.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2479711d.5bdd66",
+    "id": "42f02ac3.9ec4a4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3563.5,
-    "y": 1006,
-    "z": "4138d8f7.da252",
+    "x": 3646.566665649414,
+    "y": 1088.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e0731aec.1d3d18",
-        "ff49f858.b54118"
+        "6046ec7d.2c3dac",
+        "942aecd4.e6d53"
       ]
     ]
   },
   {
-    "id": "e0731aec.1d3d18",
+    "id": "6046ec7d.2c3dac",
     "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": 3737.5,
-    "y": 962,
-    "z": "4138d8f7.da252",
+    "x": 3820.566665649414,
+    "y": 1044.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2cb5ed40.b34f42",
+    "id": "fa4a5699.5e244",
     "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": 3609.5,
-    "y": 1331,
-    "z": "4138d8f7.da252",
+    "x": 3692.566665649414,
+    "y": 1413.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f5d98ba7.1e5cb8"
+        "5ae5afb9.f0afa"
       ]
     ]
   },
   {
-    "id": "f5d98ba7.1e5cb8",
+    "id": "5ae5afb9.f0afa",
     "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": 3890.5,
-    "y": 1326,
-    "z": "4138d8f7.da252",
+    "x": 3973.566665649414,
+    "y": 1408.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "287b5bf8.99c79c"
+        "cfb3ee78.011c4"
       ]
     ]
   },
   {
-    "id": "287b5bf8.99c79c",
+    "id": "cfb3ee78.011c4",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4201.78564453125,
-    "y": 1400.82177734375,
-    "z": "4138d8f7.da252",
+    "x": 4284.852310180664,
+    "y": 1483.1075286865234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "70c360c1.95da08"
+        "658c69d5.ac8cf"
       ]
     ]
   },
   {
-    "id": "ff49f858.b54118",
+    "id": "942aecd4.e6d53",
     "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": 3752.5,
-    "y": 1073,
-    "z": "4138d8f7.da252",
+    "x": 3835.566665649414,
+    "y": 1155.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "dadb26c7.629ca8",
-        "f63867c7.23e9a8",
-        "b7f169a7.e4cea8"
+        "7f200322.76207c",
+        "80c4e01c.7c07b8",
+        "71ab8804.94dd5"
       ]
     ]
   },
   {
-    "id": "dadb26c7.629ca8",
+    "id": "7f200322.76207c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3948.0001220703125,
-    "y": 1025,
-    "z": "4138d8f7.da252",
+    "x": 4031.0667877197266,
+    "y": 1107.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "56281278.4a732c"
+        "a99ba4fa.4ed1e8"
       ]
     ]
   },
   {
-    "id": "f63867c7.23e9a8",
+    "id": "80c4e01c.7c07b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3940.0001220703125,
-    "y": 1080,
-    "z": "4138d8f7.da252",
+    "x": 4023.0667877197266,
+    "y": 1162.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d5d18730.ffaa"
+        "848293a0.71bc7"
       ]
     ]
   },
   {
-    "id": "b7f169a7.e4cea8",
+    "id": "71ab8804.94dd5",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3945.0001220703125,
-    "y": 1137,
-    "z": "4138d8f7.da252",
+    "x": 4028.0667877197266,
+    "y": 1219.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5b7993c9.ffe6c4"
+        "f97b023f.267278"
       ]
     ]
   },
   {
-    "id": "5b7993c9.ffe6c4",
+    "id": "f97b023f.267278",
     "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": 4097.0001220703125,
-    "y": 1138,
-    "z": "4138d8f7.da252",
+    "x": 4180.066787719727,
+    "y": 1220.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d5d18730.ffaa",
+    "id": "848293a0.71bc7",
     "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": 4108.0001220703125,
-    "y": 1083,
-    "z": "4138d8f7.da252",
+    "x": 4191.066787719727,
+    "y": 1165.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "56281278.4a732c",
+    "id": "a99ba4fa.4ed1e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4092.3824462890625,
-    "y": 1022.6556701660156,
-    "z": "4138d8f7.da252",
+    "x": 4175.449111938477,
+    "y": 1104.941421508789,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "98511029.380fd"
+        "b504251b.7f7448"
       ]
     ]
   },
   {
-    "id": "98511029.380fd",
+    "id": "b504251b.7f7448",
     "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": 4315.500244140625,
-    "y": 1161,
-    "z": "4138d8f7.da252",
+    "x": 4398.566909790039,
+    "y": 1243.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1e482e0.3b3ba52"
+        "52eb8aa1.8ff274"
       ]
     ]
   },
   {
-    "id": "84ccdaef.588b08",
+    "id": "75cbb82a.35584",
     "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": 4408.5,
-    "y": 1205,
-    "z": "4138d8f7.da252",
+    "x": 4491.566665649414,
+    "y": 1287.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "cee16453.63cf3",
+    "id": "3ab9a413.979aa4",
     "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": 4409.5,
-    "y": 1313,
-    "z": "4138d8f7.da252",
+    "x": 4492.566665649414,
+    "y": 1395.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d2b67ee9.016d4",
+    "id": "b9ee3c01.a1e29",
     "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": 4410.5,
-    "y": 1262,
-    "z": "4138d8f7.da252",
+    "x": 4493.566665649414,
+    "y": 1344.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "70c360c1.95da08",
+    "id": "658c69d5.ac8cf",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4408.6171875,
-    "y": 1401.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 4491.683853149414,
+    "y": 1483.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8b810a1.45408f8",
-        "389752e1.54c2be",
-        "e0be029e.19d278"
+        "aadf2b0a.6db3d",
+        "61bc8b6e.22a73c",
+        "30cdefe5.b26318"
       ]
     ]
   },
   {
-    "id": "8b810a1.45408f8",
+    "id": "aadf2b0a.6db3d",
     "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": 4623.6171875,
-    "y": 1363.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 4706.683853149414,
+    "y": 1445.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "389752e1.54c2be",
+    "id": "61bc8b6e.22a73c",
     "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": 4620.6171875,
-    "y": 1402.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 4703.683853149414,
+    "y": 1484.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "38942ae1.d34c76"
+        "fd577e5f.db1ba"
       ]
     ]
   },
   {
-    "id": "e0be029e.19d278",
+    "id": "30cdefe5.b26318",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4576.1171875,
-    "y": 1444.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 4659.183853149414,
+    "y": 1526.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "38942ae1.d34c76",
+    "id": "fd577e5f.db1ba",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4801.1171875,
-    "y": 1401.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 4884.183853149414,
+    "y": 1483.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "418b10aa.3bf41"
+        "fa2d5efd.88ba08"
       ]
     ]
   },
   {
-    "id": "28737ab1.66c06e",
+    "id": "ded6fafe.4074f8",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4713.500244140625,
-    "y": 1165,
-    "z": "4138d8f7.da252",
+    "x": 4796.566909790039,
+    "y": 1247.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "813fb276.a89d38"
+        "afabdc9f.6d39f8"
       ]
     ]
   },
   {
-    "id": "813fb276.a89d38",
+    "id": "afabdc9f.6d39f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4890.500244140625,
-    "y": 1157,
-    "z": "4138d8f7.da252",
+    "x": 4973.566909790039,
+    "y": 1239.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5ba45898.1ae6d8",
-        "82500988.df7418"
+        "d564a26c.9a8558",
+        "3ff41e19.f0e01a"
       ]
     ]
   },
   {
-    "id": "1e482e0.3b3ba52",
+    "id": "52eb8aa1.8ff274",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4510.500244140625,
-    "y": 1161,
-    "z": "4138d8f7.da252",
+    "x": 4593.566909790039,
+    "y": 1243.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "28737ab1.66c06e",
-        "431c2963.374ce8"
+        "ded6fafe.4074f8",
+        "f56e57c9.6506a8"
       ]
     ]
   },
   {
-    "id": "431c2963.374ce8",
+    "id": "f56e57c9.6506a8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4579.500244140625,
-    "y": 1235,
-    "z": "4138d8f7.da252",
+    "x": 4662.566909790039,
+    "y": 1317.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d3fb7afe.dba838"
+        "f21dcf5d.336178"
       ]
     ]
   },
   {
-    "id": "d3fb7afe.dba838",
+    "id": "f21dcf5d.336178",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4775.500244140625,
-    "y": 1235,
-    "z": "4138d8f7.da252",
+    "x": 4858.566909790039,
+    "y": 1317.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "40663368.ea789c"
+        "132ca45a.eb5e34"
       ]
     ]
   },
   {
-    "id": "418b10aa.3bf41",
+    "id": "fa2d5efd.88ba08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4959.1171875,
-    "y": 1401.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 5042.183853149414,
+    "y": 1483.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ec468881.ecbf18"
+        "b951f264.559ce"
       ]
     ]
   },
   {
-    "id": "ec468881.ecbf18",
+    "id": "b951f264.559ce",
     "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": 5166.1171875,
-    "y": 1401.34033203125,
-    "z": "4138d8f7.da252",
+    "x": 5249.183853149414,
+    "y": 1483.6260833740234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "82500988.df7418",
+    "id": "3ff41e19.f0e01a",
     "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": 5115.500244140625,
-    "y": 1153,
-    "z": "4138d8f7.da252",
+    "x": 5198.566909790039,
+    "y": 1235.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9dd65188.ffecf",
-        "e0664fc.7b8393",
-        "b7a2fd6c.7b7688"
+        "a40a7be5.2be498",
+        "d6b97145.3bf148",
+        "ea85892.20b4178"
       ]
     ]
   },
   {
-    "id": "5ba45898.1ae6d8",
+    "id": "d564a26c.9a8558",
     "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": 5145.500244140625,
-    "y": 1101,
-    "z": "4138d8f7.da252",
+    "x": 5228.566909790039,
+    "y": 1183.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9dd65188.ffecf",
+    "id": "a40a7be5.2be498",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5325.500244140625,
-    "y": 1144,
-    "z": "4138d8f7.da252",
+    "x": 5408.566909790039,
+    "y": 1226.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2d529b4.18963e4"
+        "d68ba68a.be89b8"
       ]
     ]
   },
   {
-    "id": "e0664fc.7b8393",
+    "id": "d6b97145.3bf148",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5317.500244140625,
-    "y": 1199,
-    "z": "4138d8f7.da252",
+    "x": 5400.566909790039,
+    "y": 1281.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3aa5c8f4.350c08"
+        "7c894f76.5a638"
       ]
     ]
   },
   {
-    "id": "b7a2fd6c.7b7688",
+    "id": "ea85892.20b4178",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5322.500244140625,
-    "y": 1256,
-    "z": "4138d8f7.da252",
+    "x": 5405.566909790039,
+    "y": 1338.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2908da09.77d2fe"
+        "d37deda4.10b24"
       ]
     ]
   },
   {
-    "id": "2908da09.77d2fe",
+    "id": "d37deda4.10b24",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5474.500244140625,
-    "y": 1257,
-    "z": "4138d8f7.da252",
+    "x": 5557.566909790039,
+    "y": 1339.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3aa5c8f4.350c08",
+    "id": "7c894f76.5a638",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5485.500244140625,
-    "y": 1202,
-    "z": "4138d8f7.da252",
+    "x": 5568.566909790039,
+    "y": 1284.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2d529b4.18963e4",
+    "id": "d68ba68a.be89b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5469.882568359375,
-    "y": 1141.6556701660156,
-    "z": "4138d8f7.da252",
+    "x": 5552.949234008789,
+    "y": 1223.941421508789,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e508aa99.ed11b8"
+        "ff0f9afc.082318"
       ]
     ]
   },
   {
-    "id": "40663368.ea789c",
+    "id": "132ca45a.eb5e34",
     "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": 5038.500244140625,
-    "y": 1238,
-    "z": "4138d8f7.da252",
+    "x": 5121.566909790039,
+    "y": 1320.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e508aa99.ed11b8",
+    "id": "ff0f9afc.082318",
     "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": 5656.500244140625,
-    "y": 1138,
-    "z": "4138d8f7.da252",
+    "x": 5739.566909790039,
+    "y": 1220.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e66147a6.9621b",
+    "id": "c100f1cf.959b9",
     "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": 4297.49951171875,
-    "y": 373,
-    "z": "4138d8f7.da252",
+    "x": 4380.566177368164,
+    "y": 455.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7411318a.e1b958",
+    "id": "476d7cc2.2b9e3c",
     "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": 4288.49951171875,
-    "y": 471,
-    "z": "4138d8f7.da252",
+    "x": 4371.566177368164,
+    "y": 553.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "62760f41.c93a2",
+    "id": "2bc1e64e.d59032",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4122.49951171875,
-    "y": 379,
-    "z": "4138d8f7.da252",
+    "x": 4205.566177368164,
+    "y": 461.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "92f3b868.34ce6",
-        "e66147a6.9621b"
+        "fcdd9b76.8fa5f8",
+        "c100f1cf.959b9"
       ]
     ]
   },
   {
-    "id": "273e3fee.2bc13",
+    "id": "453522b8.5dbac4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4128.49951171875,
-    "y": 443,
-    "z": "4138d8f7.da252",
+    "x": 4211.566177368164,
+    "y": 525.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b6002239.68b828",
-        "7411318a.e1b958"
+        "a44710c1.f4b4c8",
+        "476d7cc2.2b9e3c"
       ]
     ]
   },
   {
-    "id": "244a1c4c.c64574",
+    "id": "f5a4f507.86b44",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4142.499267578125,
-    "y": 607,
-    "z": "4138d8f7.da252",
+    "x": 4225.565933227539,
+    "y": 689.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "55137534.cd97cc",
-        "94e7efd7.f5ec88"
+        "5b86250b.1183b4",
+        "ee4f808.01bcf8"
       ]
     ]
   },
   {
-    "id": "f48105e4.f03428",
+    "id": "8148cd30.75333",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4145.499267578125,
-    "y": 660,
-    "z": "4138d8f7.da252",
+    "x": 4228.565933227539,
+    "y": 742.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ba173e3c.d3cf48",
-        "9c20a9f9.7c2ff"
+        "154b4953.ab9fcf",
+        "f5de4dab.b0e37"
       ]
     ]
   },
   {
-    "id": "94e7efd7.f5ec88",
+    "id": "ee4f808.01bcf8",
     "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": 4364.499267578125,
-    "y": 674,
-    "z": "4138d8f7.da252",
+    "x": 4447.565933227539,
+    "y": 756.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9c20a9f9.7c2ff",
+    "id": "f5de4dab.b0e37",
     "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": 4367.499267578125,
-    "y": 765,
-    "z": "4138d8f7.da252",
+    "x": 4450.565933227539,
+    "y": 847.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "124feda4.be759a",
+    "id": "fba24b6a.44ade",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3523.5,
-    "y": 1711,
-    "z": "4138d8f7.da252",
+    "x": 3606.566665649414,
+    "y": 1793.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e1f69d4c.5b8868",
-        "d4ae5d82.aab8b"
+        "6ab1e648.0c2108",
+        "e98d774e.c7639"
       ]
     ]
   },
   {
-    "id": "7a356795.78dec",
+    "id": "e055a781.15033",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3350.83349609375,
-    "y": 1712,
-    "z": "4138d8f7.da252",
+    "x": 3433.900161743164,
+    "y": 1794.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "124feda4.be759a"
+        "fba24b6a.44ade"
       ]
     ]
   },
   {
-    "id": "c62c11ee.d3432",
+    "id": "33450ab2.d72e86",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3360.324462890625,
-    "y": 1754.5740356445312,
-    "z": "4138d8f7.da252",
+    "x": 3443.391128540039,
+    "y": 1836.8597869873047,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4d29ec31.00d144"
+        "279c15e9.8df2d2"
       ]
     ]
   },
   {
-    "id": "fa667208.2a7ec",
+    "id": "14684e53.bc0682",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3348.83349609375,
-    "y": 1801,
-    "z": "4138d8f7.da252",
+    "x": 3431.900161743164,
+    "y": 1883.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "577a09e9.8378d8"
+        "7cf32ea0.24f2e8"
       ]
     ]
   },
   {
-    "id": "4d29ec31.00d144",
+    "id": "279c15e9.8df2d2",
     "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": 3513.8958740234375,
-    "y": 1757.8597717285156,
-    "z": "4138d8f7.da252",
+    "x": 3596.9625396728516,
+    "y": 1840.145523071289,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "577a09e9.8378d8",
+    "id": "7cf32ea0.24f2e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3517.83349609375,
-    "y": 1802,
-    "z": "4138d8f7.da252",
+    "x": 3600.900161743164,
+    "y": 1884.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e1f69d4c.5b8868",
+    "id": "6ab1e648.0c2108",
     "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": 3809.83349609375,
-    "y": 1715.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3892.900161743164,
+    "y": 1797.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "67e03e9f.e657f8",
-        "8f6dd9a8.907078"
+        "daabf3e5.97bed8",
+        "1e7b26c7.e7a121"
       ]
     ]
   },
   {
-    "id": "8f6dd9a8.907078",
+    "id": "1e7b26c7.e7a121",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4032.83349609375,
-    "y": 1670.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4115.900161743164,
+    "y": 1752.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9d5c402b.afbc18"
+        "acfb9237.1cd6c8"
       ]
     ]
   },
   {
-    "id": "67e03e9f.e657f8",
+    "id": "daabf3e5.97bed8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4034.83349609375,
-    "y": 1734.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4117.900161743164,
+    "y": 1816.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b1dc0c2e.2db02"
+        "2bdd8bed.c7bcd4"
       ]
     ]
   },
   {
-    "id": "b1dc0c2e.2db02",
+    "id": "2bdd8bed.c7bcd4",
     "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": 4193.83349609375,
-    "y": 1753.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4276.900161743164,
+    "y": 1835.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9d5c402b.afbc18",
+    "id": "acfb9237.1cd6c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4197.83349609375,
-    "y": 1667.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4280.900161743164,
+    "y": 1749.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "eb823b6e.5b1b68",
-        "d1229eee.7607f"
+        "26977aa5.25dd2e",
+        "72fafff.27e4d"
       ]
     ]
   },
   {
-    "id": "ec67f0f.b56539",
+    "id": "da60761c.d9f04",
     "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": 3122.83349609375,
-    "y": 1747,
-    "z": "4138d8f7.da252",
+    "x": 3205.900161743164,
+    "y": 1829.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7a356795.78dec",
-        "c62c11ee.d3432",
-        "fa667208.2a7ec"
+        "e055a781.15033",
+        "33450ab2.d72e86",
+        "14684e53.bc0682"
       ]
     ]
   },
   {
-    "id": "ef79491a.ef1ed",
+    "id": "4b7ae9f1.8aec68",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3083.83349609375,
-    "y": 1691,
-    "z": "4138d8f7.da252",
+    "x": 3166.900161743164,
+    "y": 1773.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "363ba934.edbd4e",
+    "id": "5f587418.c46734",
     "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": 3135.83349609375,
-    "y": 1493,
-    "z": "4138d8f7.da252",
+    "x": 3218.900161743164,
+    "y": 1575.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "fab0a5fc.8009e8",
-        "1a41312c.3b3677"
+        "f9cab6f8.ebc12",
+        "1ca010c1.fd862f"
       ]
     ]
   },
   {
-    "id": "1a41312c.3b3677",
+    "id": "1ca010c1.fd862f",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3358.83349609375,
-    "y": 1479,
-    "z": "4138d8f7.da252",
+    "x": 3441.900161743164,
+    "y": 1561.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "41d39e09.02c3d8"
+        "c0d41dc2.2e9ce8"
       ]
     ]
   },
   {
-    "id": "fab0a5fc.8009e8",
+    "id": "f9cab6f8.ebc12",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3360.83349609375,
-    "y": 1512,
-    "z": "4138d8f7.da252",
+    "x": 3443.900161743164,
+    "y": 1594.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "31a06a0b.93432e"
+        "3ccca278.68559e"
       ]
     ]
   },
   {
-    "id": "31a06a0b.93432e",
+    "id": "3ccca278.68559e",
     "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": 3503.83349609375,
-    "y": 1509,
-    "z": "4138d8f7.da252",
+    "x": 3586.900161743164,
+    "y": 1591.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "41d39e09.02c3d8",
+    "id": "c0d41dc2.2e9ce8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3506.83349609375,
-    "y": 1472,
-    "z": "4138d8f7.da252",
+    "x": 3589.900161743164,
+    "y": 1554.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "12fe71d9.7bf9be",
-        "c47ac813.f199b8"
+        "c99a0449.e56c2",
+        "7083ce51.93a92"
       ]
     ]
   },
   {
-    "id": "12fe71d9.7bf9be",
+    "id": "c99a0449.e56c2",
     "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": 3700.83349609375,
-    "y": 1475.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3783.900161743164,
+    "y": 1557.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d4ae5d82.aab8b",
+    "id": "e98d774e.c7639",
     "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": 3753.83349609375,
-    "y": 1834,
-    "z": "4138d8f7.da252",
+    "x": 3836.900161743164,
+    "y": 1916.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7b8dd371.aa4964"
+        "fd084df8.e98c58"
       ]
     ]
   },
   {
-    "id": "7b8dd371.aa4964",
+    "id": "fd084df8.e98c58",
     "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": 3959.83349609375,
-    "y": 1834,
-    "z": "4138d8f7.da252",
+    "x": 4042.900161743164,
+    "y": 1916.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e78bd2af.32742"
+        "6cb7488a.a222b"
       ]
     ]
   },
   {
-    "id": "e78bd2af.32742",
+    "id": "6cb7488a.a222b",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4177.119140625,
-    "y": 1832.82177734375,
-    "z": "4138d8f7.da252",
+    "x": 4260.185806274414,
+    "y": 1915.1075286865234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "231ad36e.3e7974"
+        "350b3e58.c792ea"
       ]
     ]
   },
   {
-    "id": "c47ac813.f199b8",
+    "id": "7083ce51.93a92",
     "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": 3722.83349609375,
-    "y": 1543.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3805.900161743164,
+    "y": 1625.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "14953bcb.0f686c",
-        "5a2f3f75.0fbf6",
-        "61553bc7.07748c"
+        "5d1bde7f.a2e988",
+        "568d456e.886424",
+        "4559cac2.72065c"
       ]
     ]
   },
   {
-    "id": "14953bcb.0f686c",
+    "id": "5d1bde7f.a2e988",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3918.3336181640625,
-    "y": 1495.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4001.4002838134766,
+    "y": 1577.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e9311021.d720e8"
+        "7231501f.55645"
       ]
     ]
   },
   {
-    "id": "5a2f3f75.0fbf6",
+    "id": "568d456e.886424",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3910.3336181640625,
-    "y": 1550.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3993.4002838134766,
+    "y": 1632.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4fbd5f1f.bd6168"
+        "1fe97a53.6160f6"
       ]
     ]
   },
   {
-    "id": "61553bc7.07748c",
+    "id": "4559cac2.72065c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3915.3336181640625,
-    "y": 1607.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3998.4002838134766,
+    "y": 1689.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ccee2aed.1d2c48"
+        "c16f7b5a.3ed008"
       ]
     ]
   },
   {
-    "id": "ccee2aed.1d2c48",
+    "id": "c16f7b5a.3ed008",
     "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": 4067.3336181640625,
-    "y": 1608.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4150.400283813477,
+    "y": 1690.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "4fbd5f1f.bd6168",
+    "id": "1fe97a53.6160f6",
     "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": 4078.3336181640625,
-    "y": 1553.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4161.400283813477,
+    "y": 1635.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e9311021.d720e8",
+    "id": "7231501f.55645",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4062.7159423828125,
-    "y": 1492.6557922363281,
-    "z": "4138d8f7.da252",
+    "x": 4145.782608032227,
+    "y": 1574.9415435791016,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "12595c91.b718eb"
+        "c3bee3fa.d3a9e"
       ]
     ]
   },
   {
-    "id": "eb823b6e.5b1b68",
+    "id": "26977aa5.25dd2e",
     "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": 4367.83349609375,
-    "y": 1628.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4450.900161743164,
+    "y": 1710.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d1229eee.7607f",
+    "id": "72fafff.27e4d",
     "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": 4368.83349609375,
-    "y": 1733.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4451.900161743164,
+    "y": 1815.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8d0a9501.e59f28",
+    "id": "3c2418c7.4572c8",
     "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": 4363.83349609375,
-    "y": 1682.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4446.900161743164,
+    "y": 1764.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "231ad36e.3e7974",
+    "id": "350b3e58.c792ea",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4383.95068359375,
-    "y": 1822.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 4467.017349243164,
+    "y": 1904.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "16f2e433.3291b4",
-        "80f33246.16c218",
-        "51170c35.40a6bc"
+        "5da8c5d3.b9f55c",
+        "1242abaf.e56384",
+        "ed6b22ec.e3cd3"
       ]
     ]
   },
   {
-    "id": "16f2e433.3291b4",
+    "id": "5da8c5d3.b9f55c",
     "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": 4598.95068359375,
-    "y": 1784.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 4682.017349243164,
+    "y": 1866.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "80f33246.16c218",
+    "id": "1242abaf.e56384",
     "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": 4595.95068359375,
-    "y": 1823.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 4679.017349243164,
+    "y": 1905.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ec1220f2.c0002"
+        "44aa2b45.5157d4"
       ]
     ]
   },
   {
-    "id": "51170c35.40a6bc",
+    "id": "ed6b22ec.e3cd3",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4551.45068359375,
-    "y": 1865.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 4634.517349243164,
+    "y": 1947.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ec1220f2.c0002",
+    "id": "44aa2b45.5157d4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4776.45068359375,
-    "y": 1822.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 4859.517349243164,
+    "y": 1904.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "757e93f0.7ee45c"
+        "cd8ad202.8d323"
       ]
     ]
   },
   {
-    "id": "757e93f0.7ee45c",
+    "id": "cd8ad202.8d323",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4934.45068359375,
-    "y": 1822.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 5017.517349243164,
+    "y": 1904.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c7244ae.af2a238"
+        "3d8ba8c1.7feef8"
       ]
     ]
   },
   {
-    "id": "c7244ae.af2a238",
+    "id": "3d8ba8c1.7feef8",
     "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": 5141.45068359375,
-    "y": 1822.3404541015625,
-    "z": "4138d8f7.da252",
+    "x": 5224.517349243164,
+    "y": 1904.626205444336,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7e549eab.8dbb18",
+    "id": "64248373.c0f1e4",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4644.83349609375,
-    "y": 1511.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4727.900161743164,
+    "y": 1593.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1d3b129c.b2a675"
+        "ebf5d941.b9751"
       ]
     ]
   },
   {
-    "id": "1d3b129c.b2a675",
+    "id": "ebf5d941.b9751",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4821.83349609375,
-    "y": 1503.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4904.900161743164,
+    "y": 1585.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b6b58a8c.8e7ea8",
-        "dc3d97ac.463e28"
+        "5f21b6d8.97a7a8",
+        "a66d8cdf.7774c"
       ]
     ]
   },
   {
-    "id": "12595c91.b718eb",
+    "id": "c3bee3fa.d3a9e",
     "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": 4246.83349609375,
-    "y": 1507.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4329.900161743164,
+    "y": 1589.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a772c4a4.38145"
+        "768c4246.3384b4"
       ]
     ]
   },
   {
-    "id": "a772c4a4.38145",
+    "id": "768c4246.3384b4",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4441.83349609375,
-    "y": 1507.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4524.900161743164,
+    "y": 1589.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7e549eab.8dbb18",
-        "aea7a178.f6fc4"
+        "64248373.c0f1e4",
+        "d4d1382b.4bf1a8"
       ]
     ]
   },
   {
-    "id": "dc3d97ac.463e28",
+    "id": "a66d8cdf.7774c",
     "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": 5029.83349609375,
-    "y": 1510.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5112.900161743164,
+    "y": 1592.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3bf3e082.eea5e8",
-        "58cb7d25.d2da94",
-        "d2f7fa01.93a528"
+        "798943c1.0b7f24",
+        "dbd1300d.b2d4d8",
+        "c22228e5.5f04a"
       ]
     ]
   },
   {
-    "id": "a307fd53.34615",
+    "id": "4ab59831.7b5d28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4823.83349609375,
-    "y": 1576.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4906.900161743164,
+    "y": 1658.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ca73ba2d.29c1c8"
+        "b63665cd.e9bca8"
       ]
     ]
   },
   {
-    "id": "aea7a178.f6fc4",
+    "id": "d4d1382b.4bf1a8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4646.83349609375,
-    "y": 1584.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4729.900161743164,
+    "y": 1666.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a307fd53.34615"
+        "4ab59831.7b5d28"
       ]
     ]
   },
   {
-    "id": "b6b58a8c.8e7ea8",
+    "id": "5f21b6d8.97a7a8",
     "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": 5059.83349609375,
-    "y": 1458.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5142.900161743164,
+    "y": 1540.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ca73ba2d.29c1c8",
+    "id": "b63665cd.e9bca8",
     "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": 5005.83349609375,
-    "y": 1640.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5088.900161743164,
+    "y": 1722.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3bf3e082.eea5e8",
+    "id": "798943c1.0b7f24",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5239.83349609375,
-    "y": 1501.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5322.900161743164,
+    "y": 1583.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "36f4f947.29aeae"
+        "4408e043.c54b2"
       ]
     ]
   },
   {
-    "id": "58cb7d25.d2da94",
+    "id": "dbd1300d.b2d4d8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5231.83349609375,
-    "y": 1556.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5314.900161743164,
+    "y": 1638.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b7803a75.d7ec1"
+        "90ad08da.8c4d18"
       ]
     ]
   },
   {
-    "id": "d2f7fa01.93a528",
+    "id": "c22228e5.5f04a",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5236.83349609375,
-    "y": 1613.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5319.900161743164,
+    "y": 1695.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8d6cbae8.86128"
+        "de4c591d.7f2f48"
       ]
     ]
   },
   {
-    "id": "8d6cbae8.86128",
+    "id": "de4c591d.7f2f48",
     "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": 5388.83349609375,
-    "y": 1614.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5471.900161743164,
+    "y": 1696.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b7803a75.d7ec1",
+    "id": "90ad08da.8c4d18",
     "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": 5399.83349609375,
-    "y": 1559.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5482.900161743164,
+    "y": 1641.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "36f4f947.29aeae",
+    "id": "4408e043.c54b2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5384.2158203125,
-    "y": 1498.6557922363281,
-    "z": "4138d8f7.da252",
+    "x": 5467.282485961914,
+    "y": 1580.9415435791016,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b6324aba.def4e"
+        "2133344e.893bec"
       ]
     ]
   },
   {
-    "id": "b6324aba.def4e",
+    "id": "2133344e.893bec",
     "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": 5598.83349609375,
-    "y": 1495.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5681.900161743164,
+    "y": 1577.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "631e76e1.71afc",
+    "id": "fd9bd7ab.c92bd8",
     "type": "set",
     "name": "set LEAF stuff",
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
     "comments": "",
-    "x": 3187.5,
-    "y": 1317,
-    "z": "4138d8f7.da252",
+    "x": 3270.566665649414,
+    "y": 1399.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d1d7f338.2c48e",
+    "id": "6a9b0f1.984457",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4464.49951171875,
-    "y": 457,
-    "z": "4138d8f7.da252",
+    "x": 4547.566177368164,
+    "y": 539.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "df68ae5a.c6abe",
+    "id": "2f61d3b4.f418bc",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4532.499267578125,
-    "y": 659,
-    "z": "4138d8f7.da252",
+    "x": 4615.565933227539,
+    "y": 741.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b17f4ff2.75d93",
+    "id": "b37c5dee.6ca208",
     "type": "set",
     "name": "set ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
     "comments": "",
-    "x": 3083.5,
-    "y": 1878,
-    "z": "4138d8f7.da252",
+    "x": 3166.566665649414,
+    "y": 1960.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8048035e.723ef",
+    "id": "1bc9df09.d67e59",
     "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": 3345.5,
-    "y": 2791,
-    "z": "4138d8f7.da252",
+    "x": 3428.566665649414,
+    "y": 2873.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "d590aba5.94aa48",
+    "id": "6e895a21.1d4594",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3222.5,
-    "y": 2901,
-    "z": "4138d8f7.da252",
+    "x": 3305.566665649414,
+    "y": 2983.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "507ab41.362cbcc",
-        "63f9a6e5.2f9178"
+        "cef17f20.edf7e8",
+        "6dda4254.968224"
       ]
     ]
   },
   {
-    "id": "507ab41.362cbcc",
+    "id": "cef17f20.edf7e8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3406.5,
-    "y": 2880,
-    "z": "4138d8f7.da252",
+    "x": 3489.566665649414,
+    "y": 2962.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "28f5fd24.d628ea"
+        "d8fe6f8d.d7595"
       ]
     ]
   },
   {
-    "id": "63f9a6e5.2f9178",
+    "id": "6dda4254.968224",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2942.5,
-    "y": 4466,
-    "z": "4138d8f7.da252",
+    "x": 3025.566665649414,
+    "y": 4548.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "db2110db.2b1778"
+        "d77e7161.5348c8"
       ]
     ]
   },
   {
-    "id": "9f11b3.a8080e5",
+    "id": "300daee4.3b0352",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3453.5,
-    "y": 5051,
-    "z": "4138d8f7.da252",
+    "x": 3536.566665649414,
+    "y": 5133.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "40ac4d15.a539ec",
-        "577ac65e.4cd8e8",
-        "c33c721b.c24a68",
-        "e8ff43f0.c9213",
-        "c23415ae.23176",
-        "b27458da.77b73"
+        "318b9beb.21378c",
+        "1992e083.76e587",
+        "aaed5b46.7e8eb",
+        "c7aee100.ec3998",
+        "b969bbc7.e53528",
+        "54f08fa.71777f"
       ]
     ]
   },
   {
-    "id": "28f5fd24.d628ea",
+    "id": "d8fe6f8d.d7595",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6119.5,
-    "y": 1700,
-    "z": "4138d8f7.da252",
+    "x": 6202.566665649414,
+    "y": 1782.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4783da3c.fb84a4",
-        "bb88421.9f996c",
-        "55b1d688.471dd",
-        "31123019.0abe4",
-        "1759beb1.f3c1d1",
-        "98f705b0.6bc73",
-        "b6e856a5.c69918",
-        "277a36b1.830aba",
-        "f9e2137d.7a2d78",
-        "3298314.8dc664e",
-        "cfdca91b.21bde",
-        "a46de057.2f2f3",
-        "2c505364.e529bc",
-        "5713069a.52e6e",
-        "736cdf51.8421c8",
-        "a19bdc2c.350be8",
-        "829d6c73.aa7da8",
-        "57d8804.ea8d28",
-        "39b6682a.960bc",
-        "858f96c1.79cbc",
-        "1b0442b9.4b628d",
-        "c1546bd.e66d418"
+        "1a1f2023.50c9f8",
+        "e814ac2.6d99cd",
+        "27a9213f.e489d6",
+        "904795f3.631878",
+        "c284bcb.2b7c44",
+        "1d8604a2.381ee3",
+        "5946c797.be74d",
+        "a66844b6.e099c",
+        "37c7ecba.efaa4c",
+        "72cc1cfb.a77694",
+        "1e88893b.a079df",
+        "f9c59fe9.ee503",
+        "4573e73f.58afa8",
+        "c53261d3.0987a8",
+        "f109d109.e8eb",
+        "4c9e5bd3.54a49c",
+        "e1cb1e55.b0357",
+        "e177a7a3.e48c7",
+        "6fa889cc.c9cce",
+        "c91e3a5e.c6511",
+        "162cf27b.802c36",
+        "5a5c80f6.6318b8"
       ]
     ]
   },
   {
-    "id": "f9e2137d.7a2d78",
+    "id": "37c7ecba.efaa4c",
     "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": 6490.5,
-    "y": 1623,
-    "z": "4138d8f7.da252",
+    "x": 6573.566665649414,
+    "y": 1705.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "4783da3c.fb84a4",
+    "id": "1a1f2023.50c9f8",
     "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": 6444.5,
-    "y": 1721,
-    "z": "4138d8f7.da252",
+    "x": 6527.566665649414,
+    "y": 1803.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "bb88421.9f996c",
+    "id": "e814ac2.6d99cd",
     "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": 6580.5,
-    "y": 1768,
-    "z": "4138d8f7.da252",
+    "x": 6663.566665649414,
+    "y": 1850.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "a3afcd58.883878",
+    "id": "2ad7ea9.f129796",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6411.5,
-    "y": 1572,
-    "z": "4138d8f7.da252",
+    "x": 6494.566665649414,
+    "y": 1654.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "47893e3d.7abf68",
+    "id": "942a9804.0c79c",
     "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": 6907.5,
-    "y": 2308,
-    "z": "4138d8f7.da252",
+    "x": 6990.566665649414,
+    "y": 2390.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "55b1d688.471dd",
+    "id": "27a9213f.e489d6",
     "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": 6471.5,
-    "y": 2347,
-    "z": "4138d8f7.da252",
+    "x": 6554.566665649414,
+    "y": 2429.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "31123019.0abe4",
+    "id": "904795f3.631878",
     "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": 6419.5,
-    "y": 2398,
-    "z": "4138d8f7.da252",
+    "x": 6502.566665649414,
+    "y": 2480.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "1759beb1.f3c1d1",
+    "id": "c284bcb.2b7c44",
     "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": 6555.5,
-    "y": 2445,
-    "z": "4138d8f7.da252",
+    "x": 6638.566665649414,
+    "y": 2527.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "71216be9.ff79f4",
+    "id": "887b2dbb.8eb65",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 6412.5,
-    "y": 2307,
-    "z": "4138d8f7.da252",
+    "x": 6495.566665649414,
+    "y": 2389.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3446875.4213df8",
+    "id": "8252fd61.bfc208",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6842.5,
-    "y": 2504,
-    "z": "4138d8f7.da252",
+    "x": 6925.566665649414,
+    "y": 2586.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "98f705b0.6bc73",
+    "id": "1d8604a2.381ee3",
     "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": 6433.5,
-    "y": 2551,
-    "z": "4138d8f7.da252",
+    "x": 6516.566665649414,
+    "y": 2633.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4cd47e4a.423aa8",
-        "dbf8ee5e.1c40a8",
-        "e7f2720f.fd9208"
+        "68a11957.d1e54",
+        "98ce32f4.8ab98",
+        "ceda9f28.da773"
       ]
     ]
   },
   {
-    "id": "4cd47e4a.423aa8",
+    "id": "68a11957.d1e54",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6680.5,
-    "y": 2505,
-    "z": "4138d8f7.da252",
+    "x": 6763.566665649414,
+    "y": 2587.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3446875.4213df8"
+        "8252fd61.bfc208"
       ]
     ]
   },
   {
-    "id": "dbf8ee5e.1c40a8",
+    "id": "98ce32f4.8ab98",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6680.990966796875,
-    "y": 2550.5740356445312,
-    "z": "4138d8f7.da252",
+    "x": 6764.057632446289,
+    "y": 2632.8597869873047,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5c2d61a6.b888d8"
+        "9afbaf66.fb0d68"
       ]
     ]
   },
   {
-    "id": "e7f2720f.fd9208",
+    "id": "ceda9f28.da773",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6678.5,
-    "y": 2594,
-    "z": "4138d8f7.da252",
+    "x": 6761.566665649414,
+    "y": 2676.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7deb6a39.1c780c"
+        "3e284ec9.e9b522"
       ]
     ]
   },
   {
-    "id": "5c2d61a6.b888d8",
+    "id": "9afbaf66.fb0d68",
     "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": 6843.5623779296875,
-    "y": 2550.8597717285156,
-    "z": "4138d8f7.da252",
+    "x": 6926.629043579102,
+    "y": 2633.145523071289,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7deb6a39.1c780c",
+    "id": "3e284ec9.e9b522",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 6847.5,
-    "y": 2595,
-    "z": "4138d8f7.da252",
+    "x": 6930.566665649414,
+    "y": 2677.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "736cdf51.8421c8",
+    "id": "f109d109.e8eb",
     "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": 6487.5,
-    "y": 2867,
-    "z": "4138d8f7.da252",
+    "x": 6570.566665649414,
+    "y": 2949.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "a19bdc2c.350be8",
+    "id": "4c9e5bd3.54a49c",
     "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": 6490.5,
-    "y": 2912,
-    "z": "4138d8f7.da252",
+    "x": 6573.566665649414,
+    "y": 2994.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "57d8804.ea8d28",
+    "id": "e177a7a3.e48c7",
     "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": 6482.5,
-    "y": 2666,
-    "z": "4138d8f7.da252",
+    "x": 6565.566665649414,
+    "y": 2748.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "39b6682a.960bc",
+    "id": "6fa889cc.c9cce",
     "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": 6484.5,
-    "y": 2713,
-    "z": "4138d8f7.da252",
+    "x": 6567.566665649414,
+    "y": 2795.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "35de923d.3dc786",
+    "id": "5dea74d5.1b4aa4",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 6403.5,
-    "y": 2820,
-    "z": "4138d8f7.da252",
+    "x": 6486.566665649414,
+    "y": 2902.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "64b6242c.0fc1a4",
+    "id": "3dd8554.be5c5aa",
     "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": 4403.500244140625,
-    "y": 5213,
-    "z": "4138d8f7.da252",
+    "x": 4486.566909790039,
+    "y": 5295.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "40ac4d15.a539ec",
+    "id": "318b9beb.21378c",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3668.5,
-    "y": 5032,
-    "z": "4138d8f7.da252",
+    "x": 3751.566665649414,
+    "y": 5114.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "243fddd4.c99fc2",
-        "ed2a1041.39364"
+        "37cde52f.e57ab2",
+        "655366f1.7fdc7"
       ]
     ]
   },
   {
-    "id": "ed2a1041.39364",
+    "id": "655366f1.7fdc7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3840.5,
-    "y": 5029,
-    "z": "4138d8f7.da252",
+    "x": 3923.566665649414,
+    "y": 5111.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f749d2c9.24f0b"
+        "828433f7.b11a2"
       ]
     ]
   },
   {
-    "id": "243fddd4.c99fc2",
+    "id": "37cde52f.e57ab2",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3792.5,
-    "y": 5876,
-    "z": "4138d8f7.da252",
+    "x": 3875.566665649414,
+    "y": 5958.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a2f25d49.46cd88"
+        "e6235853.96452"
       ]
     ]
   },
   {
-    "id": "54d55fbb.9ecd9",
+    "id": "4ddc3818.58ee88",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3853.5,
-    "y": 4999,
-    "z": "4138d8f7.da252",
+    "x": 3936.566665649414,
+    "y": 5081.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2bf8aac8.9b318e",
+    "id": "bc0b6e25.72063",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3863.5,
-    "y": 5834,
-    "z": "4138d8f7.da252",
+    "x": 3946.566665649414,
+    "y": 5916.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b6e856a5.c69918",
+    "id": "5946c797.be74d",
     "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": 6489.5,
-    "y": 3046,
-    "z": "4138d8f7.da252",
+    "x": 6572.566665649414,
+    "y": 3128.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f749d2c9.24f0b",
+    "id": "828433f7.b11a2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4016.5,
-    "y": 5031,
-    "z": "4138d8f7.da252",
+    "x": 4099.566665649414,
+    "y": 5113.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b146a69c.13b518",
-        "436ccdfb.1e8f5c",
-        "124f51e3.777566",
-        "91ebdf82.9979e",
-        "3da01b2d.c332ec",
-        "59b34ffd.7f824",
-        "64b6242c.0fc1a4",
-        "cb7342b9.a9c168",
-        "7a7c44d8.30aa44"
+        "ec3ed36f.33f8e",
+        "2da9765.20a818a",
+        "583fc579.afbe3c",
+        "92f3ada6.6626b",
+        "d0f2c5e0.41cd1",
+        "80308a85.281f5",
+        "3dd8554.be5c5aa",
+        "b727caf7.37ccd",
+        "9d76b5ce.608a08"
       ]
     ]
   },
   {
-    "id": "f96e508.5132a3",
+    "id": "730f8b58.f71bb4",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5460.499755859375,
-    "y": 4956,
-    "z": "4138d8f7.da252",
+    "x": 5543.566421508789,
+    "y": 5038.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b146a69c.13b518",
+    "id": "ec3ed36f.33f8e",
     "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": 4262.500244140625,
-    "y": 5712,
-    "z": "4138d8f7.da252",
+    "x": 4345.566909790039,
+    "y": 5794.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "277a36b1.830aba",
+    "id": "a66844b6.e099c",
     "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": 6496.5,
-    "y": 1962,
-    "z": "4138d8f7.da252",
+    "x": 6579.566665649414,
+    "y": 2044.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "467249d9.2faa78",
+    "id": "723517cc.862aa8",
     "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": 6546.5,
-    "y": 1665,
-    "z": "4138d8f7.da252",
+    "x": 6629.566665649414,
+    "y": 1747.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3298314.8dc664e",
+    "id": "72cc1cfb.a77694",
     "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": 6493.5,
-    "y": 1253,
-    "z": "4138d8f7.da252",
+    "x": 6576.566665649414,
+    "y": 1335.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "cfdca91b.21bde",
+    "id": "1e88893b.a079df",
     "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": 6441.5,
-    "y": 1301,
-    "z": "4138d8f7.da252",
+    "x": 6524.566665649414,
+    "y": 1383.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "a46de057.2f2f3",
+    "id": "f9c59fe9.ee503",
     "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": 6569.5,
-    "y": 1348,
-    "z": "4138d8f7.da252",
+    "x": 6652.566665649414,
+    "y": 1430.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f85b4c38.36c218",
+    "id": "5271815d.5f082",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 6406.5,
-    "y": 1211,
-    "z": "4138d8f7.da252",
+    "x": 6489.566665649414,
+    "y": 1293.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2c505364.e529bc",
+    "id": "4573e73f.58afa8",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />",
     "comments": "",
     "outputs": 1,
-    "x": 6403.5,
-    "y": 1439,
-    "z": "4138d8f7.da252",
+    "x": 6486.566665649414,
+    "y": 1521.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "5713069a.52e6e",
+    "id": "c53261d3.0987a8",
     "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": 6496.5,
-    "y": 1492,
-    "z": "4138d8f7.da252",
+    "x": 6579.566665649414,
+    "y": 1574.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "9a759e0c.1860c8",
+    "id": "61b6e37e.ff4414",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 6387.5,
-    "y": 1395,
-    "z": "4138d8f7.da252",
+    "x": 6470.566665649414,
+    "y": 1477.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "147d7127.d8042f",
+    "id": "b4d51e76.274848",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 6393.5,
-    "y": 1845,
-    "z": "4138d8f7.da252",
+    "x": 6476.566665649414,
+    "y": 1927.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "91ebdf82.9979e",
+    "id": "92f3ada6.6626b",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4329.499755859375,
-    "y": 4964,
-    "z": "4138d8f7.da252",
+    "x": 4412.566421508789,
+    "y": 5046.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "148c6264.137e86",
+    "id": "cb8799d5.d6fa78",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4313.499755859375,
-    "y": 4920,
-    "z": "4138d8f7.da252",
+    "x": 4396.566421508789,
+    "y": 5002.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c1a606a9.56c798",
+    "id": "baf89c3.a308c6",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5060.499755859375,
-    "y": 4951,
-    "z": "4138d8f7.da252",
+    "x": 5143.566421508789,
+    "y": 5033.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "fd2b62b6.10b14",
+    "id": "6ac119cc.845568",
     "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": 5147.499755859375,
-    "y": 4993,
-    "z": "4138d8f7.da252",
+    "x": 5230.566421508789,
+    "y": 5075.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f21eb35f.395438",
+    "id": "be6577a4.990a1",
     "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": 5095.499755859375,
-    "y": 5041,
-    "z": "4138d8f7.da252",
+    "x": 5178.566421508789,
+    "y": 5123.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "59f69d26.ab3de4",
+    "id": "ed1c0a9d.7a148",
     "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": 5223.499755859375,
-    "y": 5088,
-    "z": "4138d8f7.da252",
+    "x": 5306.566421508789,
+    "y": 5170.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "59b34ffd.7f824",
+    "id": "80308a85.281f5",
     "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": 4391.500244140625,
-    "y": 5255,
-    "z": "4138d8f7.da252",
+    "x": 4474.566909790039,
+    "y": 5337.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d4ad6d0.458de8",
+    "id": "43c35fa0.488f88",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4374.500244140625,
-    "y": 5317,
-    "z": "4138d8f7.da252",
+    "x": 4457.566909790039,
+    "y": 5399.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "436ccdfb.1e8f5c",
+    "id": "2da9765.20a818a",
     "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": 4485.500244140625,
-    "y": 5359,
-    "z": "4138d8f7.da252",
+    "x": 4568.566909790039,
+    "y": 5441.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "3e23ff77.47e2b",
+    "id": "f1717ef6.023738",
     "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": 4942.499755859375,
-    "y": 5530,
-    "z": "4138d8f7.da252",
+    "x": 5025.566421508789,
+    "y": 5612.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ff11fb03.980398",
+    "id": "99843e38.83dd4",
     "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": 4252.499755859375,
-    "y": 6228,
-    "z": "4138d8f7.da252",
+    "x": 4335.566421508789,
+    "y": 6310.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "4e6fe55.c2f201c",
+    "id": "3c45c16a.44e536",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4185.499755859375,
-    "y": 6182,
-    "z": "4138d8f7.da252",
+    "x": 4268.566421508789,
+    "y": 6264.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "79eda8bd.206ac",
+    "id": "ff6ff2f.c8fff1",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4134.499755859375,
-    "y": 6133,
-    "z": "4138d8f7.da252",
+    "x": 4217.566421508789,
+    "y": 6215.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2a4071b4.a3adee",
+    "id": "1431401.84d5c4",
     "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": 4917.5,
-    "y": 6339,
-    "z": "4138d8f7.da252",
+    "x": 5000.566665649414,
+    "y": 6421.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "124f51e3.777566",
+    "id": "583fc579.afbe3c",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4312.500244140625,
-    "y": 5416,
-    "z": "4138d8f7.da252",
+    "x": 4395.566909790039,
+    "y": 5498.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ce39c047.e7ad38",
-        "bd96b648.334cf8"
+        "57091b18.0fc4d4",
+        "6835f627.925db8"
       ]
     ]
   },
   {
-    "id": "ce39c047.e7ad38",
+    "id": "57091b18.0fc4d4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4523.500244140625,
-    "y": 5416,
-    "z": "4138d8f7.da252",
+    "x": 4606.566909790039,
+    "y": 5498.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "acd66ccf.e95b3"
+        "328e270e.4a59d8"
       ]
     ]
   },
   {
-    "id": "acd66ccf.e95b3",
+    "id": "328e270e.4a59d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4679.500244140625,
-    "y": 5412,
-    "z": "4138d8f7.da252",
+    "x": 4762.566909790039,
+    "y": 5494.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3e23ff77.47e2b",
-        "1f30d01.395cc3",
-        "58a0b8d5.3916c8"
+        "f1717ef6.023738",
+        "d4dec9b1.cf9de8",
+        "6712b992.157"
       ]
     ]
   },
   {
-    "id": "bd96b648.334cf8",
+    "id": "6835f627.925db8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4519.500244140625,
-    "y": 5464,
-    "z": "4138d8f7.da252",
+    "x": 4602.566909790039,
+    "y": 5546.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2c5c5163.2ee716"
+        "bc00cffe.21aeb8"
       ]
     ]
   },
   {
-    "id": "2c5c5163.2ee716",
+    "id": "bc00cffe.21aeb8",
     "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": 4667.500244140625,
-    "y": 5459,
-    "z": "4138d8f7.da252",
+    "x": 4750.566909790039,
+    "y": 5541.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8af1d85e.882ed",
+    "id": "684d6198.d250c8",
     "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": 5184.499755859375,
-    "y": 5159,
-    "z": "4138d8f7.da252",
+    "x": 5267.566421508789,
+    "y": 5241.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "cf6d7172.69b4b8",
+    "id": "ab78fc6f.8a0998",
     "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": 2351.5,
-    "y": 118,
-    "z": "4138d8f7.da252",
+    "x": 2434.566665649414,
+    "y": 200.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "326038f4.f291a",
+    "id": "1e0dcc9a.c7d15b",
     "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": 2285.5,
-    "y": 154,
-    "z": "4138d8f7.da252",
+    "x": 2368.566665649414,
+    "y": 236.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2bce3640.48de4a",
+    "id": "7f3a574e.dafd48",
     "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": 2470.5,
-    "y": 81,
-    "z": "4138d8f7.da252",
+    "x": 2553.566665649414,
+    "y": 163.28575134277344,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7170f2f2.71fadc",
+    "id": "131a46fd.415b69",
     "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": 4219.499755859375,
-    "y": 6294,
-    "z": "4138d8f7.da252",
+    "x": 4302.566421508789,
+    "y": 6376.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2402858c.2e7c4a",
+    "id": "bd42462a.156a88",
     "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": 4352.499755859375,
-    "y": 6342,
-    "z": "4138d8f7.da252",
+    "x": 4435.566421508789,
+    "y": 6424.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "2fcf2035.98d3c",
+    "id": "28f03df7.2bcada",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4171.499755859375,
-    "y": 6400,
-    "z": "4138d8f7.da252",
+    "x": 4254.566421508789,
+    "y": 6482.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c3761e40.b25338",
-        "ce543bbd.a7b0f8"
+        "81c1148f.4cc3d8",
+        "1bb40996.4838a6"
       ]
     ]
   },
   {
-    "id": "c3761e40.b25338",
+    "id": "81c1148f.4cc3d8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4364.499755859375,
-    "y": 6401,
-    "z": "4138d8f7.da252",
+    "x": 4447.566421508789,
+    "y": 6483.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "70442e7d.0be548"
+        "5632e5bc.008fd4"
       ]
     ]
   },
   {
-    "id": "70442e7d.0be548",
+    "id": "5632e5bc.008fd4",
     "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": 4520.499755859375,
-    "y": 6398,
-    "z": "4138d8f7.da252",
+    "x": 4603.566421508789,
+    "y": 6480.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ce543bbd.a7b0f8",
+    "id": "1bb40996.4838a6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4368.499755859375,
-    "y": 6445,
-    "z": "4138d8f7.da252",
+    "x": 4451.566421508789,
+    "y": 6527.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "47cf8ce2.24939c"
+        "2400d348.1454e4"
       ]
     ]
   },
   {
-    "id": "47cf8ce2.24939c",
+    "id": "2400d348.1454e4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4507.499755859375,
-    "y": 6440,
-    "z": "4138d8f7.da252",
+    "x": 4590.566421508789,
+    "y": 6522.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2a4071b4.a3adee",
-        "ca3ef968.6dda08",
-        "9655804c.a8367",
-        "94748373.e9e958",
-        "a0da2cb6.f8de08",
-        "5744849a.cc54ac",
-        "4e084c4a.411b3c",
-        "9bb50a9.812c6f8",
-        "5a3abbf9.5bd584",
-        "860af8d0.fc96e8",
-        "f942597e.1aa18",
-        "fc4aa587.17d69",
-        "afa717d0.25e7a8"
+        "1431401.84d5c4",
+        "cfbbd347.67bf98",
+        "4f0e8fb5.8e798",
+        "e1e51f2c.3838b",
+        "38f3723d.fc373e",
+        "556b17f.21493e8",
+        "72f64404.57e414",
+        "4c65c6ba.14ece",
+        "72bff017.143e6",
+        "debab96e.421598",
+        "e11abdc.71e19c",
+        "6a0cb0e4.5bec78",
+        "811fcd41.48413"
       ]
     ]
   },
   {
-    "id": "4e084c4a.411b3c",
+    "id": "72f64404.57e414",
     "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": 4704.499755859375,
-    "y": 7119,
-    "z": "4138d8f7.da252",
+    "x": 4787.566421508789,
+    "y": 7201.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b531f7cf.459858",
-        "14585404.95eb44",
-        "91bd86e2.073e5"
+        "f17dbf11.a99f78",
+        "840879a8.da7ac",
+        "ff33cdc7.aad138"
       ]
     ]
   },
   {
-    "id": "b531f7cf.459858",
+    "id": "f17dbf11.a99f78",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4899.499969482422,
-    "y": 7094.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4982.566635131836,
+    "y": 7177.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7a861e6f.3259d"
+        "9d7f152f.0d13"
       ]
     ]
   },
   {
-    "id": "14585404.95eb44",
+    "id": "840879a8.da7ac",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4891.990936279297,
-    "y": 7131.574005126953,
-    "z": "4138d8f7.da252",
+    "x": 4975.057601928711,
+    "y": 7213.859756469727,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7b4d1550.4d39b4"
+        "722c6254.b53dd4"
       ]
     ]
   },
   {
-    "id": "91bd86e2.073e5",
+    "id": "ff33cdc7.aad138",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4889.499969482422,
-    "y": 7174.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4972.566635131836,
+    "y": 7257.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c9793222.0d19b8"
+        "2dfdab6e.e9f304"
       ]
     ]
   },
   {
-    "id": "7a861e6f.3259d",
+    "id": "9d7f152f.0d13",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5071.499969482422,
-    "y": 7092.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 5154.566635131836,
+    "y": 7175.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "96392b44.e759e"
+        "f4de49b1.9e78c8"
       ]
     ]
   },
   {
-    "id": "7b4d1550.4d39b4",
+    "id": "722c6254.b53dd4",
     "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": 5054.562347412109,
-    "y": 7131.8597412109375,
-    "z": "4138d8f7.da252",
+    "x": 5137.629013061523,
+    "y": 7214.145492553711,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c9793222.0d19b8",
+    "id": "2dfdab6e.e9f304",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5056.499969482422,
-    "y": 7173.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 5139.566635131836,
+    "y": 7256.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "96392b44.e759e",
+    "id": "f4de49b1.9e78c8",
     "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": 5312.499755859375,
-    "y": 7127,
-    "z": "4138d8f7.da252",
+    "x": 5395.566421508789,
+    "y": 7209.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "dcbe395c.2f719"
+        "c3d85a4.1f615a8"
       ]
     ]
   },
   {
-    "id": "dcbe395c.2f719",
+    "id": "c3d85a4.1f615a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5549.499755859375,
-    "y": 7123,
-    "z": "4138d8f7.da252",
+    "x": 5632.566421508789,
+    "y": 7205.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d5739a70.ba04c"
+        "f610bb15.d46c3"
       ]
     ]
   },
   {
-    "id": "6bd2c51b.a65de4",
+    "id": "3165802b.467878",
     "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": 5816.499755859375,
-    "y": 7089,
-    "z": "4138d8f7.da252",
+    "x": 5899.566421508789,
+    "y": 7171.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c0446363.1c2dd",
-        "c5d80881.fdd1f"
+        "fa2a5991.1b9ca",
+        "bf56d405.cdd208"
       ]
     ]
   },
   {
-    "id": "c0446363.1c2dd",
+    "id": "fa2a5991.1b9ca",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5997.499755859375,
-    "y": 7115,
-    "z": "4138d8f7.da252",
+    "x": 6080.566421508789,
+    "y": 7197.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d5739a70.ba04c"
+        "f610bb15.d46c3"
       ]
     ]
   },
   {
-    "id": "c5d80881.fdd1f",
+    "id": "bf56d405.cdd208",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5996.499755859375,
-    "y": 7068,
-    "z": "4138d8f7.da252",
+    "x": 6079.566421508789,
+    "y": 7150.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "d5739a70.ba04c",
+    "id": "f610bb15.d46c3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4513.499969482422,
-    "y": 7262.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4596.566635131836,
+    "y": 7345.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "edcf20b8.e61748"
+        "c29275cf.22abd8"
       ]
     ]
   },
   {
-    "id": "4fecf72f.04fbc",
+    "id": "424309da.5dae7",
     "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": 5589.499755859375,
-    "y": 7295,
-    "z": "4138d8f7.da252",
+    "x": 5672.566421508789,
+    "y": 7377.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c1969b50.1f4a7",
+    "id": "37faaddd.0a2fe2",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4802.499969482422,
-    "y": 7030.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4885.566635131836,
+    "y": 7113.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "5744849a.cc54ac",
+    "id": "556b17f.21493e8",
     "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": 4686.499755859375,
-    "y": 6915,
-    "z": "4138d8f7.da252",
+    "x": 4769.566421508789,
+    "y": 6997.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3d6f4e35.1dbdf2",
+    "id": "bbd937d0.174fa8",
     "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": 5031.499755859375,
-    "y": 6746,
-    "z": "4138d8f7.da252",
+    "x": 5114.566421508789,
+    "y": 6828.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1b824e77.058e42"
+        "74d7f148.c83f28"
       ]
     ]
   },
   {
-    "id": "1b824e77.058e42",
+    "id": "74d7f148.c83f28",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5251.499755859375,
-    "y": 6752,
-    "z": "4138d8f7.da252",
+    "x": 5334.566421508789,
+    "y": 6834.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2ab4f0b.650811"
+        "e33037d6.9207c"
       ]
     ]
   },
   {
-    "id": "2ab4f0b.650811",
+    "id": "e33037d6.9207c",
     "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": 5436.499755859375,
-    "y": 6751,
-    "z": "4138d8f7.da252",
+    "x": 5519.566421508789,
+    "y": 6833.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a23d4d14.87325"
+        "ff68f8c5.ac398"
       ]
     ]
   },
   {
-    "id": "a23d4d14.87325",
+    "id": "ff68f8c5.ac398",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5628.499755859375,
-    "y": 6754,
-    "z": "4138d8f7.da252",
+    "x": 5711.566421508789,
+    "y": 6836.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2907eab4.583386"
+        "3023756a.3df6f2"
       ]
     ]
   },
   {
-    "id": "2907eab4.583386",
+    "id": "3023756a.3df6f2",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5837.499755859375,
-    "y": 6752,
-    "z": "4138d8f7.da252",
+    "x": 5920.566421508789,
+    "y": 6834.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9bb50a9.812c6f8",
+    "id": "4c65c6ba.14ece",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4738.499755859375,
-    "y": 6740,
-    "z": "4138d8f7.da252",
+    "x": 4821.566421508789,
+    "y": 6822.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3d6f4e35.1dbdf2"
+        "bbd937d0.174fa8"
       ]
     ]
   },
   {
-    "id": "9655804c.a8367",
+    "id": "4f0e8fb5.8e798",
     "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": 4746.499755859375,
-    "y": 6633,
-    "z": "4138d8f7.da252",
+    "x": 4829.566421508789,
+    "y": 6715.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e3853ecb.86ffa8",
-        "e9c51b36.8628d",
-        "65b57cea.285c3c"
+        "689e25a7.4ec344",
+        "fb96069a.99a898",
+        "67a95680.dd059"
       ]
     ]
   },
   {
-    "id": "e3853ecb.86ffa8",
+    "id": "689e25a7.4ec344",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4982.499755859375,
-    "y": 6616,
-    "z": "4138d8f7.da252",
+    "x": 5065.566421508789,
+    "y": 6698.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "e9c51b36.8628d",
+    "id": "fb96069a.99a898",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4979.499755859375,
-    "y": 6657,
-    "z": "4138d8f7.da252",
+    "x": 5062.566421508789,
+    "y": 6739.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "65b57cea.285c3c",
+    "id": "67a95680.dd059",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4993.499755859375,
-    "y": 6697,
-    "z": "4138d8f7.da252",
+    "x": 5076.566421508789,
+    "y": 6779.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "94748373.e9e958",
+    "id": "e1e51f2c.3838b",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4682.499755859375,
-    "y": 6792,
-    "z": "4138d8f7.da252",
+    "x": 4765.566421508789,
+    "y": 6874.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a0da2cb6.f8de08",
+    "id": "38f3723d.fc373e",
     "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": 4690.499755859375,
-    "y": 6850,
-    "z": "4138d8f7.da252",
+    "x": 4773.566421508789,
+    "y": 6932.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ca3ef968.6dda08",
+    "id": "cfbbd347.67bf98",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4695.499755859375,
-    "y": 6590,
-    "z": "4138d8f7.da252",
+    "x": 4778.566421508789,
+    "y": 6672.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "85cec0fe.92a4b",
+    "id": "b798d2b8.423e4",
     "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": 4810.499755859375,
-    "y": 6542,
-    "z": "4138d8f7.da252",
+    "x": 4893.566421508789,
+    "y": 6624.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "edcf20b8.e61748",
+    "id": "c29275cf.22abd8",
     "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": 4803.499969482422,
-    "y": 7257.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4886.566635131836,
+    "y": 7340.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e8e7019e.0ce4e8",
-        "cf2cb292.2ab218"
+        "48d3293f.1d09c8",
+        "2e7c42e6.c2eade"
       ]
     ]
   },
   {
-    "id": "e8e7019e.0ce4e8",
+    "id": "48d3293f.1d09c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5059.499969482422,
-    "y": 7229.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 5142.566635131836,
+    "y": 7312.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2fafeba7.6be734"
+        "fc947668.8a9d8"
       ]
     ]
   },
   {
-    "id": "cf2cb292.2ab218",
+    "id": "2e7c42e6.c2eade",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5059.499969482422,
-    "y": 7278.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 5142.566635131836,
+    "y": 7361.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "997dfd42.35e9c",
+    "id": "86241828.71762",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5325.499969482422,
-    "y": 7270.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 5408.566635131836,
+    "y": 7353.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "fd323ea3.0ba61",
-        "4fecf72f.04fbc",
-        "8645a39d.96b86"
+        "78fc3e29.1eba58",
+        "424309da.5dae7",
+        "7b230c0f.716d14"
       ]
     ]
   },
   {
-    "id": "81edaff5.fe8de8",
+    "id": "ec22280e.4e15f",
     "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": 5717.499755859375,
-    "y": 7349,
-    "z": "4138d8f7.da252",
+    "x": 5800.566421508789,
+    "y": 7431.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8645a39d.96b86",
+    "id": "7b230c0f.716d14",
     "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": 5687.499755859375,
-    "y": 7409,
-    "z": "4138d8f7.da252",
+    "x": 5770.566421508789,
+    "y": 7491.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "fd323ea3.0ba61",
+    "id": "78fc3e29.1eba58",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5594.499755859375,
-    "y": 7237,
-    "z": "4138d8f7.da252",
+    "x": 5677.566421508789,
+    "y": 7319.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a2f25d49.46cd88",
+    "id": "e6235853.96452",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3944.5,
-    "y": 5875,
-    "z": "4138d8f7.da252",
+    "x": 4027.566665649414,
+    "y": 5957.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4e6fe55.c2f201c",
-        "7170f2f2.71fadc",
-        "2402858c.2e7c4a",
-        "2fcf2035.98d3c",
-        "ff11fb03.980398"
+        "3c45c16a.44e536",
+        "131a46fd.415b69",
+        "bd42462a.156a88",
+        "28f03df7.2bcada",
+        "99843e38.83dd4"
       ]
     ]
   },
   {
-    "id": "d7183096.a014a",
+    "id": "825ad15b.e200f",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4687.499755859375,
-    "y": 6690,
-    "z": "4138d8f7.da252",
+    "x": 4770.566421508789,
+    "y": 6772.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "5a3abbf9.5bd584",
+    "id": "72bff017.143e6",
     "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": 4810.5,
-    "y": 6420,
-    "z": "4138d8f7.da252",
+    "x": 4893.566665649414,
+    "y": 6502.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "48e1585a.35691",
+    "id": "218269db.41502e",
     "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": 4947.5,
-    "y": 6370,
-    "z": "4138d8f7.da252",
+    "x": 5030.566665649414,
+    "y": 6452.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "829d6c73.aa7da8",
+    "id": "e1cb1e55.b0357",
     "type": "save",
     "name": "save ROOT UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6409.5,
-    "y": 1904,
-    "z": "4138d8f7.da252",
+    "x": 6492.566665649414,
+    "y": 1986.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "261b01ae.fe9b36",
+    "id": "d01f4492.e07e28",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3675.5,
-    "y": 1298,
-    "z": "4138d8f7.da252",
+    "x": 3758.566665649414,
+    "y": 1380.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f92c744c.f5b4a8",
+    "id": "27d91ce4.eff5e4",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3813.5,
-    "y": 1786,
-    "z": "4138d8f7.da252",
+    "x": 3896.566665649414,
+    "y": 1868.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a9675d4a.27492",
+    "id": "bcdaf6d5.61613",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 6370.5,
-    "y": 2616,
-    "z": "4138d8f7.da252",
+    "x": 6453.566665649414,
+    "y": 2698.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "577ac65e.4cd8e8",
+    "id": "1992e083.76e587",
     "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": 3662.5,
-    "y": 4892,
-    "z": "4138d8f7.da252",
+    "x": 3745.566665649414,
+    "y": 4974.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c33c721b.c24a68",
+    "id": "aaed5b46.7e8eb",
     "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": 3795.5,
-    "y": 4940,
-    "z": "4138d8f7.da252",
+    "x": 3878.566665649414,
+    "y": 5022.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "3da01b2d.c332ec",
+    "id": "d0f2c5e0.41cd1",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4340.499755859375,
-    "y": 5020,
-    "z": "4138d8f7.da252",
+    "x": 4423.566421508789,
+    "y": 5102.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "67f3fde2.d1c4bc",
-        "830cc023.8d75b8"
+        "c51b9855.45ff88",
+        "4079da5.fe1c9a4"
       ]
     ]
   },
   {
-    "id": "67f3fde2.d1c4bc",
+    "id": "c51b9855.45ff88",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4533.499755859375,
-    "y": 5021,
-    "z": "4138d8f7.da252",
+    "x": 4616.566421508789,
+    "y": 5103.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "97ecf17d.e53ae8"
+        "69766fb9.fbb74"
       ]
     ]
   },
   {
-    "id": "830cc023.8d75b8",
+    "id": "4079da5.fe1c9a4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4537.499755859375,
-    "y": 5065,
-    "z": "4138d8f7.da252",
+    "x": 4620.566421508789,
+    "y": 5147.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e6486dc.92da59"
+        "1a522b67.5bcd1d"
       ]
     ]
   },
   {
-    "id": "e6486dc.92da59",
+    "id": "1a522b67.5bcd1d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4676.499755859375,
-    "y": 5060,
-    "z": "4138d8f7.da252",
+    "x": 4759.566421508789,
+    "y": 5142.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f9d2f7c1.e8a63",
-        "2f9c4db0.869cca",
-        "cfcbce5e.a3353"
+        "e1cf34bb.9518e",
+        "6d11acf9.928044",
+        "613e9b77.298d54"
       ]
     ]
   },
   {
-    "id": "97ecf17d.e53ae8",
+    "id": "69766fb9.fbb74",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4676.499755859375,
-    "y": 5017,
-    "z": "4138d8f7.da252",
+    "x": 4759.566421508789,
+    "y": 5099.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "fd2b62b6.10b14",
-        "f21eb35f.395438",
-        "59f69d26.ab3de4",
-        "8af1d85e.882ed"
+        "6ac119cc.845568",
+        "be6577a4.990a1",
+        "ed1c0a9d.7a148",
+        "684d6198.d250c8"
       ]
     ]
   },
   {
-    "id": "f9d2f7c1.e8a63",
+    "id": "e1cf34bb.9518e",
     "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": 5070.499755859375,
-    "y": 5311,
-    "z": "4138d8f7.da252",
+    "x": 5153.566421508789,
+    "y": 5393.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a14dbd8f.fd09c8",
+    "id": "63360813.209ad8",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5077.499755859375,
-    "y": 5265,
-    "z": "4138d8f7.da252",
+    "x": 5160.566421508789,
+    "y": 5347.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "860af8d0.fc96e8",
+    "id": "debab96e.421598",
     "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": 4867.499969482422,
-    "y": 6979.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4950.566635131836,
+    "y": 7062.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f9c4db0.869cca",
+    "id": "6d11acf9.928044",
     "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": 5189.499755859375,
-    "y": 5364,
-    "z": "4138d8f7.da252",
+    "x": 5272.566421508789,
+    "y": 5446.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "1f30d01.395cc3",
+    "id": "d4dec9b1.cf9de8",
     "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": 5071.499755859375,
-    "y": 5582,
-    "z": "4138d8f7.da252",
+    "x": 5154.566421508789,
+    "y": 5664.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f7b3410e.fff05",
+    "id": "dbce4650.6b5848",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3617.5,
-    "y": 4341,
-    "z": "4138d8f7.da252",
+    "x": 3700.566665649414,
+    "y": 4423.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7607e020.fe77f",
+    "id": "edcfccb6.0b10e8",
     "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": 3951.5,
-    "y": 4524,
-    "z": "4138d8f7.da252",
+    "x": 4034.566665649414,
+    "y": 4606.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "e8ff43f0.c9213",
+    "id": "c7aee100.ec3998",
     "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": 3563.5,
-    "y": 4391,
-    "z": "4138d8f7.da252",
+    "x": 3646.566665649414,
+    "y": 4473.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3f20a2e3.9197ce",
-        "836b51a4.29ff7",
-        "a19206dd.24a2b8"
+        "1339ee7e.d32932",
+        "f08ce63a.aff18",
+        "a999ee96.e09558"
       ]
     ]
   },
   {
-    "id": "836b51a4.29ff7",
+    "id": "f08ce63a.aff18",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3790.990966796875,
-    "y": 4363.573974609375,
-    "z": "4138d8f7.da252",
+    "x": 3874.057632446289,
+    "y": 4445.859725952148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cc477903.35a1a8"
+        "1c6fd05d.948d88"
       ]
     ]
   },
   {
-    "id": "a19206dd.24a2b8",
+    "id": "a999ee96.e09558",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3786.5,
-    "y": 4407.999938964844,
-    "z": "4138d8f7.da252",
+    "x": 3869.566665649414,
+    "y": 4490.285690307617,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9ac9aba4.1e8ac"
+        "1f86883b.9ad4a8"
       ]
     ]
   },
   {
-    "id": "cc477903.35a1a8",
+    "id": "1c6fd05d.948d88",
     "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": 3953.5625,
-    "y": 4362.859680175781,
-    "z": "4138d8f7.da252",
+    "x": 4036.629165649414,
+    "y": 4445.145431518555,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9ac9aba4.1e8ac",
+    "id": "1f86883b.9ad4a8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3954.5,
-    "y": 4407.999938964844,
-    "z": "4138d8f7.da252",
+    "x": 4037.566665649414,
+    "y": 4490.285690307617,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "44a45bc4.fd8d24",
+    "id": "1213361d.be12aa",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3739.5,
-    "y": 4481,
-    "z": "4138d8f7.da252",
+    "x": 3822.566665649414,
+    "y": 4563.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8f06a9d6.e85d2",
-        "7607e020.fe77f"
+        "fbd53f4.dd8234",
+        "edcfccb6.0b10e8"
       ]
     ]
   },
   {
-    "id": "3f20a2e3.9197ce",
+    "id": "1339ee7e.d32932",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3570.5,
-    "y": 4481,
-    "z": "4138d8f7.da252",
+    "x": 3653.566665649414,
+    "y": 4563.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "44a45bc4.fd8d24"
+        "1213361d.be12aa"
       ]
     ]
   },
   {
-    "id": "8f06a9d6.e85d2",
+    "id": "fbd53f4.dd8234",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3928.5,
-    "y": 4473,
-    "z": "4138d8f7.da252",
+    "x": 4011.566665649414,
+    "y": 4555.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c23415ae.23176",
+    "id": "b969bbc7.e53528",
     "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": 3770.5,
-    "y": 4768,
-    "z": "4138d8f7.da252",
+    "x": 3853.566665649414,
+    "y": 4850.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "cb253b17.73576",
+    "id": "a6ad0dd0.a6fcc8",
     "type": "comment",
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",
     "info": "",
     "comments": "",
-    "x": 3553.5,
-    "y": 2851,
-    "z": "4138d8f7.da252",
+    "x": 3636.566665649414,
+    "y": 2933.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9d7a29e5.a75ec",
+    "id": "d73dbef9.62ae5",
     "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": 2758.5,
-    "y": 4413,
-    "z": "4138d8f7.da252",
+    "x": 2841.566665649414,
+    "y": 4495.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8b862d24.0bbe68",
+    "id": "38b3d969.be8c96",
     "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": 3181.5,
-    "y": 4686,
-    "z": "4138d8f7.da252",
+    "x": 3264.566665649414,
+    "y": 4768.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b605d8db.884f2",
-        "fdd54f31.8fbee"
+        "4afa5be1.7f901c",
+        "3036b28a.042a4e"
       ]
     ]
   },
   {
-    "id": "db2110db.2b1778",
+    "id": "d77e7161.5348c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3013.5,
-    "y": 4689,
-    "z": "4138d8f7.da252",
+    "x": 3096.566665649414,
+    "y": 4771.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8b862d24.0bbe68"
+        "38b3d969.be8c96"
       ]
     ]
   },
   {
-    "id": "fdd54f31.8fbee",
+    "id": "3036b28a.042a4e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3344.5,
-    "y": 4705,
-    "z": "4138d8f7.da252",
+    "x": 3427.566665649414,
+    "y": 4787.285751342773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9f11b3.a8080e5"
+        "300daee4.3b0352"
       ]
     ]
   },
   {
-    "id": "b605d8db.884f2",
+    "id": "4afa5be1.7f901c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3380.5,
-    "y": 3312,
-    "z": "4138d8f7.da252",
+    "x": 3463.566665649414,
+    "y": 3394.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "947600ba.b5e73"
+        "afe0131e.843c9"
       ]
     ]
   },
   {
-    "id": "4f6ce4fa.367e24",
+    "id": "40724b83.4d51bc",
     "type": "switchNode",
     "name": "switch leafuni.data-source == gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3729.5,
-    "y": 3154,
-    "z": "4138d8f7.da252",
+    "x": 3812.566665649414,
+    "y": 3236.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cc96bd45.2e2b6",
-        "f9a0faf9.5c3dc8"
+        "822b2d43.9a91a",
+        "33ca94.ea4af56c"
       ]
     ]
   },
   {
-    "id": "cc96bd45.2e2b6",
+    "id": "822b2d43.9a91a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3934.5,
-    "y": 3150,
-    "z": "4138d8f7.da252",
+    "x": 4017.566665649414,
+    "y": 3232.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f9a0faf9.5c3dc8",
+    "id": "33ca94.ea4af56c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3936.5,
-    "y": 3200,
-    "z": "4138d8f7.da252",
+    "x": 4019.566665649414,
+    "y": 3282.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7a40f51a.96d7fc"
+        "1d0af02e.93b4f"
       ]
     ]
   },
   {
-    "id": "7a40f51a.96d7fc",
+    "id": "1d0af02e.93b4f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4092.5,
-    "y": 3206,
-    "z": "4138d8f7.da252",
+    "x": 4175.566665649414,
+    "y": 3288.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2c2d832.1ec14fc",
-        "16e3f1c0.bf6bbe",
-        "3515662b.208b2a",
-        "271e520.e6acbae"
+        "523d0093.735cb",
+        "21f4d27b.d11a96",
+        "1c5f100e.a5d978",
+        "2d4de683.3992d2"
       ]
     ]
   },
   {
-    "id": "2c2d832.1ec14fc",
+    "id": "523d0093.735cb",
     "type": "set",
     "name": "set bwModified",
     "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 4318.500244140625,
-    "y": 2947,
-    "z": "4138d8f7.da252",
+    "x": 4401.566909790039,
+    "y": 3029.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f6d89aab.47f778",
+    "id": "fce8efa1.5f12e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4817.499725341797,
-    "y": 4243.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4900.566390991211,
+    "y": 4326.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f49c2dcf.bc27d8",
-        "cc8917f6.431d58"
+        "e3611e5a.49f6f",
+        "7474f571.02042c"
       ]
     ]
   },
   {
-    "id": "cc8917f6.431d58",
+    "id": "7474f571.02042c",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5019.499481201172,
-    "y": 4210.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 5102.566146850586,
+    "y": 4293.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a80257aa.4070f",
+    "id": "c554c9c8.b91c38",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4703.499969482422,
-    "y": 4420.999725341797,
-    "z": "4138d8f7.da252",
+    "x": 4786.566635131836,
+    "y": 4503.28547668457,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d0212ac6.85c08",
+    "id": "9c21225.8549a6",
     "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": 4700.562103271484,
-    "y": 4369.8597412109375,
-    "z": "4138d8f7.da252",
+    "x": 4783.628768920898,
+    "y": 4452.145492553711,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "efad35a4.dd1e7",
+    "id": "6669e686.3a92d",
     "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": 4283.499725341797,
-    "y": 4243.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4366.566390991211,
+    "y": 4326.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "bbd4adaa.78aa88"
+        "6cdd29ff.2176f"
       ]
     ]
   },
   {
-    "id": "bbd4adaa.78aa88",
+    "id": "6cdd29ff.2176f",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4488.499725341797,
-    "y": 4243.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4571.566390991211,
+    "y": 4326.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7d1062e5.6c959c"
+        "462e489b.1c9ea8"
       ]
     ]
   },
   {
-    "id": "7d1062e5.6c959c",
+    "id": "462e489b.1c9ea8",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4654.499725341797,
-    "y": 4243.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4737.566390991211,
+    "y": 4326.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f6d89aab.47f778"
+        "fce8efa1.5f12e"
       ]
     ]
   },
   {
-    "id": "f49c2dcf.bc27d8",
+    "id": "e3611e5a.49f6f",
     "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": 4326.499725341797,
-    "y": 4321.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4409.566390991211,
+    "y": 4404.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2b073b5b.643194",
-        "ffd59a4c.14fa7",
-        "2abdbd7a.263a72"
+        "5af860a5.71ed3",
+        "234eb12a.7530fe",
+        "358a6c9c.71984c"
       ]
     ]
   },
   {
-    "id": "2b073b5b.643194",
+    "id": "5af860a5.71ed3",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4537.499725341797,
-    "y": 4323.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4620.566390991211,
+    "y": 4406.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b25769d8.6df3c8"
+        "e32197a7.4c81d8"
       ]
     ]
   },
   {
-    "id": "ffd59a4c.14fa7",
+    "id": "234eb12a.7530fe",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4537.990692138672,
-    "y": 4369.574005126953,
-    "z": "4138d8f7.da252",
+    "x": 4621.057357788086,
+    "y": 4451.859756469727,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d0212ac6.85c08"
+        "9c21225.8549a6"
       ]
     ]
   },
   {
-    "id": "2abdbd7a.263a72",
+    "id": "358a6c9c.71984c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4535.499725341797,
-    "y": 4412.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4618.566390991211,
+    "y": 4495.285720825195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a80257aa.4070f"
+        "c554c9c8.b91c38"
       ]
     ]
   },
   {
-    "id": "947600ba.b5e73",
+    "id": "afe0131e.843c9",
     "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": 3603.5,
-    "y": 2997,
-    "z": "4138d8f7.da252",
+    "x": 3686.566665649414,
+    "y": 3079.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6a786745.af48",
-        "a633d7c2.0708",
-        "f368276f.48f958"
+        "9dbeb0e5.86c59",
+        "ca19c457.91ce7",
+        "a8db99d3.ea1d58"
       ]
     ]
   },
   {
-    "id": "a633d7c2.0708",
+    "id": "ca19c457.91ce7",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3830.990966796875,
-    "y": 2969.573974609375,
-    "z": "4138d8f7.da252",
+    "x": 3914.057632446289,
+    "y": 3051.8597259521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "30a6f1cd.e89f6e"
+        "940a0baf.b50538"
       ]
     ]
   },
   {
-    "id": "f368276f.48f958",
+    "id": "a8db99d3.ea1d58",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3826.5,
-    "y": 3013.9999389648438,
-    "z": "4138d8f7.da252",
+    "x": 3909.566665649414,
+    "y": 3096.285690307617,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "868e3def.777d88"
+        "199d9fc8.23d478"
       ]
     ]
   },
   {
-    "id": "30a6f1cd.e89f6e",
+    "id": "940a0baf.b50538",
     "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": 3993.5625,
-    "y": 2968.8596801757812,
-    "z": "4138d8f7.da252",
+    "x": 4076.629165649414,
+    "y": 3051.1454315185547,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "868e3def.777d88",
+    "id": "199d9fc8.23d478",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3994.5,
-    "y": 3013.9999389648438,
-    "z": "4138d8f7.da252",
+    "x": 4077.566665649414,
+    "y": 3096.285690307617,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6a786745.af48",
+    "id": "9dbeb0e5.86c59",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3838.5,
-    "y": 3064,
-    "z": "4138d8f7.da252",
+    "x": 3921.566665649414,
+    "y": 3146.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4f6ce4fa.367e24"
+        "40724b83.4d51bc"
       ]
     ]
   },
   {
-    "id": "e1ab631b.742fc",
+    "id": "667c445f.dc3e5c",
     "type": "comment",
     "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",
     "info": "",
     "comments": "",
-    "x": 3728.383331298828,
-    "y": 3254.883331298828,
-    "z": "4138d8f7.da252",
+    "x": 3811.449996948242,
+    "y": 3337.1690826416016,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9ac35f29.2f46a8",
+    "id": "7651a38e.4e7e44",
     "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": 3710.10009765625,
-    "y": 3816.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 3793.166763305664,
+    "y": 3898.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3dda5d6b.eae642",
+    "id": "e0666b60.cb174",
     "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": 3848.10009765625,
-    "y": 3874.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 3931.166763305664,
+    "y": 3956.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "16e3f1c0.bf6bbe",
+    "id": "21f4d27b.d11a96",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3426.10009765625,
-    "y": 3556.083251953125,
-    "z": "4138d8f7.da252",
+    "x": 3509.166763305664,
+    "y": 3638.3690032958984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "616a588c.b788e8",
-        "23b69bc.0871b64",
-        "92806e4e.351398"
+        "407839fb.167e2",
+        "931a7a68.51c848",
+        "f4ea682a.e63f08"
       ]
     ]
   },
   {
-    "id": "14abd55c.d773d3",
+    "id": "91a690e7.1a5918",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3667.10009765625,
-    "y": 3984.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 3750.166763305664,
+    "y": 4066.7691497802734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5c65738b.87fde4",
-        "f1d641f8.d259a8"
+        "34fa09a4.b2b1ae",
+        "809131d.392dfd"
       ]
     ]
   },
   {
-    "id": "5c65738b.87fde4",
+    "id": "34fa09a4.b2b1ae",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3860.10009765625,
-    "y": 3985.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 3943.166763305664,
+    "y": 4067.7691497802734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "65a9280d.a9da1"
+        "b77388f8.551df8"
       ]
     ]
   },
   {
-    "id": "f1d641f8.d259a8",
+    "id": "809131d.392dfd",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3864.10009765625,
-    "y": 4029.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 3947.166763305664,
+    "y": 4111.769149780273,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5b392e39.74c58"
+        "2e72f134.3b345e"
       ]
     ]
   },
   {
-    "id": "5b392e39.74c58",
+    "id": "2e72f134.3b345e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4003.10009765625,
-    "y": 4024.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 4086.166763305664,
+    "y": 4106.769149780273,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "efad35a4.dd1e7"
+        "6669e686.3a92d"
       ]
     ]
   },
   {
-    "id": "65a9280d.a9da1",
+    "id": "b77388f8.551df8",
     "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": 4004.10009765625,
-    "y": 3981.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 4087.166763305664,
+    "y": 4063.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3515662b.208b2a",
+    "id": "1c5f100e.a5d978",
     "type": "switchNode",
     "name": "switch leafuni.data-source > gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4352.217041015625,
-    "y": 3203.283447265625,
-    "z": "4138d8f7.da252",
+    "x": 4435.283706665039,
+    "y": 3285.5691986083984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d3894fc3.10eb48",
-        "b517f9eb.6c257"
+        "f17d25a9.fc3a28",
+        "d1a832ec.f421b"
       ]
     ]
   },
   {
-    "id": "d3894fc3.10eb48",
+    "id": "f17d25a9.fc3a28",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4551.384033203125,
-    "y": 3269.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 4634.450698852539,
+    "y": 3352.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d481f8d7.46db"
+        "3ef002bf.b5c35e"
       ]
     ]
   },
   {
-    "id": "b517f9eb.6c257",
+    "id": "d1a832ec.f421b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4573.384033203125,
-    "y": 3114.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 4656.450698852539,
+    "y": 3197.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "543771c5.3e82b"
+        "d05f5529.96a4b8"
       ]
     ]
   },
   {
-    "id": "271e520.e6acbae",
+    "id": "2d4de683.3992d2",
     "type": "save",
     "name": "update LEAF UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4351.217041015625,
-    "y": 3058.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 4434.283706665039,
+    "y": 3140.7691497802734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "5841cd16.599de4",
+    "id": "e42871e4.7e7078",
     "type": "comment",
     "name": "update LEAF UNI with the new bw",
     "info": "",
     "comments": "",
-    "x": 4367.384033203125,
-    "y": 3011.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 4450.450698852539,
+    "y": 3094.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c6724a1e.a746a",
+    "id": "dcbc2987.d3bdd",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4922.14990234375,
-    "y": 2466.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5005.216567993164,
+    "y": 2549.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f5319096.b377c8",
+    "id": "feb1ef44.b73648",
     "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": 5524.14990234375,
-    "y": 2571.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5607.216567993164,
+    "y": 2654.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "1d10f282.65ef3d",
+    "id": "56698383.1dde24",
     "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": 4914.149658203125,
-    "y": 2512.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 4997.216323852539,
+    "y": 2595.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e6ffa5af.877ac",
-        "53ba0501.50937c",
-        "f8ebf6c0.ef2f7"
+        "b538dd4e.00fce",
+        "3917ea5e.68d896",
+        "234d36ee.00b9a2"
       ]
     ]
   },
   {
-    "id": "53ba0501.50937c",
+    "id": "3917ea5e.68d896",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5141.640625,
-    "y": 2485.457275390625,
-    "z": "4138d8f7.da252",
+    "x": 5224.707290649414,
+    "y": 2567.7430267333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "25bf7485.4207ec"
+        "bb66fc72.62525"
       ]
     ]
   },
   {
-    "id": "f8ebf6c0.ef2f7",
+    "id": "234d36ee.00b9a2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5137.149658203125,
-    "y": 2529.8832397460938,
-    "z": "4138d8f7.da252",
+    "x": 5220.216323852539,
+    "y": 2612.168991088867,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8cc56294.07b6a"
+        "2eceea5f.8355a6"
       ]
     ]
   },
   {
-    "id": "25bf7485.4207ec",
+    "id": "bb66fc72.62525",
     "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": 5304.212158203125,
-    "y": 2484.7429809570312,
-    "z": "4138d8f7.da252",
+    "x": 5387.278823852539,
+    "y": 2567.0287322998047,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8cc56294.07b6a",
+    "id": "2eceea5f.8355a6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5305.149658203125,
-    "y": 2529.8832397460938,
-    "z": "4138d8f7.da252",
+    "x": 5388.216323852539,
+    "y": 2612.168991088867,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "29839d19.ca2152",
+    "id": "b5d59b15.1b765",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5302.149658203125,
-    "y": 2579.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5385.216323852539,
+    "y": 2662.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4a49d064.4801a8",
-        "f5319096.b377c8"
+        "85d5ae48.70e33",
+        "feb1ef44.b73648"
       ]
     ]
   },
   {
-    "id": "e6ffa5af.877ac",
+    "id": "b538dd4e.00fce",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5133.149658203125,
-    "y": 2579.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5216.216323852539,
+    "y": 2662.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "29839d19.ca2152"
+        "b5d59b15.1b765"
       ]
     ]
   },
   {
-    "id": "4a49d064.4801a8",
+    "id": "85d5ae48.70e33",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",
     "comments": "",
-    "x": 5484.150390625,
-    "y": 2521.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5567.217056274414,
+    "y": 2604.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "fc1d58de.266bc8",
+    "id": "3c4fd972.8c727e",
     "type": "comment",
     "name": "bw+ has increased ",
     "info": "",
     "comments": "",
-    "x": 4565.383331298828,
-    "y": 3076.883331298828,
-    "z": "4138d8f7.da252",
+    "x": 4648.449996948242,
+    "y": 3159.1690826416016,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "81aa1dbe.56ac78",
+    "id": "9a2b9c1d.56f0c",
     "type": "comment",
     "name": "bw- has decreased",
     "info": "",
     "comments": "",
-    "x": 4564.217041015625,
-    "y": 3233.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 4647.283706665039,
+    "y": 3315.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "175559ed.ae176e",
+    "id": "22475743.9e3838",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5013.21630859375,
-    "y": 2806.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5096.282974243164,
+    "y": 2888.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b4d05ea3.ef437",
+    "id": "791cfc48.d2aabc",
     "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": 5615.21630859375,
-    "y": 2911.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5698.282974243164,
+    "y": 2993.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "909ddf1c.4247f",
+    "id": "b94b085c.7cb5a8",
     "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": 5005.216064453125,
-    "y": 2852.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5088.282730102539,
+    "y": 2934.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6ec56bfe.bf9374",
-        "ac80268f.768e5",
-        "a8e739ac.bd4b"
+        "d976d76c.67e958",
+        "8e60ee6f.c2d2f",
+        "835f78f2.c41258"
       ]
     ]
   },
   {
-    "id": "ac80268f.768e5",
+    "id": "8e60ee6f.c2d2f",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5232.70703125,
-    "y": 2825.25732421875,
-    "z": "4138d8f7.da252",
+    "x": 5315.773696899414,
+    "y": 2907.5430755615234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c8c7d986.838778"
+        "bf2ec467.02c0d8"
       ]
     ]
   },
   {
-    "id": "a8e739ac.bd4b",
+    "id": "835f78f2.c41258",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5228.216064453125,
-    "y": 2869.6832885742188,
-    "z": "4138d8f7.da252",
+    "x": 5311.282730102539,
+    "y": 2951.969039916992,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3dcb1fdf.a3fec"
+        "c322ac12.a985c8"
       ]
     ]
   },
   {
-    "id": "c8c7d986.838778",
+    "id": "bf2ec467.02c0d8",
     "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": 5395.278564453125,
-    "y": 2824.5430297851562,
-    "z": "4138d8f7.da252",
+    "x": 5478.345230102539,
+    "y": 2906.8287811279297,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3dcb1fdf.a3fec",
+    "id": "c322ac12.a985c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5396.216064453125,
-    "y": 2869.6832885742188,
-    "z": "4138d8f7.da252",
+    "x": 5479.282730102539,
+    "y": 2951.969039916992,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9b0bdc3d.6e83d8",
+    "id": "380b5701.029218",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5393.216064453125,
-    "y": 2919.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5476.282730102539,
+    "y": 3001.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e12fb18d.e25528",
-        "b4d05ea3.ef437"
+        "2037a317.5823d4",
+        "791cfc48.d2aabc"
       ]
     ]
   },
   {
-    "id": "6ec56bfe.bf9374",
+    "id": "d976d76c.67e958",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5224.216064453125,
-    "y": 2919.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5307.282730102539,
+    "y": 3001.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9b0bdc3d.6e83d8"
+        "380b5701.029218"
       ]
     ]
   },
   {
-    "id": "e12fb18d.e25528",
+    "id": "2037a317.5823d4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",
     "comments": "",
-    "x": 5575.216796875,
-    "y": 2861.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5658.283462524414,
+    "y": 2943.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "77cc19f0.65a298",
+    "id": "d383ac36.342cc",
     "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": 4930.216064453125,
-    "y": 2765.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 5013.282730102539,
+    "y": 2847.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d481f8d7.46db",
+    "id": "3ef002bf.b5c35e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4723.383331298828,
-    "y": 3258.883331298828,
-    "z": "4138d8f7.da252",
+    "x": 4806.449996948242,
+    "y": 3341.1690826416016,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "77cc19f0.65a298",
-        "909ddf1c.4247f",
-        "d39256ff.c99e4"
+        "d383ac36.342cc",
+        "b94b085c.7cb5a8",
+        "37f3e792.01b98"
       ]
     ]
   },
   {
-    "id": "543771c5.3e82b",
+    "id": "d05f5529.96a4b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4744.11669921875,
-    "y": 3085.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 4827.183364868164,
+    "y": 3167.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9e50adf.3f804d",
-        "1d10f282.65ef3d",
-        "3c12d321.f6ab2c"
+        "30b48cfc.8858f4",
+        "56698383.1dde24",
+        "9f73e0e4.5bd9a8"
       ]
     ]
   },
   {
-    "id": "9e50adf.3f804d",
+    "id": "30b48cfc.8858f4",
     "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": 4878.949462890625,
-    "y": 2391.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 4962.016128540039,
+    "y": 2473.7691497802734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d7fa5270.13e728",
+    "id": "eb34d49c.d22a8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4338.2666015625,
-    "y": 3158.683349609375,
-    "z": "4138d8f7.da252",
+    "x": 4421.333267211914,
+    "y": 3240.9691009521484,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "fea06caf.d7087",
+    "id": "2675acce.b9a12c",
     "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": 3807.600067138672,
-    "y": 4147.483856201172,
-    "z": "4138d8f7.da252",
+    "x": 3890.666732788086,
+    "y": 4229.769607543945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "5c1ea12c.02fb18",
+    "id": "b63f121.ce4247",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3642.600067138672,
-    "y": 4219.683807373047,
-    "z": "4138d8f7.da252",
+    "x": 3725.666732788086,
+    "y": 4301.96955871582,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b82e9023.76f9f8",
-        "f2f0e3e2.cfb0a8"
+        "8b9ac42e.1e08f",
+        "109545ec.57786a"
       ]
     ]
   },
   {
-    "id": "b82e9023.76f9f8",
+    "id": "8b9ac42e.1e08f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3853.600067138672,
-    "y": 4219.683807373047,
-    "z": "4138d8f7.da252",
+    "x": 3936.666732788086,
+    "y": 4301.96955871582,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4d4a5650.900498"
+        "8bee6e1e.eff33"
       ]
     ]
   },
   {
-    "id": "f2f0e3e2.cfb0a8",
+    "id": "109545ec.57786a",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3849.600067138672,
-    "y": 4267.683807373047,
-    "z": "4138d8f7.da252",
+    "x": 3932.666732788086,
+    "y": 4349.96955871582,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "87662134.188498"
+        "a4995391.fc5358"
       ]
     ]
   },
   {
-    "id": "4d4a5650.900498",
+    "id": "8bee6e1e.eff33",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4009.600067138672,
-    "y": 4215.683807373047,
-    "z": "4138d8f7.da252",
+    "x": 4092.666732788086,
+    "y": 4297.96955871582,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cdbc2fd5.f72b4"
+        "b36b53d7.2d66a8"
       ]
     ]
   },
   {
-    "id": "87662134.188498",
+    "id": "a4995391.fc5358",
     "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": 3997.600067138672,
-    "y": 4262.683807373047,
-    "z": "4138d8f7.da252",
+    "x": 4080.666732788086,
+    "y": 4344.96955871582,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "2111dda1.fcbdb2",
+    "id": "294f0835.1325e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4850.566162109375,
-    "y": 4529.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4933.632827758789,
+    "y": 4612.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4fae975f.53fc68",
-        "c1f934d5.cc0aa8"
+        "66149bc9.393fc4",
+        "ca1fbeb5.c9d45"
       ]
     ]
   },
   {
-    "id": "c1f934d5.cc0aa8",
+    "id": "ca1fbeb5.c9d45",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5093.56640625,
-    "y": 4498.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 5176.633071899414,
+    "y": 4581.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "cf80b7cc.7e2e9",
+    "id": "fb61c0ac.1edc98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4710.566162109375,
-    "y": 4639.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4793.632827758789,
+    "y": 4722.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "94dec63b.8ae1e"
+        "3b9c82f6.e6f406"
       ]
     ]
   },
   {
-    "id": "840bbd02.3035a",
+    "id": "ca5b121a.c4f29",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4698.56640625,
-    "y": 4732.8828125,
-    "z": "4138d8f7.da252",
+    "x": 4781.633071899414,
+    "y": 4815.168563842773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "cdbcda75.ac4888",
+    "id": "27d3cdcb.a5be82",
     "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": 4700.6285400390625,
-    "y": 4687.742340087891,
-    "z": "4138d8f7.da252",
+    "x": 4783.695205688477,
+    "y": 4770.028091430664,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "cdbc2fd5.f72b4",
+    "id": "b36b53d7.2d66a8",
     "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": 4316.566162109375,
-    "y": 4529.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4399.632827758789,
+    "y": 4612.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "bc868ed9.895db8"
+        "a0726a73.552d38"
       ]
     ]
   },
   {
-    "id": "bc868ed9.895db8",
+    "id": "a0726a73.552d38",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4521.566162109375,
-    "y": 4529.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4604.632827758789,
+    "y": 4612.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7ae6a8de.c87848"
+        "c054f471.25372"
       ]
     ]
   },
   {
-    "id": "7ae6a8de.c87848",
+    "id": "c054f471.25372",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4687.566162109375,
-    "y": 4529.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4770.632827758789,
+    "y": 4612.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2111dda1.fcbdb2"
+        "294f0835.1325e"
       ]
     ]
   },
   {
-    "id": "4fae975f.53fc68",
+    "id": "66149bc9.393fc4",
     "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": 4326.566162109375,
-    "y": 4639.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4409.632827758789,
+    "y": 4722.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c295dc4d.214d28",
-        "c45fd018.eeb138",
-        "e9db7616.b3ebb8"
+        "6e23d592.fd6b7c",
+        "ebdcd4d0.c0565",
+        "cbc774c8.750668"
       ]
     ]
   },
   {
-    "id": "c295dc4d.214d28",
+    "id": "6e23d592.fd6b7c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4537.566162109375,
-    "y": 4641.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4620.632827758789,
+    "y": 4724.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cf80b7cc.7e2e9"
+        "fb61c0ac.1edc98"
       ]
     ]
   },
   {
-    "id": "c45fd018.eeb138",
+    "id": "ebdcd4d0.c0565",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4538.05712890625,
-    "y": 4687.456604003906,
-    "z": "4138d8f7.da252",
+    "x": 4621.123794555664,
+    "y": 4769.74235534668,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cdbcda75.ac4888"
+        "27d3cdcb.a5be82"
       ]
     ]
   },
   {
-    "id": "e9db7616.b3ebb8",
+    "id": "cbc774c8.750668",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4535.566162109375,
-    "y": 4730.882568359375,
-    "z": "4138d8f7.da252",
+    "x": 4618.632827758789,
+    "y": 4813.168319702148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "840bbd02.3035a"
+        "ca5b121a.c4f29"
       ]
     ]
   },
   {
-    "id": "297b4ae7.8b9706",
+    "id": "c9811fe.3333a6",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5946.383056640625,
-    "y": 7029.08349609375,
-    "z": "4138d8f7.da252",
+    "x": 6029.449722290039,
+    "y": 7111.369247436523,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "457d3858.29d0e",
+    "id": "e4958a72.db4418",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5214.850067138672,
-    "y": 4260.283172607422,
-    "z": "4138d8f7.da252",
+    "x": 5297.916732788086,
+    "y": 4342.568923950195,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b25769d8.6df3c8",
+    "id": "e32197a7.4c81d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4716.850311279297,
-    "y": 4326.283172607422,
-    "z": "4138d8f7.da252",
+    "x": 4799.916976928711,
+    "y": 4408.568923950195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "201cbbc6.38c61c",
+    "id": "c808b6be.91a2f",
     "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": 5247.850067138672,
-    "y": 4328.283172607422,
-    "z": "4138d8f7.da252",
+    "x": 5330.916732788086,
+    "y": 4410.568923950195,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "823be1e9.77a818",
-        "82dbf116.45c298"
+        "81cfd436.09d848",
+        "56387492.e922bc"
       ]
     ]
   },
   {
-    "id": "823be1e9.77a818",
+    "id": "81cfd436.09d848",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5372.850067138672,
-    "y": 4226.282928466797,
-    "z": "4138d8f7.da252",
+    "x": 5455.916732788086,
+    "y": 4308.56867980957,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ea4b8bb2.02c728"
+        "f77cd261.9bc248"
       ]
     ]
   },
   {
-    "id": "82dbf116.45c298",
+    "id": "56387492.e922bc",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5491.85009765625,
-    "y": 4300.282958984375,
-    "z": "4138d8f7.da252",
+    "x": 5574.916763305664,
+    "y": 4382.568710327148,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "12318d1c.9b97cb",
+    "id": "ebf96cf8.b5e018",
     "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": 4460.533203125,
-    "y": 3872,
-    "z": "4138d8f7.da252",
+    "x": 4543.599868774414,
+    "y": 3954.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "1c49d26a.15504e",
+    "id": "305ba790.74ff78",
     "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": 4805.533203125,
-    "y": 3734,
-    "z": "4138d8f7.da252",
+    "x": 4888.599868774414,
+    "y": 3816.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ee8d9735.9d0e18"
+        "810cd856.9ccc78"
       ]
     ]
   },
   {
-    "id": "75d5369a.76387",
+    "id": "c7beb2fc.58c5e",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4512.533203125,
-    "y": 3728,
-    "z": "4138d8f7.da252",
+    "x": 4595.599868774414,
+    "y": 3810.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1c49d26a.15504e"
+        "305ba790.74ff78"
       ]
     ]
   },
   {
-    "id": "2e9ad10b.18ccd6",
+    "id": "42cb0058.08b348",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4767.533203125,
-    "y": 3685,
-    "z": "4138d8f7.da252",
+    "x": 4850.599868774414,
+    "y": 3767.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "8bf9488.63f0cb8",
+    "id": "f96c39ea.1e754",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4456.533203125,
-    "y": 3780,
-    "z": "4138d8f7.da252",
+    "x": 4539.599868774414,
+    "y": 3862.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "4168ca78.86bd8c",
+    "id": "9b7536d9.f58d3",
     "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": 4464.533203125,
-    "y": 3825,
-    "z": "4138d8f7.da252",
+    "x": 4547.599868774414,
+    "y": 3907.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6e2860cf.ccae3",
+    "id": "78f36f08.9d23a",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4461.533203125,
-    "y": 3678,
-    "z": "4138d8f7.da252",
+    "x": 4544.599868774414,
+    "y": 3760.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ee8d9735.9d0e18",
+    "id": "810cd856.9ccc78",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4714.533203125,
-    "y": 3802,
-    "z": "4138d8f7.da252",
+    "x": 4797.599868774414,
+    "y": 3884.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "16183a46.3a0a2e"
+        "842c0b07.9daf5"
       ]
     ]
   },
   {
-    "id": "16183a46.3a0a2e",
+    "id": "842c0b07.9daf5",
     "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": 4899.533203125,
-    "y": 3801,
-    "z": "4138d8f7.da252",
+    "x": 4982.599868774414,
+    "y": 3883.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9cdceec0.5d3c1"
+        "effe4e96.61186"
       ]
     ]
   },
   {
-    "id": "9cdceec0.5d3c1",
+    "id": "effe4e96.61186",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5091.533203125,
-    "y": 3804,
-    "z": "4138d8f7.da252",
+    "x": 5174.599868774414,
+    "y": 3886.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a8a5fc36.2f7d"
+        "e837bc5d.d6f4a"
       ]
     ]
   },
   {
-    "id": "a8a5fc36.2f7d",
+    "id": "e837bc5d.d6f4a",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5263.533203125,
-    "y": 3800,
-    "z": "4138d8f7.da252",
+    "x": 5346.599868774414,
+    "y": 3882.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "eb8710b8.36ef48",
+    "id": "5ae03ba5.e05364",
     "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": 4639.533203125,
-    "y": 3915,
-    "z": "4138d8f7.da252",
+    "x": 4722.599868774414,
+    "y": 3997.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "616a588c.b788e8",
+    "id": "407839fb.167e2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4156.533203125,
-    "y": 3700,
-    "z": "4138d8f7.da252",
+    "x": 4239.599868774414,
+    "y": 3782.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "711898b1.a3a988",
-        "c5e1be90.cd78d",
-        "8bf9488.63f0cb8",
-        "4168ca78.86bd8c",
-        "12318d1c.9b97cb",
-        "75d5369a.76387",
-        "eb8710b8.36ef48"
+        "873e71a3.8a59a",
+        "2ae96c09.c29bbc",
+        "f96c39ea.1e754",
+        "9b7536d9.f58d3",
+        "ebf96cf8.b5e018",
+        "c7beb2fc.58c5e",
+        "5ae03ba5.e05364"
       ]
     ]
   },
   {
-    "id": "d9429d2a.b15568",
+    "id": "78165047.ec87e8",
     "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": 4141.533203125,
-    "y": 3634,
-    "z": "4138d8f7.da252",
+    "x": 4224.599868774414,
+    "y": 3716.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c5e1be90.cd78d",
+    "id": "2ae96c09.c29bbc",
     "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": 4520.533203125,
-    "y": 3621,
-    "z": "4138d8f7.da252",
+    "x": 4603.599868774414,
+    "y": 3703.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d0e253fc.83209",
-        "415d3771.16041",
-        "2e9ad10b.18ccd6"
+        "d4c85a8.dd0a8a8",
+        "e8890a4e.1d2fd",
+        "42cb0058.08b348"
       ]
     ]
   },
   {
-    "id": "d0e253fc.83209",
+    "id": "d4c85a8.dd0a8a8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4756.533203125,
-    "y": 3604,
-    "z": "4138d8f7.da252",
+    "x": 4839.599868774414,
+    "y": 3686.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "415d3771.16041",
+    "id": "e8890a4e.1d2fd",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4753.533203125,
-    "y": 3645,
-    "z": "4138d8f7.da252",
+    "x": 4836.599868774414,
+    "y": 3727.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "711898b1.a3a988",
+    "id": "873e71a3.8a59a",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4469.533203125,
-    "y": 3578,
-    "z": "4138d8f7.da252",
+    "x": 4552.599868774414,
+    "y": 3660.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6bda79b8.645a68",
+    "id": "86fc32b9.5b11e8",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5198.93310546875,
-    "y": 4627.39990234375,
-    "z": "4138d8f7.da252",
+    "x": 5281.999771118164,
+    "y": 4709.685653686523,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "94dec63b.8ae1e",
+    "id": "3b9c82f6.e6f406",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4987.93310546875,
-    "y": 4689.39990234375,
-    "z": "4138d8f7.da252",
+    "x": 5070.999771118164,
+    "y": 4771.685653686523,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5b09d63.4152d28"
+        "1361709c.aa1da7"
       ]
     ]
   },
   {
-    "id": "5b09d63.4152d28",
+    "id": "1361709c.aa1da7",
     "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": 5231.93310546875,
-    "y": 4695.39990234375,
-    "z": "4138d8f7.da252",
+    "x": 5314.999771118164,
+    "y": 4777.685653686523,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4ce07cc6.c3d424",
-        "f554a368.1a08c8"
+        "65e42246.3bc70c",
+        "4c5853af.96f634"
       ]
     ]
   },
   {
-    "id": "4ce07cc6.c3d424",
+    "id": "65e42246.3bc70c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5462.93310546875,
-    "y": 4673.39990234375,
-    "z": "4138d8f7.da252",
+    "x": 5545.999771118164,
+    "y": 4755.685653686523,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e736f8f3.ed2808"
+        "86c13c.8334e6c8"
       ]
     ]
   },
   {
-    "id": "f554a368.1a08c8",
+    "id": "4c5853af.96f634",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5467.93310546875,
-    "y": 4740.39990234375,
-    "z": "4138d8f7.da252",
+    "x": 5550.999771118164,
+    "y": 4822.685653686523,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a82e0bf.f144f",
+    "id": "c5f7e346.0cad5",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5716.816864013672,
-    "y": 4238.082244873047,
-    "z": "4138d8f7.da252",
+    "x": 5799.883529663086,
+    "y": 4320.36799621582,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8b36e42.8d18318",
-        "9e33af49.9f241"
+        "36b3fe84.38d7ba",
+        "4dc5480c.f82fe8"
       ]
     ]
   },
   {
-    "id": "8b36e42.8d18318",
+    "id": "36b3fe84.38d7ba",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5871.81689453125,
-    "y": 4166.08251953125,
-    "z": "4138d8f7.da252",
+    "x": 5954.883560180664,
+    "y": 4248.368270874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b40b55f7.23af98"
+        "55b477cf.ef13f8"
       ]
     ]
   },
   {
-    "id": "9e33af49.9f241",
+    "id": "4dc5480c.f82fe8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5872.81689453125,
-    "y": 4299.08251953125,
-    "z": "4138d8f7.da252",
+    "x": 5955.883560180664,
+    "y": 4381.368270874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b38dd55a.418b38"
+        "c669d5e6.7b56e8"
       ]
     ]
   },
   {
-    "id": "b40b55f7.23af98",
+    "id": "55b477cf.ef13f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6016.81689453125,
-    "y": 4166.082763671875,
-    "z": "4138d8f7.da252",
+    "x": 6099.883560180664,
+    "y": 4248.368515014648,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3913dc06.a223d4",
-        "839acfd7.2291a"
+        "13bb5bff.e1f664",
+        "d1738758.598cd8"
       ]
     ]
   },
   {
-    "id": "3913dc06.a223d4",
+    "id": "13bb5bff.e1f664",
     "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": 6309.81689453125,
-    "y": 4144.08251953125,
-    "z": "4138d8f7.da252",
+    "x": 6392.883560180664,
+    "y": 4226.368270874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "839acfd7.2291a",
+    "id": "d1738758.598cd8",
     "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": 6261.466796875,
-    "y": 4191.3994140625,
-    "z": "4138d8f7.da252",
+    "x": 6344.533462524414,
+    "y": 4273.685165405273,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "4d10eebf.474a88",
+    "id": "c20dae0a.c8db1",
     "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": 6334.816864013672,
-    "y": 4093.082244873047,
-    "z": "4138d8f7.da252",
+    "x": 6417.883529663086,
+    "y": 4175.36799621582,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b38dd55a.418b38",
+    "id": "c669d5e6.7b56e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6028.81689453125,
-    "y": 4298.082763671875,
-    "z": "4138d8f7.da252",
+    "x": 6111.883560180664,
+    "y": 4380.368515014648,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8675cc13.463188",
-        "35c1f8d2.a502"
+        "fbd54f6b.bd5de8",
+        "4b0d9778.02ef98"
       ]
     ]
   },
   {
-    "id": "8675cc13.463188",
+    "id": "fbd54f6b.bd5de8",
     "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": 6321.81689453125,
-    "y": 4276.08251953125,
-    "z": "4138d8f7.da252",
+    "x": 6404.883560180664,
+    "y": 4358.368270874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "35c1f8d2.a502",
+    "id": "4b0d9778.02ef98",
     "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": 6273.466796875,
-    "y": 4323.3994140625,
-    "z": "4138d8f7.da252",
+    "x": 6356.533462524414,
+    "y": 4405.685165405273,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "b5ed36f4.c5e02",
+    "id": "2c35c11.f28a13e",
     "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": 6345.81689453125,
-    "y": 4237.08251953125,
-    "z": "4138d8f7.da252",
+    "x": 6428.883560180664,
+    "y": 4319.368270874023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e736f8f3.ed2808",
+    "id": "86c13c.8334e6c8",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5668.0498046875,
-    "y": 4680.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5751.116470336914,
+    "y": 4762.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c39fa1bf.775f28",
-        "760b6a69.a4fd14"
+        "f84ec623.3e0358",
+        "579a6f55.5876b8"
       ]
     ]
   },
   {
-    "id": "c39fa1bf.775f28",
+    "id": "f84ec623.3e0358",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5863.0498046875,
-    "y": 4608.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5946.116470336914,
+    "y": 4690.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "903811e2.41d4e8"
+        "7ac296e6.db7d4"
       ]
     ]
   },
   {
-    "id": "760b6a69.a4fd14",
+    "id": "579a6f55.5876b8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5864.0498046875,
-    "y": 4741.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5947.116470336914,
+    "y": 4823.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8a352d04.a7b5f"
+        "63acc8c1.d0489"
       ]
     ]
   },
   {
-    "id": "903811e2.41d4e8",
+    "id": "7ac296e6.db7d4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6008.0498046875,
-    "y": 4608.283447265625,
-    "z": "4138d8f7.da252",
+    "x": 6091.116470336914,
+    "y": 4690.569198608398,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "dd052918.eeeec8",
-        "5b6d1623.4afde8"
+        "7470326b.50fd4c",
+        "6067f5da.462f2c"
       ]
     ]
   },
   {
-    "id": "dd052918.eeeec8",
+    "id": "7470326b.50fd4c",
     "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": 6301.0498046875,
-    "y": 4586.283203125,
-    "z": "4138d8f7.da252",
+    "x": 6384.116470336914,
+    "y": 4668.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "5b6d1623.4afde8",
+    "id": "6067f5da.462f2c",
     "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": 6252.69970703125,
-    "y": 4633.60009765625,
-    "z": "4138d8f7.da252",
+    "x": 6335.766372680664,
+    "y": 4715.885848999023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f8433708.1cf278",
+    "id": "b621fab3.fd22d8",
     "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": 6325.0498046875,
-    "y": 4547.283203125,
-    "z": "4138d8f7.da252",
+    "x": 6408.116470336914,
+    "y": 4629.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8a352d04.a7b5f",
+    "id": "63acc8c1.d0489",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6020.0498046875,
-    "y": 4740.283447265625,
-    "z": "4138d8f7.da252",
+    "x": 6103.116470336914,
+    "y": 4822.569198608398,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1797ce6f.bf55da",
-        "f850925d.eaddb8"
+        "ab9c7cb.6ee1c8",
+        "478e555b.00c56c"
       ]
     ]
   },
   {
-    "id": "1797ce6f.bf55da",
+    "id": "ab9c7cb.6ee1c8",
     "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": 6313.0498046875,
-    "y": 4718.283203125,
-    "z": "4138d8f7.da252",
+    "x": 6396.116470336914,
+    "y": 4800.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f850925d.eaddb8",
+    "id": "478e555b.00c56c",
     "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": 6264.69970703125,
-    "y": 4765.60009765625,
-    "z": "4138d8f7.da252",
+    "x": 6347.766372680664,
+    "y": 4847.885848999023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "98f83ad6.f376c",
+    "id": "57c5a214.d70e3c",
     "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": 6337.0498046875,
-    "y": 4679.283203125,
-    "z": "4138d8f7.da252",
+    "x": 6420.116470336914,
+    "y": 4761.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f3a92d2f.d14e78",
+    "id": "b34554cf.aa2d2",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5075.89990234375,
-    "y": 5420.4833984375,
-    "z": "4138d8f7.da252",
+    "x": 5158.966567993164,
+    "y": 5502.769149780273,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "cfcbce5e.a3353",
+    "id": "613e9b77.298d54",
     "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": 5073.68310546875,
-    "y": 5460.68359375,
-    "z": "4138d8f7.da252",
+    "x": 5156.749771118164,
+    "y": 5542.969345092773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "35bf741d.0589dc",
+    "id": "95d677c9.726458",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4948.933349609375,
-    "y": 5645.16650390625,
-    "z": "4138d8f7.da252",
+    "x": 5032.000015258789,
+    "y": 5727.452255249023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "58a0b8d5.3916c8",
+    "id": "6712b992.157",
     "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": 4946.716552734375,
-    "y": 5685.36669921875,
-    "z": "4138d8f7.da252",
+    "x": 5029.783218383789,
+    "y": 5767.652450561523,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "141a3bed.ea5a94",
+    "id": "abfdee17.12df08",
     "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": 5046.0498046875,
-    "y": 5969.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5129.116470336914,
+    "y": 6051.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "8127bfc.2c0cdc",
+    "id": "1b1c3355.4ab2b5",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4873.0498046875,
-    "y": 6026.283203125,
-    "z": "4138d8f7.da252",
+    "x": 4956.116470336914,
+    "y": 6108.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "eb3bc0b8.920088",
-        "e32169bb.0af1a8"
+        "5c00f9d2.103a1",
+        "4db44e39.57056"
       ]
     ]
   },
   {
-    "id": "eb3bc0b8.920088",
+    "id": "5c00f9d2.103a1",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5084.0498046875,
-    "y": 6026.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5167.116470336914,
+    "y": 6108.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2548cb5a.7d91a4"
+        "e62c2a04.834ba8"
       ]
     ]
   },
   {
-    "id": "e32169bb.0af1a8",
+    "id": "4db44e39.57056",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5080.0498046875,
-    "y": 6074.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5163.116470336914,
+    "y": 6156.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6b0e17ed.7e019"
+        "2dd9a1ca.3380de"
       ]
     ]
   },
   {
-    "id": "2548cb5a.7d91a4",
+    "id": "e62c2a04.834ba8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5240.0498046875,
-    "y": 6022.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5323.116470336914,
+    "y": 6104.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4736668b.da34e8",
-        "d60814f1.44b368",
-        "3b369b46.f16d74"
+        "59a4f603.629458",
+        "cf3067c2.3ee01",
+        "b81f8f7c.c8bbe"
       ]
     ]
   },
   {
-    "id": "6b0e17ed.7e019",
+    "id": "2dd9a1ca.3380de",
     "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": 5228.0498046875,
-    "y": 6069.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5311.116470336914,
+    "y": 6151.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "b390ff23.8e635",
+    "id": "4526cd48.9f1514",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5505.93359375,
-    "y": 6122.16650390625,
-    "z": "4138d8f7.da252",
+    "x": 5589.000259399414,
+    "y": 6204.452255249023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "3b369b46.f16d74",
+    "id": "b81f8f7c.c8bbe",
     "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": 5503.716796875,
-    "y": 6162.36669921875,
-    "z": "4138d8f7.da252",
+    "x": 5586.783462524414,
+    "y": 6244.652450561523,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "d60814f1.44b368",
+    "id": "cf3067c2.3ee01",
     "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": 5623.0498046875,
-    "y": 6074.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5706.116470336914,
+    "y": 6156.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "4736668b.da34e8",
+    "id": "59a4f603.629458",
     "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": 5494.0498046875,
-    "y": 6022.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5577.116470336914,
+    "y": 6104.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "85c984f2.33f7c8",
+    "id": "67b13c77.507314",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4935.0498046875,
-    "y": 5927.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5018.116470336914,
+    "y": 6009.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f942597e.1aa18",
+    "id": "e11abdc.71e19c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4582.3828125,
-    "y": 6014.283203125,
-    "z": "4138d8f7.da252",
+    "x": 4665.449478149414,
+    "y": 6096.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "141a3bed.ea5a94",
-        "8127bfc.2c0cdc",
-        "8afd899a.01e88",
-        "8c1f115c.700108"
+        "abfdee17.12df08",
+        "1b1c3355.4ab2b5",
+        "b5179b.b5811868",
+        "8a0b9185.29b548"
       ]
     ]
   },
   {
-    "id": "fc4aa587.17d69",
+    "id": "6a0cb0e4.5bec78",
     "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": 4926.13330078125,
-    "y": 6483.283203125,
-    "z": "4138d8f7.da252",
+    "x": 5009.199966430664,
+    "y": 6565.568954467773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "41ec9458.f731e4",
+    "id": "4b79bf18.1b12f8",
     "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": 3631.500457763672,
-    "y": 3759.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 3714.567123413086,
+    "y": 3842.2857208251953,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "23b69bc.0871b64",
+    "id": "931a7a68.51c848",
     "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": 4384.033660888672,
-    "y": 4034.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4467.100326538086,
+    "y": 4116.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "75525335.c9aa54",
-        "d5340ebc.32553",
-        "f8167756.f35bd8"
+        "810ab4c1.abf7e",
+        "4e13a1b8.dde8c",
+        "e5e81f70.f40458"
       ]
     ]
   },
   {
-    "id": "977709e8.5868c",
+    "id": "c0e77edb.5b02c",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4492.033905029297,
-    "y": 3990.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4575.100570678711,
+    "y": 4072.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "75525335.c9aa54",
+    "id": "810ab4c1.abf7e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4589.033660888672,
-    "y": 4031.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4672.100326538086,
+    "y": 4113.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b5414319.96d9"
+        "fa4e460e.6cd96"
       ]
     ]
   },
   {
-    "id": "d5340ebc.32553",
+    "id": "4e13a1b8.dde8c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4572.524627685547,
-    "y": 4092.690704345703,
-    "z": "4138d8f7.da252",
+    "x": 4655.591293334961,
+    "y": 4174.976455688477,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a327dd9c.9d096"
+        "4d1c0281.9a84bc"
       ]
     ]
   },
   {
-    "id": "f8167756.f35bd8",
+    "id": "e5e81f70.f40458",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4570.033660888672,
-    "y": 4136.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4653.100326538086,
+    "y": 4218.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "784d31ab.abb97"
+        "5961321d.8806a4"
       ]
     ]
   },
   {
-    "id": "b5414319.96d9",
+    "id": "fa4e460e.6cd96",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4757.033905029297,
-    "y": 4026.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4840.100570678711,
+    "y": 4108.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "98142959.81fca"
+        "4d09e7f7.7140b8"
       ]
     ]
   },
   {
-    "id": "a327dd9c.9d096",
+    "id": "4d1c0281.9a84bc",
     "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": 4735.096038818359,
-    "y": 4092.9764404296875,
-    "z": "4138d8f7.da252",
+    "x": 4818.162704467773,
+    "y": 4175.262191772461,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "784d31ab.abb97",
+    "id": "5961321d.8806a4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4737.033660888672,
-    "y": 4135.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4820.100326538086,
+    "y": 4217.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "98142959.81fca",
+    "id": "4d09e7f7.7140b8",
     "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": 4995.033905029297,
-    "y": 4031.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5078.100570678711,
+    "y": 4113.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6df0b8a0.a7c62"
+        "45b87759.5a906"
       ]
     ]
   },
   {
-    "id": "6df0b8a0.a7c62",
+    "id": "45b87759.5a906",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5229.033660888672,
-    "y": 4038.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5312.100326538086,
+    "y": 4120.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "201cbbc6.38c61c"
+        "c808b6be.91a2f"
       ]
     ]
   },
   {
-    "id": "92806e4e.351398",
+    "id": "f4ea682a.e63f08",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4362.733367919922,
-    "y": 3960.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4445.800033569336,
+    "y": 4042.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f43de449.20024",
+    "id": "1d230bf5.a23cfc",
     "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": 5645.883270263672,
-    "y": 4048.699676513672,
-    "z": "4138d8f7.da252",
+    "x": 5728.949935913086,
+    "y": 4130.985427856445,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7a53ecb2.cec2c4"
+        "516d68ca.7c7f6"
       ]
     ]
   },
   {
-    "id": "7a53ecb2.cec2c4",
+    "id": "516d68ca.7c7f6",
     "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": 5837.883270263672,
-    "y": 4037.699920654297,
-    "z": "4138d8f7.da252",
+    "x": 5920.949935913086,
+    "y": 4119.98567199707,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "700641c0.5a055"
+        "39e7022f.c30a2e"
       ]
     ]
   },
   {
-    "id": "700641c0.5a055",
+    "id": "39e7022f.c30a2e",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6019.883270263672,
-    "y": 4016.699920654297,
-    "z": "4138d8f7.da252",
+    "x": 6102.949935913086,
+    "y": 4098.98567199707,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9920129e.a09"
+        "455228ea.3ce16"
       ]
     ]
   },
   {
-    "id": "9920129e.a09",
+    "id": "455228ea.3ce16",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 6181.883270263672,
-    "y": 4005.699920654297,
-    "z": "4138d8f7.da252",
+    "x": 6264.949935913086,
+    "y": 4087.9856719970703,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7f7dfee.7fba8",
-        "c8f259e.2871ba8"
+        "826e861c.8cb3f8",
+        "78a2c33b.328edc"
       ]
     ]
   },
   {
-    "id": "7f7dfee.7fba8",
+    "id": "826e861c.8cb3f8",
     "type": "set",
     "name": "unset tmp.the-connectivity",
     "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
     "comments": "",
-    "x": 6378.883270263672,
-    "y": 3934.699920654297,
-    "z": "4138d8f7.da252",
+    "x": 6461.949935913086,
+    "y": 4016.9856719970703,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "335b26db.86f24a",
+    "id": "d1bcb0d5.b833a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5552.833465576172,
-    "y": 4163.699676513672,
-    "z": "4138d8f7.da252",
+    "x": 5635.900131225586,
+    "y": 4245.985427856445,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "4a82e0bf.f144f",
-        "f43de449.20024",
-        "1e79d0a7.c66727",
-        "7f90edcc.1e82b4"
+        "c5f7e346.0cad5",
+        "1d230bf5.a23cfc",
+        "1966547c.c3884c",
+        "d31d83e1.8d9b98"
       ]
     ]
   },
   {
-    "id": "1e79d0a7.c66727",
+    "id": "1966547c.c3884c",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5684.399871826172,
-    "y": 3938.916717529297,
-    "z": "4138d8f7.da252",
+    "x": 5767.466537475586,
+    "y": 4021.2024688720703,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7f90edcc.1e82b4",
+    "id": "d31d83e1.8d9b98",
     "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": 5676.399871826172,
-    "y": 3987.916717529297,
-    "z": "4138d8f7.da252",
+    "x": 5759.466537475586,
+    "y": 4070.2024688720703,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c8f259e.2871ba8",
+    "id": "78a2c33b.328edc",
     "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": 6384.350067138672,
-    "y": 4043.916717529297,
-    "z": "4138d8f7.da252",
+    "x": 6467.416732788086,
+    "y": 4126.20246887207,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a412e157.cf47d8",
+    "id": "b4318014.e1a038",
     "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": 5677.616668701172,
-    "y": 3762.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5760.683334350586,
+    "y": 3844.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6887559d.aa01b4",
+    "id": "985ed7d4.ec17a",
     "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": 5831.616668701172,
-    "y": 3814.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5914.683334350586,
+    "y": 3896.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea4b8bb2.02c728",
+    "id": "f77cd261.9bc248",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5422.616668701172,
-    "y": 3881.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5505.683334350586,
+    "y": 3963.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6887559d.aa01b4",
-        "d154a2e6.a2bcc",
-        "a412e157.cf47d8"
+        "985ed7d4.ec17a",
+        "543e7c89.750024",
+        "b4318014.e1a038"
       ]
     ]
   },
   {
-    "id": "d154a2e6.a2bcc",
+    "id": "543e7c89.750024",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5676.616668701172,
-    "y": 3869.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5759.683334350586,
+    "y": 3951.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "89918c5f.33a478"
+        "8bf41864.55ad6"
       ]
     ]
   },
   {
-    "id": "89918c5f.33a478",
+    "id": "8bf41864.55ad6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5855.616668701172,
-    "y": 3868.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5938.683334350586,
+    "y": 3950.4024200439453,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "335b26db.86f24a"
+        "d1bcb0d5.b833a"
       ]
     ]
   },
   {
-    "id": "2fafeba7.6be734",
+    "id": "fc947668.8a9d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4553.616668701172,
-    "y": 7386.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4636.683334350586,
+    "y": 7468.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "18db3335.23915d",
-        "d2fe4c45.697938",
-        "175608de.c2a5b7"
+        "9818a5dd.1c569",
+        "2b482f66.6e7e5",
+        "43c9acaa.ef761c"
       ]
     ]
   },
   {
-    "id": "175608de.c2a5b7",
+    "id": "43c9acaa.ef761c",
     "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": 4776.616668701172,
-    "y": 7330.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4859.683334350586,
+    "y": 7412.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "18db3335.23915d",
+    "id": "9818a5dd.1c569",
     "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": 4955.616668701172,
-    "y": 7373.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5038.683334350586,
+    "y": 7455.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "d2fe4c45.697938",
+    "id": "2b482f66.6e7e5",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4800.616668701172,
-    "y": 7428.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4883.683334350586,
+    "y": 7510.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5916bddb.120d64"
+        "e0a7a605.9205d8"
       ]
     ]
   },
   {
-    "id": "5916bddb.120d64",
+    "id": "e0a7a605.9205d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4979.616668701172,
-    "y": 7427.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 5062.683334350586,
+    "y": 7509.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "997dfd42.35e9c"
+        "86241828.71762"
       ]
     ]
   },
   {
-    "id": "afa717d0.25e7a8",
+    "id": "811fcd41.48413",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4710.616668701172,
-    "y": 7066.116668701172,
-    "z": "4138d8f7.da252",
+    "x": 4793.683334350586,
+    "y": 7148.402420043945,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "46e10049.e35348",
+    "id": "9cc0dadb.189ef",
     "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": 3276.2332763671875,
-    "y": 460.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 3359.2999420166016,
+    "y": 542.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "26a90c3.2a56674",
+    "id": "79c99b01.4060a4",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4051.332763671875,
-    "y": 521.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 4134.399429321289,
+    "y": 603.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "949451da.c153b8"
+        "4bbb66bd.93eca"
       ]
     ]
   },
   {
-    "id": "949451da.c153b8",
+    "id": "4bbb66bd.93eca",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4220.332763671875,
-    "y": 518.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 4303.399429321289,
+    "y": 600.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "33bf54d9.6913cc",
-        "9e64bdfc.fb79a8"
+        "506bfd50.24ebdc",
+        "e2033e30.afcd1"
       ]
     ]
   },
   {
-    "id": "33bf54d9.6913cc",
+    "id": "506bfd50.24ebdc",
     "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": 4444.332763671875,
-    "y": 551.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 4527.399429321289,
+    "y": 633.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9e64bdfc.fb79a8",
+    "id": "e2033e30.afcd1",
     "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": 4390.332763671875,
-    "y": 591.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 4473.399429321289,
+    "y": 673.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "16154f9d.14a3b",
+    "id": "fb5e94da.526bd",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4016.333251953125,
-    "y": 720.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 4099.399917602539,
+    "y": 803.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "85975abf.6c518"
+        "2507bbe.52fb3c4"
       ]
     ]
   },
   {
-    "id": "85975abf.6c518",
+    "id": "2507bbe.52fb3c4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4181.33251953125,
-    "y": 725.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 4264.399185180664,
+    "y": 808.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "adebbb96.d8f2f",
-        "88877892.df83d8"
+        "93fd5f76.e542d8",
+        "736d4375.48de7c"
       ]
     ]
   },
   {
-    "id": "adebbb96.d8f2f",
+    "id": "93fd5f76.e542d8",
     "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": 4428.332763671875,
-    "y": 807.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 4511.399429321289,
+    "y": 890.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "88877892.df83d8",
+    "id": "736d4375.48de7c",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4374.332763671875,
-    "y": 847.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 4457.399429321289,
+    "y": 930.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f55201f.0be188",
+    "id": "e9c6a99.90dcbd8",
     "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": 3259.333251953125,
-    "y": 859.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 3342.399917602539,
+    "y": 942.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e0b52eb6.aea228",
-        "c2961466.a099a8",
-        "6a533bc.97a86c4"
+        "554ea6a8.9888f",
+        "3be7a41.d9c04dc",
+        "65e70654.5cdcc8"
       ]
     ]
   },
   {
-    "id": "e0b52eb6.aea228",
+    "id": "554ea6a8.9888f",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3501.333251953125,
-    "y": 852.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 3584.399917602539,
+    "y": 935.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "c2961466.a099a8",
+    "id": "3be7a41.d9c04dc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3496.842315673828,
-    "y": 895.1927185058594,
-    "z": "4138d8f7.da252",
+    "x": 3579.908981323242,
+    "y": 977.4784698486328,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "6a533bc.97a86c4",
+    "id": "65e70654.5cdcc8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3500.84228515625,
-    "y": 943.1926879882812,
-    "z": "4138d8f7.da252",
+    "x": 3583.908950805664,
+    "y": 1025.4784393310547,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "83cc008.07d49"
+        "834a986c.4e7048"
       ]
     ]
   },
   {
-    "id": "83cc008.07d49",
+    "id": "834a986c.4e7048",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3662.333251953125,
-    "y": 883.7666625976562,
-    "z": "4138d8f7.da252",
+    "x": 3745.399917602539,
+    "y": 966.0524139404297,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2318951c.d8223a"
+        "f5a8155b.186e1"
       ]
     ]
   },
   {
-    "id": "2318951c.d8223a",
+    "id": "f5a8155b.186e1",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3833.333251953125,
-    "y": 883.766845703125,
-    "z": "4138d8f7.da252",
+    "x": 3916.399917602539,
+    "y": 966.0525970458984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1ecaee8d.2e04b1",
-        "6f57dead.f93a98",
-        "743eca24.c93994"
+        "49a01940.91879",
+        "fb61a82e.a48e6",
+        "bf3bb014.cd44d"
       ]
     ]
   },
   {
-    "id": "1ecaee8d.2e04b1",
+    "id": "49a01940.91879",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4000.3330078125,
-    "y": 793.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4083.399673461914,
+    "y": 876.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ced307c.4c3f7f8"
+        "13796778.1bcaa1"
       ]
     ]
   },
   {
-    "id": "6f57dead.f93a98",
+    "id": "fb61a82e.a48e6",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4002.3330078125,
-    "y": 847.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4085.399673461914,
+    "y": 930.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e2f995cd.e955"
+        "dfa37602.2a592"
       ]
     ]
   },
   {
-    "id": "ced307c.4c3f7f8",
+    "id": "13796778.1bcaa1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4128.3330078125,
-    "y": 793.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4211.399673461914,
+    "y": 876.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "36a6204d.62e268",
-        "94b8b644.43f75"
+        "c61c7290.5d0048",
+        "9330928e.78e4a8"
       ]
     ]
   },
   {
-    "id": "e2f995cd.e955",
+    "id": "dfa37602.2a592",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4131.3330078125,
-    "y": 846.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4214.399673461914,
+    "y": 929.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7b0ab608.42ea9",
-        "a90ad8f1.fdc558"
+        "b3bef05d.261898",
+        "4885c383.a5f124"
       ]
     ]
   },
   {
-    "id": "94b8b644.43f75",
+    "id": "9330928e.78e4a8",
     "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": 4374.332763671875,
-    "y": 932.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4457.399429321289,
+    "y": 1015.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7b0ab608.42ea9",
+    "id": "b3bef05d.261898",
     "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": 4391.332763671875,
-    "y": 974.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4474.399429321289,
+    "y": 1057.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a90ad8f1.fdc558",
+    "id": "4885c383.a5f124",
     "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": 4376.332763671875,
-    "y": 1012.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4459.399429321289,
+    "y": 1095.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "36a6204d.62e268",
+    "id": "c61c7290.5d0048",
     "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": 4388.332763671875,
-    "y": 892.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4471.399429321289,
+    "y": 975.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "467d675.a17d518",
+    "id": "3c2a776f.fcd778",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4553.332763671875,
-    "y": 908.7667846679688,
-    "z": "4138d8f7.da252",
+    "x": 4636.399429321289,
+    "y": 991.0525360107422,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "743eca24.c93994",
+    "id": "bf3bb014.cd44d",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3941.333251953125,
-    "y": 938.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 4024.399917602539,
+    "y": 1021.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "32cfa81c.1fdfe"
+        "4b490f7e.359388"
       ]
     ]
   },
   {
-    "id": "32cfa81c.1fdfe",
+    "id": "4b490f7e.359388",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4115.333251953125,
-    "y": 933.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 4198.399917602539,
+    "y": 1016.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7ba10fb0.49acb8",
-        "c1eb138a.5c454"
+        "14062c05.c0d224",
+        "a29138d9.9f86a8"
       ]
     ]
   },
   {
-    "id": "c1eb138a.5c454",
+    "id": "a29138d9.9f86a8",
     "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": 4348.332763671875,
-    "y": 1102.7665405273438,
-    "z": "4138d8f7.da252",
+    "x": 4431.399429321289,
+    "y": 1185.0522918701172,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7ba10fb0.49acb8",
+    "id": "14062c05.c0d224",
     "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": 4402.332763671875,
-    "y": 1062.7665405273438,
-    "z": "4138d8f7.da252",
+    "x": 4485.399429321289,
+    "y": 1145.0522918701172,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f3ed1968.f2e4c",
+    "id": "de8acab8.aa46c",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4516.332763671875,
-    "y": 1087.7665405273438,
-    "z": "4138d8f7.da252",
+    "x": 4599.399429321289,
+    "y": 1170.0522918701172,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9301f497.efdba",
+    "id": "fd1dbeb5.643a7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3517,
-    "y": 2168,
-    "z": "4138d8f7.da252",
+    "x": 3600.066665649414,
+    "y": 2250.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7448f46b.34e6cc",
-        "5277238e.78ec8c"
+        "c723b1c5.5db71",
+        "935dac93.06ba68"
       ]
     ]
   },
   {
-    "id": "48753b32.6fce64",
+    "id": "bc4d7dbf.afb29",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3344.33349609375,
-    "y": 2169,
-    "z": "4138d8f7.da252",
+    "x": 3427.400161743164,
+    "y": 2251.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9301f497.efdba"
+        "fd1dbeb5.643a7"
       ]
     ]
   },
   {
-    "id": "7b2bdccd.4a3854",
+    "id": "e6ea02c1.c3c8b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3353.824462890625,
-    "y": 2211.5740356445312,
-    "z": "4138d8f7.da252",
+    "x": 3436.891128540039,
+    "y": 2293.8597869873047,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "9a4a0275.086048",
+    "id": "4af5d292.f0e44c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3342.33349609375,
-    "y": 2258,
-    "z": "4138d8f7.da252",
+    "x": 3425.400161743164,
+    "y": 2340.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "7448f46b.34e6cc",
+    "id": "c723b1c5.5db71",
     "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": 3803.33349609375,
-    "y": 2172.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3886.400161743164,
+    "y": 2254.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "645217a3.91825",
-        "af1d3f52.b0745"
+        "e1f3a987.bed2a8",
+        "cd75a949.bbc878"
       ]
     ]
   },
   {
-    "id": "af1d3f52.b0745",
+    "id": "cd75a949.bbc878",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4026.33349609375,
-    "y": 2127.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4109.400161743164,
+    "y": 2209.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "731452c3.85af84"
+        "c2b43a53.588108"
       ]
     ]
   },
   {
-    "id": "645217a3.91825",
+    "id": "e1f3a987.bed2a8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4028.33349609375,
-    "y": 2191.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4111.400161743164,
+    "y": 2273.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6089c716.00dec8"
+        "183afe84.247bf9"
       ]
     ]
   },
   {
-    "id": "fa7f428c.6d6b2",
+    "id": "25934f35.38edd",
     "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": 3116.33349609375,
-    "y": 2204,
-    "z": "4138d8f7.da252",
+    "x": 3199.400161743164,
+    "y": 2286.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "48753b32.6fce64",
-        "7b2bdccd.4a3854",
-        "9a4a0275.086048"
+        "bc4d7dbf.afb29",
+        "e6ea02c1.c3c8b",
+        "4af5d292.f0e44c"
       ]
     ]
   },
   {
-    "id": "c73afdde.7fd758",
+    "id": "e6f36ca.9e7909",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3077.33349609375,
-    "y": 2148,
-    "z": "4138d8f7.da252",
+    "x": 3160.400161743164,
+    "y": 2230.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6834572.668ee28",
+    "id": "4a92500a.dfe688",
     "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": 3136.33349609375,
-    "y": 1944,
-    "z": "4138d8f7.da252",
+    "x": 3219.400161743164,
+    "y": 2026.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2bef51bc.6ca236",
-        "6cf1c76e.88753"
+        "f38e9f0f.aeb28",
+        "c00bcf8d.007da8"
       ]
     ]
   },
   {
-    "id": "6cf1c76e.88753",
+    "id": "c00bcf8d.007da8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3359.33349609375,
-    "y": 1930,
-    "z": "4138d8f7.da252",
+    "x": 3442.400161743164,
+    "y": 2012.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f6f8952c.2953"
+        "8c221cd.f6641e"
       ]
     ]
   },
   {
-    "id": "2bef51bc.6ca236",
+    "id": "f38e9f0f.aeb28",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3361.33349609375,
-    "y": 1963,
-    "z": "4138d8f7.da252",
+    "x": 3444.400161743164,
+    "y": 2045.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "f6f8952c.2953",
+    "id": "8c221cd.f6641e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3507.33349609375,
-    "y": 1923,
-    "z": "4138d8f7.da252",
+    "x": 3590.400161743164,
+    "y": 2005.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f448bb3c.4541c8",
-        "dafe2b52.c4e9d"
+        "7fdb72b7.69f4e4",
+        "70d5d0aa.d1559"
       ]
     ]
   },
   {
-    "id": "f448bb3c.4541c8",
+    "id": "7fdb72b7.69f4e4",
     "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": 3701.33349609375,
-    "y": 1926.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3784.400161743164,
+    "y": 2008.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "5277238e.78ec8c",
+    "id": "935dac93.06ba68",
     "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": 3754.333465576172,
-    "y": 2294.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 3837.400131225586,
+    "y": 2377.2857208251953,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "eb06fc3b.085ab"
+        "bb098115.17482"
       ]
     ]
   },
   {
-    "id": "eb06fc3b.085ab",
+    "id": "bb098115.17482",
     "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": 3960.333465576172,
-    "y": 2294.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 4043.400131225586,
+    "y": 2377.2857208251953,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a014a0c0.bb63d8"
+        "eb63cf64.6fcac8"
       ]
     ]
   },
   {
-    "id": "dafe2b52.c4e9d",
+    "id": "70d5d0aa.d1559",
     "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": 3723.33349609375,
-    "y": 1994.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3806.400161743164,
+    "y": 2076.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a21fb44.41309c8",
-        "5685afe4.0b1f1",
-        "ea909548.33d5a"
+        "4772aa88.8815f4",
+        "2f88517d.a786fe",
+        "a51a10da.7f1bc8"
       ]
     ]
   },
   {
-    "id": "a21fb44.41309c8",
+    "id": "4772aa88.8815f4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3918.8336181640625,
-    "y": 1946.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4001.9002838134766,
+    "y": 2028.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9cea62e1.55972"
+        "bea56767.e75718"
       ]
     ]
   },
   {
-    "id": "5685afe4.0b1f1",
+    "id": "2f88517d.a786fe",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3910.8336181640625,
-    "y": 2001.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3993.9002838134766,
+    "y": 2083.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "89031999.da34c"
+        "3775c8.545c2238"
       ]
     ]
   },
   {
-    "id": "ea909548.33d5a",
+    "id": "a51a10da.7f1bc8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3915.8336181640625,
-    "y": 2058.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 3998.9002838134766,
+    "y": 2140.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c3bf7f9d.8f5d8"
+        "afbc062e.468e"
       ]
     ]
   },
   {
-    "id": "c3bf7f9d.8f5d8",
+    "id": "afbc062e.468e",
     "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": 4067.8336181640625,
-    "y": 2059.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4150.900283813477,
+    "y": 2141.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "9cea62e1.55972",
+    "id": "bea56767.e75718",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4063.2159423828125,
-    "y": 1943.6557922363281,
-    "z": "4138d8f7.da252",
+    "x": 4146.282608032227,
+    "y": 2025.9415435791016,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e8d406ab.082b08"
+        "80389683.dd0d1"
       ]
     ]
   },
   {
-    "id": "8c5d257.6a579d8",
+    "id": "77f3463a.2b447",
     "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": 3139,
-    "y": 2283,
-    "z": "4138d8f7.da252",
+    "x": 3222.066665649414,
+    "y": 2365.2857513427734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "5e59531e.4360fc",
+    "id": "75f1943f.b94b8c",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3813.999969482422,
-    "y": 2246.999969482422,
-    "z": "4138d8f7.da252",
+    "x": 3897.066635131836,
+    "y": 2329.2857208251953,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6089c716.00dec8",
+    "id": "183afe84.247bf9",
     "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": 4187.33349609375,
-    "y": 2210.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4270.400161743164,
+    "y": 2292.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "731452c3.85af84",
+    "id": "c2b43a53.588108",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4191.33349609375,
-    "y": 2124.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4274.400161743164,
+    "y": 2206.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8743a739.8d80e8",
-        "538193e1.eab6f4"
+        "62ce6308.22a894",
+        "3f411974.bc06ee"
       ]
     ]
   },
   {
-    "id": "a014a0c0.bb63d8",
+    "id": "eb63cf64.6fcac8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4177.619110107422,
-    "y": 2293.821746826172,
-    "z": "4138d8f7.da252",
+    "x": 4260.685775756836,
+    "y": 2376.1074981689453,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "62c06921.59013"
+        "68a23803.3ba65"
       ]
     ]
   },
   {
-    "id": "89031999.da34c",
+    "id": "3775c8.545c2238",
     "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": 4078.8336181640625,
-    "y": 2004.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4161.900283813477,
+    "y": 2086.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8743a739.8d80e8",
+    "id": "62ce6308.22a894",
     "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": 4361.33349609375,
-    "y": 2085.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4444.400161743164,
+    "y": 2167.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "538193e1.eab6f4",
+    "id": "3f411974.bc06ee",
     "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": 4362.33349609375,
-    "y": 2190.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4445.400161743164,
+    "y": 2272.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "a7a60345.c4fe3",
+    "id": "6316b810.f1aee8",
     "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": 4357.33349609375,
-    "y": 2139.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4440.400161743164,
+    "y": 2221.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "62c06921.59013",
+    "id": "68a23803.3ba65",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4384.450653076172,
-    "y": 2283.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 4467.517318725586,
+    "y": 2365.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "61f01ac9.4769c4",
-        "6f3f4bab.137934",
-        "b1be6cb6.4fb618"
+        "affb5b24.b6cca8",
+        "4a56bfa4.77eef",
+        "2836e90b.67e1be"
       ]
     ]
   },
   {
-    "id": "61f01ac9.4769c4",
+    "id": "affb5b24.b6cca8",
     "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": 4599.450653076172,
-    "y": 2245.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 4682.517318725586,
+    "y": 2327.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6f3f4bab.137934",
+    "id": "4a56bfa4.77eef",
     "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": 4596.450653076172,
-    "y": 2284.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 4679.517318725586,
+    "y": 2366.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "2692e306.96b09c"
+        "963f6cd5.b5f28"
       ]
     ]
   },
   {
-    "id": "b1be6cb6.4fb618",
+    "id": "2836e90b.67e1be",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4551.950653076172,
-    "y": 2326.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 4635.017318725586,
+    "y": 2408.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "50016039.86678",
+    "id": "2cd6b3b7.1e0b44",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4645.33349609375,
-    "y": 1962.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4728.400161743164,
+    "y": 2044.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "19550590.021992"
+        "af33acb2.7cd3c"
       ]
     ]
   },
   {
-    "id": "e8d406ab.082b08",
+    "id": "80389683.dd0d1",
     "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": 4247.33349609375,
-    "y": 1958.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4330.400161743164,
+    "y": 2040.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6de4be31.1810b"
+        "6ef2734a.a2ab44"
       ]
     ]
   },
   {
-    "id": "6de4be31.1810b",
+    "id": "6ef2734a.a2ab44",
     "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": 4442.33349609375,
-    "y": 1958.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4525.400161743164,
+    "y": 2040.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "50016039.86678",
-        "cba34b2.471f9b8"
+        "2cd6b3b7.1e0b44",
+        "a9acfdfb.534e9"
       ]
     ]
   },
   {
-    "id": "cba34b2.471f9b8",
+    "id": "a9acfdfb.534e9",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4647.33349609375,
-    "y": 2035.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4730.400161743164,
+    "y": 2117.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "af92238d.b3b23"
+        "3ae5ea54.6e54a6"
       ]
     ]
   },
   {
-    "id": "2692e306.96b09c",
+    "id": "963f6cd5.b5f28",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4776.950653076172,
-    "y": 2283.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 4860.017318725586,
+    "y": 2365.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b1246264.28f0f"
+        "e92c023f.140be8"
       ]
     ]
   },
   {
-    "id": "b1246264.28f0f",
+    "id": "e92c023f.140be8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4934.950653076172,
-    "y": 2283.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 5018.017318725586,
+    "y": 2365.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "fd4ac373.f8f388"
+        "b67ecfac.fb906"
       ]
     ]
   },
   {
-    "id": "fd4ac373.f8f388",
+    "id": "b67ecfac.fb906",
     "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": 5141.950653076172,
-    "y": 2283.3404235839844,
-    "z": "4138d8f7.da252",
+    "x": 5225.017318725586,
+    "y": 2365.626174926758,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "19550590.021992",
+    "id": "af33acb2.7cd3c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4822.33349609375,
-    "y": 1954.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4905.400161743164,
+    "y": 2036.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f2beac88.eedd2",
-        "e37f582f.5a4c9"
+        "21a9bcb5.4aa85c",
+        "c4167bd6.551f58"
       ]
     ]
   },
   {
-    "id": "e37f582f.5a4c9",
+    "id": "c4167bd6.551f58",
     "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": 5030.33349609375,
-    "y": 1961.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5113.400161743164,
+    "y": 2043.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6a3803eb.9852cc",
-        "9a9acadd.82809",
-        "a1039497.bae268"
+        "8ae061a9.0d8d7",
+        "7fc92de3.a78f3c",
+        "220302ba.be0f7e"
       ]
     ]
   },
   {
-    "id": "af92238d.b3b23",
+    "id": "3ae5ea54.6e54a6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4824.33349609375,
-    "y": 2027.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 4907.400161743164,
+    "y": 2109.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "99f85b9c.2a8238"
+        "256fff1.5dd26"
       ]
     ]
   },
   {
-    "id": "f2beac88.eedd2",
+    "id": "21a9bcb5.4aa85c",
     "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": 5060.33349609375,
-    "y": 1909.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5143.400161743164,
+    "y": 1991.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "99f85b9c.2a8238",
+    "id": "256fff1.5dd26",
     "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": 5059.33349609375,
-    "y": 2151.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5142.400161743164,
+    "y": 2233.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6a3803eb.9852cc",
+    "id": "8ae061a9.0d8d7",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5240.33349609375,
-    "y": 1952.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5323.400161743164,
+    "y": 2034.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f25a9292.d1fb4"
+        "9c166c79.f96aa8"
       ]
     ]
   },
   {
-    "id": "9a9acadd.82809",
+    "id": "7fc92de3.a78f3c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5232.33349609375,
-    "y": 2007.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5315.400161743164,
+    "y": 2089.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7db8b6f1.adecb8"
+        "f289682c.7a8f28"
       ]
     ]
   },
   {
-    "id": "a1039497.bae268",
+    "id": "220302ba.be0f7e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5237.33349609375,
-    "y": 2064.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5320.400161743164,
+    "y": 2146.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e3bf692a.f4e238"
+        "700667b1.628978"
       ]
     ]
   },
   {
-    "id": "e3bf692a.f4e238",
+    "id": "700667b1.628978",
     "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": 5389.33349609375,
-    "y": 2065.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5472.400161743164,
+    "y": 2147.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "7db8b6f1.adecb8",
+    "id": "f289682c.7a8f28",
     "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": 5400.33349609375,
-    "y": 2010.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5483.400161743164,
+    "y": 2092.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f25a9292.d1fb4",
+    "id": "9c166c79.f96aa8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5384.7158203125,
-    "y": 1949.6557922363281,
-    "z": "4138d8f7.da252",
+    "x": 5467.782485961914,
+    "y": 2031.9415435791016,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "fbf54d7c.8184a"
+        "cc2fb272.8011c"
       ]
     ]
   },
   {
-    "id": "fbf54d7c.8184a",
+    "id": "cc2fb272.8011c",
     "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": 5599.33349609375,
-    "y": 1946.0001220703125,
-    "z": "4138d8f7.da252",
+    "x": 5682.400161743164,
+    "y": 2028.285873413086,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "c067ce8c.82bd2",
+    "id": "6be3a1db.a02ba8",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 5628.83349609375,
-    "y": 2068.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 5711.900161743164,
+    "y": 2151.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "858f96c1.79cbc",
+    "id": "c91e3a5e.c6511",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5600.9501953125,
-    "y": 2117.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5684.016860961914,
+    "y": 2200.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8c0e0f7f.469198"
+        "8269b8aa.68a3b"
       ]
     ]
   },
   {
-    "id": "8c0e0f7f.469198",
+    "id": "8269b8aa.68a3b",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5791.9501953125,
-    "y": 2121.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 5875.016860961914,
+    "y": 2204.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a3faa53c.d04c58"
+        "8a849c85.456228"
       ]
     ]
   },
   {
-    "id": "a3faa53c.d04c58",
+    "id": "8a849c85.456228",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5918.9501953125,
-    "y": 2120.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 6002.016860961914,
+    "y": 2203.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "53f62ca7.7b47cc",
-        "582e0a2f.97b604"
+        "5d5d757b.d8e52c",
+        "a560a2f0.7f8828"
       ]
     ]
   },
   {
-    "id": "582e0a2f.97b604",
+    "id": "a560a2f0.7f8828",
     "type": "save",
     "name": "save SECONDARY-ROOT UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6140.9501953125,
-    "y": 2009.88330078125,
-    "z": "4138d8f7.da252",
+    "x": 6224.016860961914,
+    "y": 2092.1690521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "53f62ca7.7b47cc",
+    "id": "5d5d757b.d8e52c",
     "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": 6136.83349609375,
-    "y": 2068.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6219.900161743164,
+    "y": 2151.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "142e04ee.e3d34b",
-        "257ca4bf.8f052c"
+        "51d8510d.dcc058",
+        "79e7df30.7f8138"
       ]
     ]
   },
   {
-    "id": "142e04ee.e3d34b",
+    "id": "51d8510d.dcc058",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6346.83349609375,
-    "y": 2045.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6429.900161743164,
+    "y": 2128.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9407e67d.da2418"
+        "b3aa8483.9bdec"
       ]
     ]
   },
   {
-    "id": "9407e67d.da2418",
+    "id": "b3aa8483.9bdec",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6472.83349609375,
-    "y": 2045.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6555.900161743164,
+    "y": 2128.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "cd746c7.fc5cf1"
+        "50564c45.182124"
       ]
     ]
   },
   {
-    "id": "f87ebbbb.7e40d",
+    "id": "eaeffe9b.6e1578",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6477.83349609375,
-    "y": 2094.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6560.900161743164,
+    "y": 2177.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "88ec87d6.84288",
-        "29cb92cc.e394be",
-        "74fc1523.42a1e4",
-        "f8b2efa2.8dbc38"
+        "5ed2f363.68208c",
+        "ad95a077.a4baa8",
+        "283ec58.ad1d4ba",
+        "ccdfc934.795ad8"
       ]
     ]
   },
   {
-    "id": "257ca4bf.8f052c",
+    "id": "79e7df30.7f8138",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6351.83349609375,
-    "y": 2094.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6434.900161743164,
+    "y": 2177.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f87ebbbb.7e40d"
+        "eaeffe9b.6e1578"
       ]
     ]
   },
   {
-    "id": "cd746c7.fc5cf1",
+    "id": "50564c45.182124",
     "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": 6800.83349609375,
-    "y": 2042.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6883.900161743164,
+    "y": 2125.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "88ec87d6.84288",
+    "id": "5ed2f363.68208c",
     "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": 6753.83349609375,
-    "y": 2133.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6836.900161743164,
+    "y": 2216.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "29cb92cc.e394be",
+    "id": "ad95a077.a4baa8",
     "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='`$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-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": 6701.83349609375,
-    "y": 2175.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6784.900161743164,
+    "y": 2258.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "74fc1523.42a1e4",
+    "id": "283ec58.ad1d4ba",
     "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": 6830.83349609375,
-    "y": 2217.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6913.900161743164,
+    "y": 2300.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "fdca37c0.7ca06",
+    "id": "192e2e3d.32bda2",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6716.83349609375,
-    "y": 2090.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6799.900161743164,
+    "y": 2173.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "f8b2efa2.8dbc38",
+    "id": "ccdfc934.795ad8",
     "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": 6808.83349609375,
-    "y": 2265.7666015625,
-    "z": "4138d8f7.da252",
+    "x": 6891.900161743164,
+    "y": 2348.0523529052734,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "1b0442b9.4b628d",
+    "id": "162cf27b.802c36",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6372.83349609375,
-    "y": 2762.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 6455.900161743164,
+    "y": 2844.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "12529b57.e28025"
+        "b694c10f.97993"
       ]
     ]
   },
   {
-    "id": "12529b57.e28025",
+    "id": "b694c10f.97993",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6564.83349609375,
-    "y": 2757.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 6647.900161743164,
+    "y": 2839.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "78bbff94.82c65"
+        "5f9a1d2b.927d2c"
       ]
     ]
   },
   {
-    "id": "78bbff94.82c65",
+    "id": "5f9a1d2b.927d2c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6693.83349609375,
-    "y": 2757.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 6776.900161743164,
+    "y": 2839.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c9dee4ca.bc2dc"
+        "2368c13a.48b366"
       ]
     ]
   },
   {
-    "id": "c9dee4ca.bc2dc",
+    "id": "2368c13a.48b366",
     "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": 7025.83349609375,
-    "y": 2755.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 7108.900161743164,
+    "y": 2837.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "c1546bd.e66d418",
+    "id": "5a5c80f6.6318b8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5957.83349609375,
-    "y": 2974.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 6040.900161743164,
+    "y": 3056.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "13b9a3fa.0e3ae4"
+        "c941a0b5.409658"
       ]
     ]
   },
   {
-    "id": "13b9a3fa.0e3ae4",
+    "id": "c941a0b5.409658",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6137.83349609375,
-    "y": 2973.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 6220.900161743164,
+    "y": 3055.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e57b12b2.74ef18"
+        "e3672c28.52e2c"
       ]
     ]
   },
   {
-    "id": "e57b12b2.74ef18",
+    "id": "e3672c28.52e2c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6266.83349609375,
-    "y": 2973.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 6349.900161743164,
+    "y": 3055.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c79e7977.2b3cc8"
+        "78510894.01d168"
       ]
     ]
   },
   {
-    "id": "c79e7977.2b3cc8",
+    "id": "78510894.01d168",
     "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": 6484.716796875,
-    "y": 2972.449951171875,
-    "z": "4138d8f7.da252",
+    "x": 6567.783462524414,
+    "y": 3054.7357025146484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "76ccfb33.2c6e3c"
+        "7f59bec0.83cea8"
       ]
     ]
   },
   {
-    "id": "76ccfb33.2c6e3c",
+    "id": "7f59bec0.83cea8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6699.716796875,
-    "y": 2972.449951171875,
-    "z": "4138d8f7.da252",
+    "x": 6782.783462524414,
+    "y": 3054.7357025146484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f287a7b9.c4a8b"
+        "bd133df9.897ce8"
       ]
     ]
   },
   {
-    "id": "f287a7b9.c4a8b",
+    "id": "bd133df9.897ce8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6831.716796875,
-    "y": 2972.449951171875,
-    "z": "4138d8f7.da252",
+    "x": 6914.783462524414,
+    "y": 3054.7357025146484,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "3f3acb0.03380b6"
+        "5e2761fa.54e448"
       ]
     ]
   },
   {
-    "id": "3f3acb0.03380b6",
+    "id": "5e2761fa.54e448",
     "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": 7195.83349609375,
-    "y": 2971.566650390625,
-    "z": "4138d8f7.da252",
+    "x": 7278.900161743164,
+    "y": 3053.8524017333984,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "3c12d321.f6ab2c",
+    "id": "9f73e0e4.5bd9a8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4928.33251953125,
-    "y": 2622.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5011.399185180664,
+    "y": 2704.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "700dbefa.a5007"
+        "3e0d324f.39029e"
       ]
     ]
   },
   {
-    "id": "700dbefa.a5007",
+    "id": "3e0d324f.39029e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5108.33251953125,
-    "y": 2621.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5191.399185180664,
+    "y": 2703.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "c3579242.e478c8"
+        "2acf977a.ab8578"
       ]
     ]
   },
   {
-    "id": "c3579242.e478c8",
+    "id": "2acf977a.ab8578",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5237.33251953125,
-    "y": 2621.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5320.399185180664,
+    "y": 2703.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "69f846d5.9ccd18"
+        "94be4455.78db28"
       ]
     ]
   },
   {
-    "id": "cdd1f45b.46fb58",
+    "id": "83e5c66f.42223",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4973.33251953125,
-    "y": 2680.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5056.399185180664,
+    "y": 2762.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "69f846d5.9ccd18",
+    "id": "94be4455.78db28",
     "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": 5003.33251953125,
-    "y": 2713.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5086.399185180664,
+    "y": 2795.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "622ffdb0.75cb54",
-        "c593ae10.f47a3",
-        "24e47d1.d702d82"
+        "e215df2d.d0af58",
+        "4a2bacef.6efd64",
+        "5a609856.e771c"
       ]
     ]
   },
   {
-    "id": "c593ae10.f47a3",
+    "id": "4a2bacef.6efd64",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5184.823486328125,
-    "y": 2690.70751953125,
-    "z": "4138d8f7.da252",
+    "x": 5267.890151977539,
+    "y": 2772.9932708740234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "439fba81.48a81c"
+        "8ad6e6e5.397628"
       ]
     ]
   },
   {
-    "id": "24e47d1.d702d82",
+    "id": "5a609856.e771c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5173.33251953125,
-    "y": 2730.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5256.399185180664,
+    "y": 2812.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e58b129f.993b8"
+        "e676f166.0b9d7"
       ]
     ]
   },
   {
-    "id": "439fba81.48a81c",
+    "id": "8ad6e6e5.397628",
     "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": 5344.39501953125,
-    "y": 2688.9931640625,
-    "z": "4138d8f7.da252",
+    "x": 5427.461685180664,
+    "y": 2771.2789154052734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e58b129f.993b8",
+    "id": "e676f166.0b9d7",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5334.33251953125,
-    "y": 2731.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5417.399185180664,
+    "y": 2813.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "622ffdb0.75cb54",
+    "id": "e215df2d.d0af58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5178.33251953125,
-    "y": 2767.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5261.399185180664,
+    "y": 2849.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "ea27280d.d02bf8"
+        "c842a7cf.827af"
       ]
     ]
   },
   {
-    "id": "ea27280d.d02bf8",
+    "id": "c842a7cf.827af",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5336.33251953125,
-    "y": 2775.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5419.399185180664,
+    "y": 2857.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5d2e8885.4f468",
-        "6cb98496.dc88f4"
+        "c480afef.6388b8",
+        "1261035b.27b08d"
       ]
     ]
   },
   {
-    "id": "5d2e8885.4f468",
+    "id": "c480afef.6388b8",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 5497.33251953125,
-    "y": 2707.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5580.399185180664,
+    "y": 2789.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6cb98496.dc88f4",
+    "id": "1261035b.27b08d",
     "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": 5539.33251953125,
-    "y": 2779.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5622.399185180664,
+    "y": 2861.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "d39256ff.c99e4",
+    "id": "37f3e792.01b98",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5015.33251953125,
-    "y": 2980.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5098.399185180664,
+    "y": 3062.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "9b669929.a8064"
+        "f8a6bae7.e43428"
       ]
     ]
   },
   {
-    "id": "9b669929.a8064",
+    "id": "f8a6bae7.e43428",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5195.33251953125,
-    "y": 2979.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5278.399185180664,
+    "y": 3061.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "479be729.dc0248"
+        "ebf9b17f.54212"
       ]
     ]
   },
   {
-    "id": "479be729.dc0248",
+    "id": "ebf9b17f.54212",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5324.33251953125,
-    "y": 2979.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5407.399185180664,
+    "y": 3061.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "96ab8e09.feb69"
+        "7632b9a7.046188"
       ]
     ]
   },
   {
-    "id": "89e60282.d93268",
+    "id": "a3e62ac2.613cb8",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5060.33251953125,
-    "y": 3038.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5143.399185180664,
+    "y": 3120.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "96ab8e09.feb69",
+    "id": "7632b9a7.046188",
     "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": 5090.33251953125,
-    "y": 3071.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5173.399185180664,
+    "y": 3153.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "d8822576.b3585",
-        "75b8d325.77424c",
-        "c70dc607.d25bf8"
+        "aa9ebc0c.15b74",
+        "34556fac.9550b8",
+        "8f78cb97.869598"
       ]
     ]
   },
   {
-    "id": "75b8d325.77424c",
+    "id": "34556fac.9550b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5271.823486328125,
-    "y": 3048.70751953125,
-    "z": "4138d8f7.da252",
+    "x": 5354.890151977539,
+    "y": 3130.9932708740234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1c3be14a.a5638f"
+        "81becde2.b2238"
       ]
     ]
   },
   {
-    "id": "c70dc607.d25bf8",
+    "id": "8f78cb97.869598",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5260.33251953125,
-    "y": 3088.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5343.399185180664,
+    "y": 3170.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "57a20811.9713c"
+        "1e2ed61a.69a74a"
       ]
     ]
   },
   {
-    "id": "1c3be14a.a5638f",
+    "id": "81becde2.b2238",
     "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": 5431.39501953125,
-    "y": 3046.9931640625,
-    "z": "4138d8f7.da252",
+    "x": 5514.461685180664,
+    "y": 3129.2789154052734,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "57a20811.9713c",
+    "id": "1e2ed61a.69a74a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5421.33251953125,
-    "y": 3089.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5504.399185180664,
+    "y": 3171.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "d8822576.b3585",
+    "id": "aa9ebc0c.15b74",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5265.33251953125,
-    "y": 3125.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5348.399185180664,
+    "y": 3207.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "89319d00.a640d8"
+        "a5e9d80e.798b58"
       ]
     ]
   },
   {
-    "id": "89319d00.a640d8",
+    "id": "a5e9d80e.798b58",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5423.33251953125,
-    "y": 3133.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5506.399185180664,
+    "y": 3215.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "f52ef279.5e2fa8",
-        "ebb57be1.fff538"
+        "f6d35763.a75968",
+        "4c3e3376.aec354"
       ]
     ]
   },
   {
-    "id": "f52ef279.5e2fa8",
+    "id": "f6d35763.a75968",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 5584.33251953125,
-    "y": 3065.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5667.399185180664,
+    "y": 3147.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ebb57be1.fff538",
+    "id": "4c3e3376.aec354",
     "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": 5626.33251953125,
-    "y": 3137.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5709.399185180664,
+    "y": 3219.4190521240234,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "b27458da.77b73",
+    "id": "54f08fa.71777f",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3497,
-    "y": 4562.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3580.066665649414,
+    "y": 4644.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "b7009e9a.816708"
+        "f59f8a4e.ee5228"
       ]
     ]
   },
   {
-    "id": "b7009e9a.816708",
+    "id": "f59f8a4e.ee5228",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3677,
-    "y": 4561.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3760.066665649414,
+    "y": 4643.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "75b6f667.ff2f48"
+        "6dfc836d.44e47c"
       ]
     ]
   },
   {
-    "id": "75b6f667.ff2f48",
+    "id": "6dfc836d.44e47c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3806,
-    "y": 4561.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3889.066665649414,
+    "y": 4643.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e0e9d687.026568"
+        "84addd88.4602"
       ]
     ]
   },
   {
-    "id": "93bf9820.efc6f",
+    "id": "8e14b0c3.7931e8",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3542,
-    "y": 4620.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3625.066665649414,
+    "y": 4702.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e0e9d687.026568",
+    "id": "84addd88.4602",
     "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": 3572,
-    "y": 4653.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3655.066665649414,
+    "y": 4735.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6dcb758c.68fb4c",
-        "79d68d78.6f5a44",
-        "5d2b0296.8c0914"
+        "15dd9d01.198e13",
+        "99598358.2ea178",
+        "d0193baa.0b0ba8"
       ]
     ]
   },
   {
-    "id": "79d68d78.6f5a44",
+    "id": "99598358.2ea178",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3753.490966796875,
-    "y": 4630.70751953125,
-    "z": "4138d8f7.da252",
+    "x": 3836.557632446289,
+    "y": 4712.993270874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "283870b5.b39d78"
+        "4987dd19.729c2c"
       ]
     ]
   },
   {
-    "id": "5d2b0296.8c0914",
+    "id": "d0193baa.0b0ba8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3742,
-    "y": 4670.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3825.066665649414,
+    "y": 4752.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "307bdbbc.e5590c"
+        "4de60967.145d88"
       ]
     ]
   },
   {
-    "id": "283870b5.b39d78",
+    "id": "4987dd19.729c2c",
     "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": 3913.0625,
-    "y": 4628.9931640625,
-    "z": "4138d8f7.da252",
+    "x": 3996.129165649414,
+    "y": 4711.278915405273,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "307bdbbc.e5590c",
+    "id": "4de60967.145d88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3903,
-    "y": 4671.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3986.066665649414,
+    "y": 4753.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "6dcb758c.68fb4c",
+    "id": "15dd9d01.198e13",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3747,
-    "y": 4707.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3830.066665649414,
+    "y": 4789.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "22012b3c.a0e674"
+        "7135b7da.689598"
       ]
     ]
   },
   {
-    "id": "22012b3c.a0e674",
+    "id": "7135b7da.689598",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3905,
-    "y": 4715.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 3988.066665649414,
+    "y": 4797.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "7783af35.773e7",
-        "e7eec98c.ca59"
+        "db75607b.34ec4",
+        "368002b6.6c78de"
       ]
     ]
   },
   {
-    "id": "7783af35.773e7",
+    "id": "db75607b.34ec4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4066,
-    "y": 4647.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4149.066665649414,
+    "y": 4729.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "e7eec98c.ca59",
+    "id": "368002b6.6c78de",
     "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": 4108,
-    "y": 4719.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4191.066665649414,
+    "y": 4801.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "e87132f3.ee29c",
+    "id": "9630090a.96156",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4188.6669921875,
-    "y": 5517.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4271.733657836914,
+    "y": 5599.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "cb7342b9.a9c168",
+    "id": "b727caf7.37ccd",
     "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": 4343.6669921875,
-    "y": 5558.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4426.733657836914,
+    "y": 5640.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "7a7c44d8.30aa44",
+    "id": "9d76b5ce.608a08",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4159.6669921875,
-    "y": 5616.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4242.733657836914,
+    "y": 5698.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "8bec5884.15258",
-        "bb24a1ac.622598"
+        "6c688e63.a06ce",
+        "a407cbc4.6c0c8"
       ]
     ]
   },
   {
-    "id": "8bec5884.15258",
+    "id": "6c688e63.a06ce",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4395.6669921875,
-    "y": 5600.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4478.733657836914,
+    "y": 5682.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "6d098a3a.3afd8c"
+        "65c46de7.6d4354"
       ]
     ]
   },
   {
-    "id": "bb24a1ac.622598",
+    "id": "a407cbc4.6c0c8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4394.6669921875,
-    "y": 5648.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4477.733657836914,
+    "y": 5730.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "6d098a3a.3afd8c",
+    "id": "65c46de7.6d4354",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4539.6669921875,
-    "y": 5602.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4622.733657836914,
+    "y": 5684.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "de9129b3.62ee98",
-        "95ed5b5c.afa778",
-        "140ab45c.08ae54"
+        "a13d8ec4.2f4c18",
+        "3e4d3365.1256fc",
+        "d2dac5fa.54c798"
       ]
     ]
   },
   {
-    "id": "de9129b3.62ee98",
+    "id": "a13d8ec4.2f4c18",
     "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": 4951.667236328125,
-    "y": 5737.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5034.733901977539,
+    "y": 5819.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "95ed5b5c.afa778",
+    "id": "3e4d3365.1256fc",
     "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": 5072.667236328125,
-    "y": 5784.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5155.733901977539,
+    "y": 5866.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "bc8a01e6.d0596",
+    "id": "37767c8a.d0935c",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4955.551025390625,
-    "y": 5828.0166015625,
-    "z": "4138d8f7.da252",
+    "x": 5038.617691040039,
+    "y": 5910.302352905273,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "140ab45c.08ae54",
+    "id": "d2dac5fa.54c798",
     "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": 4954.334228515625,
-    "y": 5869.216796875,
-    "z": "4138d8f7.da252",
+    "x": 5037.400894165039,
+    "y": 5951.502548217773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "4e2e6b5c.090cf4",
+    "id": "d0ed0f43.9ac178",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4815,
-    "y": 6123.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4898.066665649414,
+    "y": 6205.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "8afd899a.01e88",
+    "id": "b5179b.b5811868",
     "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": 4981,
-    "y": 6162.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5064.066665649414,
+    "y": 6244.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "8c1f115c.700108",
+    "id": "8a0b9185.29b548",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4820,
-    "y": 6212.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 4903.066665649414,
+    "y": 6294.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "53961644.a48598",
-        "58a624c5.6a1504"
+        "bb485e07.c51f48",
+        "f5c035ca.78263"
       ]
     ]
   },
   {
-    "id": "53961644.a48598",
+    "id": "bb485e07.c51f48",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5053,
-    "y": 6206.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5136.066665649414,
+    "y": 6288.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1edcc228.5234b6"
+        "3bbd1b25.f0fda4"
       ]
     ]
   },
   {
-    "id": "58a624c5.6a1504",
+    "id": "f5c035ca.78263",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5054,
-    "y": 6256.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5137.066665649414,
+    "y": 6338.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "1edcc228.5234b6",
+    "id": "3bbd1b25.f0fda4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5200,
-    "y": 6214.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5283.066665649414,
+    "y": 6296.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "a2cd952f.42f1c8",
-        "75bd12d0.4fb564",
-        "ddd98790.fa90d"
+        "e99c4f39.622098",
+        "424cf9d2.7701e8",
+        "2a6230e2.ffd498"
       ]
     ]
   },
   {
-    "id": "a2cd952f.42f1c8",
+    "id": "e99c4f39.622098",
     "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": 5447,
-    "y": 6202.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5530.066665649414,
+    "y": 6284.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "75bd12d0.4fb564",
+    "id": "424cf9d2.7701e8",
     "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": 5568,
-    "y": 6249.13330078125,
-    "z": "4138d8f7.da252",
+    "x": 5651.066665649414,
+    "y": 6331.419052124023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "6c605ae5.2dde2c",
+    "id": "b810129e.2691f8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5450.8837890625,
-    "y": 6293.0166015625,
-    "z": "4138d8f7.da252",
+    "x": 5533.950454711914,
+    "y": 6375.302352905273,
+    "z": "2414cd0b.85dac2",
     "wires": []
   },
   {
-    "id": "ddd98790.fa90d",
+    "id": "2a6230e2.ffd498",
     "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": 5449.6669921875,
-    "y": 6334.216796875,
-    "z": "4138d8f7.da252",
+    "x": 5532.733657836914,
+    "y": 6416.502548217773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "e4c8e98f.2e48b8",
+    "id": "a198d826.7242b",
     "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": 3577,
-    "y": 6107.56689453125,
-    "z": "4138d8f7.da252",
+    "x": 3660.066665649414,
+    "y": 6189.852645874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "5e06fc8.b063184",
+    "id": "c717d5f4.4fddc8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2914.25,
-    "y": 6105.81689453125,
-    "z": "4138d8f7.da252",
+    "x": 2997.316665649414,
+    "y": 6188.102645874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "5aaa3311.116ad4",
-        "5f201884.9bf1b"
+        "420e4506.143cfc",
+        "beb3687c.2f0758"
       ]
     ]
   },
   {
-    "id": "5aaa3311.116ad4",
+    "id": "420e4506.143cfc",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3105.25,
-    "y": 6109.81689453125,
-    "z": "4138d8f7.da252",
+    "x": 3188.316665649414,
+    "y": 6192.102645874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "42b72649.a2611"
+        "75f23708.93f968"
       ]
     ]
   },
   {
-    "id": "42b72649.a2611",
+    "id": "75f23708.93f968",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3232.25,
-    "y": 6108.81689453125,
-    "z": "4138d8f7.da252",
+    "x": 3315.316665649414,
+    "y": 6191.102645874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "e4c8e98f.2e48b8"
+        "a198d826.7242b"
       ]
     ]
   },
   {
-    "id": "5f201884.9bf1b",
+    "id": "beb3687c.2f0758",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3101.25,
-    "y": 6179.81689453125,
-    "z": "4138d8f7.da252",
+    "x": 3184.316665649414,
+    "y": 6262.102645874023,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "1e510c07.00530c"
+        "befff12f.84551"
       ]
     ]
   },
   {
-    "id": "382dddaf.06eaa2",
+    "id": "41f38680.b5ae6",
     "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": 3650.75,
-    "y": 6178.900390625,
-    "z": "4138d8f7.da252",
+    "x": 3733.816665649414,
+    "y": 6261.186141967773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e510c07.00530c",
+    "id": "befff12f.84551",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3234.75,
-    "y": 6181.900390625,
-    "z": "4138d8f7.da252",
+    "x": 3317.816665649414,
+    "y": 6264.186141967773,
+    "z": "2414cd0b.85dac2",
     "wires": [
       [
-        "382dddaf.06eaa2"
+        "41f38680.b5ae6"
       ]
     ]
   }