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-create-clean.json;h=5989c10f95346dbe7469bb4dbb2d362037ac8914;hb=934becd6c3b0ecce44b1652820c6b4960ed5636f;hp=2fc491a793717fb8899d990d20fac74468e3459e;hpb=80bf0e3b814aa3a9cef81825c1b2da0925241d09;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
index 2fc491a7..5989c10f 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "934a37b5.570538",
+    "id": "77a1d01c.aa0f88",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 132.56666564941406,
-    "y": 130,
-    "z": "8bc654d2.f0dde",
+    "x": 168.56666564941406,
+    "y": 174.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "56cf7e3f.c20408"
+        "1e3c1648.671ee2"
       ]
     ]
   },
   {
-    "id": "56cf7e3f.c20408",
+    "id": "1e3c1648.671ee2",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,7886 +22,7886 @@
     "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": 416.85235595703125,
-    "y": 191.23810863494873,
-    "z": "8bc654d2.f0dde",
+    "x": 452.85235595703125,
+    "y": 235.8047742843628,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9d6f7a83.dd2e58"
+        "cf91a24a.cfe63"
       ]
     ]
   },
   {
-    "id": "9d6f7a83.dd2e58",
+    "id": "cf91a24a.cfe63",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-create-clean",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-create-clean' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 422.9952697753906,
-    "y": 276.0000305175781,
-    "z": "8bc654d2.f0dde",
+    "x": 458.9952697753906,
+    "y": 320.5666961669922,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "69ada9d9.f9e3c"
+        "8dc5a038.179a08"
       ]
     ]
   },
   {
-    "id": "69ada9d9.f9e3c",
+    "id": "8dc5a038.179a08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 772.5666656494141,
-    "y": 335,
-    "z": "8bc654d2.f0dde",
+    "x": 808.5666656494141,
+    "y": 379.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8dd82f3b.b9fa5",
-        "304cbf07.b12f58",
-        "1a3f65b2.521b1a"
+        "9b12be39.ac6768",
+        "27bb57a4.5f987",
+        "2a2da752.b59748"
       ]
     ]
   },
   {
-    "id": "8dd82f3b.b9fa5",
+    "id": "9b12be39.ac6768",
     "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": 1073.900161743164,
-    "y": 605.9302978515625,
-    "z": "8bc654d2.f0dde",
+    "x": 1109.900161743164,
+    "y": 650.4969635009766,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "304cbf07.b12f58",
+    "id": "27bb57a4.5f987",
     "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": 1095.328628540039,
-    "y": 308.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1131.328628540039,
+    "y": 352.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c42506f9.b054",
-        "15d85509.bac5fb",
-        "c693218f.780828"
+        "6a4d10dc.68d4a",
+        "5691a128.aafbf8",
+        "5af1bedf.a7a338"
       ]
     ]
   },
   {
-    "id": "c42506f9.b054",
+    "id": "6a4d10dc.68d4a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1320.328628540039,
-    "y": 166.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1356.328628540039,
+    "y": 210.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c432fa86.b14b18"
+        "80bca2fd.976568"
       ]
     ]
   },
   {
-    "id": "15d85509.bac5fb",
+    "id": "5691a128.aafbf8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1315.819595336914,
-    "y": 235.9073486328125,
-    "z": "8bc654d2.f0dde",
+    "x": 1351.819595336914,
+    "y": 280.47401428222656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c16eebd5.51383"
+        "7f99fec5.4581e"
       ]
     ]
   },
   {
-    "id": "c693218f.780828",
+    "id": "5af1bedf.a7a338",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1304.328628540039,
-    "y": 282.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1340.328628540039,
+    "y": 326.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3a0cbeb0.e80882"
+        "811c97ff.d24ba8"
       ]
     ]
   },
   {
-    "id": "2b8d35c8.ebc05a",
+    "id": "1663aedd.7a50f9",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1074.328628540039,
-    "y": 196.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1110.328628540039,
+    "y": 240.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1a3f65b2.521b1a",
+    "id": "2a2da752.b59748",
     "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": 1062.328628540039,
-    "y": 248.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1098.328628540039,
+    "y": 292.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c432fa86.b14b18",
+    "id": "80bca2fd.976568",
     "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": 1560.566665649414,
-    "y": 163,
-    "z": "8bc654d2.f0dde",
+    "x": 1596.566665649414,
+    "y": 207.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1d921b54.6d01cd",
-        "4b7292d8.462d44"
+        "9eedb337.58df9",
+        "1db64f77.692391"
       ]
     ]
   },
   {
-    "id": "c16eebd5.51383",
+    "id": "7f99fec5.4581e",
     "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": 1470.6290435791016,
-    "y": 238.85977172851562,
-    "z": "8bc654d2.f0dde",
+    "x": 1506.6290435791016,
+    "y": 283.4264373779297,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3a0cbeb0.e80882",
+    "id": "811c97ff.d24ba8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1474.566665649414,
-    "y": 283,
-    "z": "8bc654d2.f0dde",
+    "x": 1510.566665649414,
+    "y": 327.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1d921b54.6d01cd",
+    "id": "9eedb337.58df9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1765.566665649414,
-    "y": 200,
-    "z": "8bc654d2.f0dde",
+    "x": 1801.566665649414,
+    "y": 244.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e73b29c9.cbd5e8"
+        "e3d32c54.b9a328"
       ]
     ]
   },
   {
-    "id": "4b7292d8.462d44",
+    "id": "1db64f77.692391",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1775.566665649414,
-    "y": 127,
-    "z": "8bc654d2.f0dde",
+    "x": 1811.566665649414,
+    "y": 171.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e73b29c9.cbd5e8",
+    "id": "e3d32c54.b9a328",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1758.566665649414,
-    "y": 275,
-    "z": "8bc654d2.f0dde",
+    "x": 1794.566665649414,
+    "y": 319.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d6fcbbd7.6468b8",
-        "8f5c7a9a.326598",
-        "cd48af2d.929d6",
-        "528e88db.403fc",
-        "899de386.880988"
+        "bb266e42.d64ce8",
+        "33816966.623666",
+        "6367b887.741ef",
+        "a5dc6d6.f390b9",
+        "c617e6ee.8b983"
       ]
     ]
   },
   {
-    "id": "1f336392.1dac3c",
+    "id": "410f1f1c.a0bc8",
     "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": 2244.566665649414,
-    "y": 326,
-    "z": "8bc654d2.f0dde",
+    "x": 2280.566665649414,
+    "y": 370.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "923c23f1.638a98",
-        "ba451af8.67c9c8",
-        "2ed7be49.0a7032"
+        "b15d3419.e56af8",
+        "8179030d.1dc9b8",
+        "c175e9c7.17a5f8"
       ]
     ]
   },
   {
-    "id": "923c23f1.638a98",
+    "id": "b15d3419.e56af8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2460.566665649414,
-    "y": 393,
-    "z": "8bc654d2.f0dde",
+    "x": 2496.566665649414,
+    "y": 437.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c090e3a4.ec2058"
+        "e4dfd7bc.ebf1f8"
       ]
     ]
   },
   {
-    "id": "ba451af8.67c9c8",
+    "id": "8179030d.1dc9b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2461.057632446289,
-    "y": 292.573974609375,
-    "z": "8bc654d2.f0dde",
+    "x": 2497.057632446289,
+    "y": 337.14064025878906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4c29ba0c.292a6c"
+        "a4be790d.e1feb"
       ]
     ]
   },
   {
-    "id": "2ed7be49.0a7032",
+    "id": "c175e9c7.17a5f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2456.566665649414,
-    "y": 342,
-    "z": "8bc654d2.f0dde",
+    "x": 2492.566665649414,
+    "y": 386.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f2cd659.3fc4898"
+        "7226e4d.271f21c"
       ]
     ]
   },
   {
-    "id": "d6fcbbd7.6468b8",
+    "id": "bb266e42.d64ce8",
     "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": 1961.566665649414,
-    "y": 307,
-    "z": "8bc654d2.f0dde",
+    "x": 1997.566665649414,
+    "y": 351.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "419d8708.3b9078",
-        "1f336392.1dac3c",
-        "90827cac.7f3cc8",
-        "e557ce2.09f823"
+        "a610825f.3baab8",
+        "410f1f1c.a0bc8",
+        "5b668059.1f482",
+        "989a0e11.127538"
       ]
     ]
   },
   {
-    "id": "419d8708.3b9078",
+    "id": "a610825f.3baab8",
     "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": 2241.566665649414,
-    "y": 245,
-    "z": "8bc654d2.f0dde",
+    "x": 2277.566665649414,
+    "y": 289.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "528e88db.403fc",
+    "id": "a5dc6d6.f390b9",
     "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": 1935.566665649414,
-    "y": 257,
-    "z": "8bc654d2.f0dde",
+    "x": 1971.566665649414,
+    "y": 301.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8f5c7a9a.326598",
+    "id": "33816966.623666",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1978.566665649414,
-    "y": 116,
-    "z": "8bc654d2.f0dde",
+    "x": 2014.566665649414,
+    "y": 160.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "cd48af2d.929d6",
+    "id": "6367b887.741ef",
     "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/v25/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1990.566665649414,
-    "y": 157,
-    "z": "8bc654d2.f0dde",
+    "x": 2026.566665649414,
+    "y": 201.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "73efca11.a03e0c",
+    "id": "bc72be6f.8dc5b",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2015.566665649414,
-    "y": 69,
-    "z": "8bc654d2.f0dde",
+    "x": 2051.566665649414,
+    "y": 113.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "19fb453a.d497cb",
+    "id": "999645ff.8d79f8",
     "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": 1935.566665649414,
-    "y": 203,
-    "z": "8bc654d2.f0dde",
+    "x": 1971.566665649414,
+    "y": 247.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4c29ba0c.292a6c",
+    "id": "a4be790d.e1feb",
     "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": 2639.566665649414,
-    "y": 295,
-    "z": "8bc654d2.f0dde",
+    "x": 2675.566665649414,
+    "y": 339.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f2cd659.3fc4898",
+    "id": "7226e4d.271f21c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2639.504165649414,
-    "y": 344.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 2675.504165649414,
+    "y": 388.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c090e3a4.ec2058",
+    "id": "e4dfd7bc.ebf1f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2641.504165649414,
-    "y": 395.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 2677.504165649414,
+    "y": 439.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "383f413.f1d10be"
+        "4971434.1d7e03c"
       ]
     ]
   },
   {
-    "id": "383f413.f1d10be",
+    "id": "4971434.1d7e03c",
     "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": 2934.504165649414,
-    "y": 342.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 2970.504165649414,
+    "y": 386.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7f2204ba.ff0eac",
-        "6593ad3c.c3a94c",
-        "91d5dd73.0552a8"
+        "24e6d7c1.5d2048",
+        "3ed3e5cb.f1266a",
+        "c01f466a.2c59b8"
       ]
     ]
   },
   {
-    "id": "6593ad3c.c3a94c",
+    "id": "3ed3e5cb.f1266a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3237.995101928711,
-    "y": 74.7142333984375,
-    "z": "8bc654d2.f0dde",
+    "x": 3273.995101928711,
+    "y": 119.28089904785156,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "578e5a01.301d74"
+        "23469507.c7cb02"
       ]
     ]
   },
   {
-    "id": "578e5a01.301d74",
+    "id": "23469507.c7cb02",
     "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": 3415.566635131836,
-    "y": 75,
-    "z": "8bc654d2.f0dde",
+    "x": 3451.566635131836,
+    "y": 119.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "91d5dd73.0552a8",
+    "id": "c01f466a.2c59b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3233.504135131836,
-    "y": 124.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3269.504135131836,
+    "y": 168.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3a340bd0.83bde4"
+        "196361cf.857fbe"
       ]
     ]
   },
   {
-    "id": "3a340bd0.83bde4",
+    "id": "196361cf.857fbe",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3415.504135131836,
-    "y": 124.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3451.504135131836,
+    "y": 168.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7f2204ba.ff0eac",
+    "id": "24e6d7c1.5d2048",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3237.504135131836,
-    "y": 175.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3273.504135131836,
+    "y": 219.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5f6b46f2.1bbc28"
+        "51b732b0.20c4ec"
       ]
     ]
   },
   {
-    "id": "5f6b46f2.1bbc28",
+    "id": "51b732b0.20c4ec",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3417.504135131836,
-    "y": 175.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3453.504135131836,
+    "y": 219.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "432203ff.80791c"
+        "b7af5f8.780582"
       ]
     ]
   },
   {
-    "id": "432203ff.80791c",
+    "id": "b7af5f8.780582",
     "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": 2953.566665649414,
-    "y": 470,
-    "z": "8bc654d2.f0dde",
+    "x": 2989.566665649414,
+    "y": 514.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "25bf5884.d1bc1",
-        "68d7ca3f.b9c4a4"
+        "73dd535b.21de04",
+        "941bba5e.9658d"
       ]
     ]
   },
   {
-    "id": "68d7ca3f.b9c4a4",
+    "id": "941bba5e.9658d",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3293.566635131836,
-    "y": 317,
-    "z": "8bc654d2.f0dde",
+    "x": 3329.566635131836,
+    "y": 361.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "25bf5884.d1bc1",
+    "id": "73dd535b.21de04",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3292.566635131836,
-    "y": 371,
-    "z": "8bc654d2.f0dde",
+    "x": 3328.566635131836,
+    "y": 415.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a4256717.8bdab"
+        "33242734.b6ef48"
       ]
     ]
   },
   {
-    "id": "dc3dd60e.e6fb58",
+    "id": "8e081bd8.979208",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4037.566635131836,
-    "y": 325,
-    "z": "8bc654d2.f0dde",
+    "x": 4073.566635131836,
+    "y": 369.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7a99d9c1.cc807"
+        "ce0fbf14.8d016"
       ]
     ]
   },
   {
-    "id": "7a99d9c1.cc807",
+    "id": "ce0fbf14.8d016",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4214.566513061523,
-    "y": 317.9998779296875,
-    "z": "8bc654d2.f0dde",
+    "x": 4250.566513061523,
+    "y": 362.56654357910156,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "54329230.9376a4",
-        "e44ffd73.3caae8"
+        "1a44842.2180c7c",
+        "958a84e8.9fbc48"
       ]
     ]
   },
   {
-    "id": "a4256717.8bdab",
+    "id": "33242734.b6ef48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3456.566635131836,
-    "y": 297,
-    "z": "8bc654d2.f0dde",
+    "x": 3492.566635131836,
+    "y": 341.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ab8d2f4.fb7de5",
-        "6cd92abd.ea602c"
+        "afaee3e0.e6df98",
+        "db5b85f.aeb77f8"
       ]
     ]
   },
   {
-    "id": "ab8d2f4.fb7de5",
+    "id": "afaee3e0.e6df98",
     "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": 3737.566635131836,
-    "y": 253,
-    "z": "8bc654d2.f0dde",
+    "x": 3773.566635131836,
+    "y": 297.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d2f6d2c1.0cd0b8"
+        "c2880ab0.c73eb"
       ]
     ]
   },
   {
-    "id": "d2f6d2c1.0cd0b8",
+    "id": "c2880ab0.c73eb",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3999.566635131836,
-    "y": 253,
-    "z": "8bc654d2.f0dde",
+    "x": 4035.566635131836,
+    "y": 297.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dc3dd60e.e6fb58"
+        "8e081bd8.979208"
       ]
     ]
   },
   {
-    "id": "54329230.9376a4",
+    "id": "1a44842.2180c7c",
     "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": 4457.566513061523,
-    "y": 274.9998779296875,
-    "z": "8bc654d2.f0dde",
+    "x": 4493.566513061523,
+    "y": 319.56654357910156,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e44ffd73.3caae8",
+    "id": "958a84e8.9fbc48",
     "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": 4446.566513061523,
-    "y": 329.9998779296875,
-    "z": "8bc654d2.f0dde",
+    "x": 4482.566513061523,
+    "y": 374.56654357910156,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9db3143c.c20748",
-        "3f90e90d.8c4416",
-        "767c00f3.c60f18"
+        "4710cc76.36ad1c",
+        "efa019b.ed98a68",
+        "b08c41e4.127bd8"
       ]
     ]
   },
   {
-    "id": "767c00f3.c60f18",
+    "id": "b08c41e4.127bd8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4697.566879272461,
-    "y": 271,
-    "z": "8bc654d2.f0dde",
+    "x": 4733.566879272461,
+    "y": 315.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "eb2a7a65.4a99c"
+        "7eb7952c.f46d84"
       ]
     ]
   },
   {
-    "id": "eb2a7a65.4a99c",
+    "id": "7eb7952c.f46d84",
     "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": 4846.138412475586,
-    "y": 271.2857666015625,
-    "z": "8bc654d2.f0dde",
+    "x": 4882.138412475586,
+    "y": 315.85243225097656,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1d4fa709.d3c2b1",
+    "id": "dd0313dc.1a2988",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4845.075912475586,
-    "y": 315.426025390625,
-    "z": "8bc654d2.f0dde",
+    "x": 4881.075912475586,
+    "y": 359.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3f90e90d.8c4416",
+    "id": "efa019b.ed98a68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4686.075912475586,
-    "y": 315.426025390625,
-    "z": "8bc654d2.f0dde",
+    "x": 4722.075912475586,
+    "y": 359.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1d4fa709.d3c2b1"
+        "dd0313dc.1a2988"
       ]
     ]
   },
   {
-    "id": "9db3143c.c20748",
+    "id": "4710cc76.36ad1c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4693.075912475586,
-    "y": 394.426025390625,
-    "z": "8bc654d2.f0dde",
+    "x": 4729.075912475586,
+    "y": 438.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d725abd1.c0b928"
+        "fbbb1a1a.e2c5b8"
       ]
     ]
   },
   {
-    "id": "d725abd1.c0b928",
+    "id": "fbbb1a1a.e2c5b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4832.075912475586,
-    "y": 394.426025390625,
-    "z": "8bc654d2.f0dde",
+    "x": 4868.075912475586,
+    "y": 438.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "561b0f6d.fce1f8",
-        "8702a1ee.cea5e8"
+        "7a803641.fde268",
+        "6a2b20cd.32701"
       ]
     ]
   },
   {
-    "id": "561b0f6d.fce1f8",
+    "id": "7a803641.fde268",
     "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": 5037.566879272461,
-    "y": 392,
-    "z": "8bc654d2.f0dde",
+    "x": 5073.566879272461,
+    "y": 436.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8702a1ee.cea5e8",
+    "id": "6a2b20cd.32701",
     "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": 5036.566879272461,
-    "y": 438,
-    "z": "8bc654d2.f0dde",
+    "x": 5072.566879272461,
+    "y": 482.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6cd92abd.ea602c",
+    "id": "db5b85f.aeb77f8",
     "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": 3554.566635131836,
-    "y": 369,
-    "z": "8bc654d2.f0dde",
+    "x": 3590.566635131836,
+    "y": 413.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dd91e386.997658"
+        "3d651743.57b188"
       ]
     ]
   },
   {
-    "id": "dd91e386.997658",
+    "id": "3d651743.57b188",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3834.566635131836,
-    "y": 369,
-    "z": "8bc654d2.f0dde",
+    "x": 3870.566635131836,
+    "y": 413.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d0b5ecff.91d928"
+        "823d6ddb.3083e8"
       ]
     ]
   },
   {
-    "id": "d0b5ecff.91d928",
+    "id": "823d6ddb.3083e8",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2217.5667877197266,
-    "y": 782.0001220703125,
-    "z": "8bc654d2.f0dde",
+    "x": 2253.5667877197266,
+    "y": 826.5667877197266,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3175715f.1727f6"
+        "a4f7cdf6.5208e8"
       ]
     ]
   },
   {
-    "id": "3175715f.1727f6",
+    "id": "a4f7cdf6.5208e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2394.566665649414,
-    "y": 775,
-    "z": "8bc654d2.f0dde",
+    "x": 2430.566665649414,
+    "y": 819.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e36efc83.994d78",
-        "41c74306.d5cc9c"
+        "eb8d4808.206a1",
+        "4f79166b.81752"
       ]
     ]
   },
   {
-    "id": "e36efc83.994d78",
+    "id": "eb8d4808.206a1",
     "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": 2637.566665649414,
-    "y": 732,
-    "z": "8bc654d2.f0dde",
+    "x": 2673.566665649414,
+    "y": 776.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "41c74306.d5cc9c",
+    "id": "4f79166b.81752",
     "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": 2626.566665649414,
-    "y": 787,
-    "z": "8bc654d2.f0dde",
+    "x": 2662.566665649414,
+    "y": 831.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9d68f10f.bd8b8",
-        "dffb55fa.85b55",
-        "c53e6e84.05ac9"
+        "62989b79.9cfe9c",
+        "1988a7a4.ff123",
+        "85413e7a.b1b628"
       ]
     ]
   },
   {
-    "id": "9d68f10f.bd8b8",
+    "id": "62989b79.9cfe9c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2918.057632446289,
-    "y": 765.573974609375,
-    "z": "8bc654d2.f0dde",
+    "x": 2954.057632446289,
+    "y": 810.1406402587891,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b9d2eb35.931cc8"
+        "f822b8e9.269d"
       ]
     ]
   },
   {
-    "id": "dffb55fa.85b55",
+    "id": "1988a7a4.ff123",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2906.566665649414,
-    "y": 810,
-    "z": "8bc654d2.f0dde",
+    "x": 2942.566665649414,
+    "y": 854.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e6924452.e6205"
+        "b1dab01.deaad5"
       ]
     ]
   },
   {
-    "id": "b9d2eb35.931cc8",
+    "id": "f822b8e9.269d",
     "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": 3066.629165649414,
-    "y": 765.8597412109375,
-    "z": "8bc654d2.f0dde",
+    "x": 3102.629165649414,
+    "y": 810.4264068603516,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e6924452.e6205",
+    "id": "b1dab01.deaad5",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3065.566665649414,
-    "y": 810,
-    "z": "8bc654d2.f0dde",
+    "x": 3101.566665649414,
+    "y": 854.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c53e6e84.05ac9",
+    "id": "85413e7a.b1b628",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2913.566665649414,
-    "y": 889,
-    "z": "8bc654d2.f0dde",
+    "x": 2949.566665649414,
+    "y": 933.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "361f88a3.058c08"
+        "fb178b5b.3c4ae8"
       ]
     ]
   },
   {
-    "id": "361f88a3.058c08",
+    "id": "fb178b5b.3c4ae8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3052.566665649414,
-    "y": 889,
-    "z": "8bc654d2.f0dde",
+    "x": 3088.566665649414,
+    "y": 933.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "936c7f50.057838",
-        "fff97b6b.1650f8",
-        "40c59221.de8304",
-        "da2087d.3780d78",
-        "db5a893f.6acb2",
-        "855375ef.856b78",
-        "bd585daa.5b0d3",
-        "d3754757.4f2538",
-        "dd28e890.6f37f",
-        "10147ab3.fed6fd",
-        "425867c4.b0a9",
-        "e3e1a44c.9927b8",
-        "4a62d4e.fca9aac",
-        "2ae40328.466974",
-        "f71bee39.3d2f68",
-        "6cb3b80a.d81b1",
-        "7411f30.15b1c8c",
-        "59ced5c4.1cbb54",
-        "b2338e3d.f752e8",
-        "8b07e19d.5f94",
-        "877b276.88c73d8"
+        "e94ce0e6.cdcf4",
+        "2a0a2d05.627212",
+        "2d29cc30.4d633c",
+        "8255fb50.a7b88",
+        "ea28bb0a.303ea8",
+        "4b5b0bf9.d92b04",
+        "42798389.0acfb4",
+        "29a6af57.132c2",
+        "18652387.ef4d1c",
+        "c49ed897.0159e8",
+        "9d2ec307.fb07b8",
+        "c81a19d9.9b256",
+        "b5b402c1.c35e88",
+        "84774758.102ed8",
+        "17e6527f.ea49de",
+        "c22e8ab9.0a6b88",
+        "647f2e19.e50158",
+        "9c75cfb6.9dae68",
+        "9a8ce081.e6446",
+        "c989c621.8b708",
+        "88b89d66.20648"
       ]
     ]
   },
   {
-    "id": "b5bad4b9.685ad8",
+    "id": "31581a8c.76364e",
     "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": 3401.566665649414,
-    "y": 422.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3437.566665649414,
+    "y": 467.56663513183594,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "936c7f50.057838",
+    "id": "e94ce0e6.cdcf4",
     "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": 3382.566604614258,
-    "y": 501.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3418.566604614258,
+    "y": 546.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "2ae40328.466974",
+    "id": "84774758.102ed8",
     "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": 3339.566604614258,
-    "y": 546.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3375.566604614258,
+    "y": 591.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fff97b6b.1650f8",
+    "id": "2a0a2d05.627212",
     "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": 3304.566635131836,
-    "y": 600.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3340.566635131836,
+    "y": 645.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "40c59221.de8304",
+    "id": "2d29cc30.4d633c",
     "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": 3305.566635131836,
-    "y": 655.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3341.566635131836,
+    "y": 700.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "da2087d.3780d78",
+    "id": "8255fb50.a7b88",
     "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": 3303.566635131836,
-    "y": 919.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3339.566635131836,
+    "y": 964.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "969278b.6dcd308",
-        "8ef50320.33a2f",
-        "bc9f501b.616458"
+        "bc9dba3e.42915",
+        "4ccb40e3.75eb",
+        "6e77d52e.d49a5c"
       ]
     ]
   },
   {
-    "id": "db5a893f.6acb2",
+    "id": "ea28bb0a.303ea8",
     "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": 3298.566635131836,
-    "y": 980.9998474121094,
-    "z": "8bc654d2.f0dde",
+    "x": 3334.566635131836,
+    "y": 1025.5665130615234,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3f6dc76b.2c189",
-        "8fe533b.8ccffd",
-        "17823dcb.715f8a"
+        "ddf0ef9b.af495",
+        "d012a2e6.7e886",
+        "c732ba74.e6ac38"
       ]
     ]
   },
   {
-    "id": "969278b.6dcd308",
+    "id": "bc9dba3e.42915",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3614.566635131836,
-    "y": 690.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3650.566635131836,
+    "y": 735.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9ca5fa1b.024df8"
+        "d26a86c.70f36f8"
       ]
     ]
   },
   {
-    "id": "8ef50320.33a2f",
+    "id": "4ccb40e3.75eb",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3610.075668334961,
-    "y": 740.4259948730469,
-    "z": "8bc654d2.f0dde",
+    "x": 3646.075668334961,
+    "y": 784.9926605224609,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e39d355.b4f33c8"
+        "3592fdd4.1e4502"
       ]
     ]
   },
   {
-    "id": "bc9f501b.616458",
+    "id": "6e77d52e.d49a5c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3614.075668334961,
-    "y": 793.4259948730469,
-    "z": "8bc654d2.f0dde",
+    "x": 3650.075668334961,
+    "y": 837.9926605224609,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e84899ba.db50e8"
+        "f6681e1c.b1626"
       ]
     ]
   },
   {
-    "id": "9ca5fa1b.024df8",
+    "id": "d26a86c.70f36f8",
     "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": 3763.138168334961,
-    "y": 690.2857360839844,
-    "z": "8bc654d2.f0dde",
+    "x": 3799.138168334961,
+    "y": 734.8524017333984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e39d355.b4f33c8",
+    "id": "3592fdd4.1e4502",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3753.075668334961,
-    "y": 740.4259948730469,
-    "z": "8bc654d2.f0dde",
+    "x": 3789.075668334961,
+    "y": 784.9926605224609,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3f6dc76b.2c189",
+    "id": "ddf0ef9b.af495",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3576.566604614258,
-    "y": 880.9998168945312,
-    "z": "8bc654d2.f0dde",
+    "x": 3612.566604614258,
+    "y": 925.5664825439453,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "62e0b7bc.37a4e"
+        "275632fb.e09a86"
       ]
     ]
   },
   {
-    "id": "8fe533b.8ccffd",
+    "id": "d012a2e6.7e886",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3572.075668334961,
-    "y": 923.4258728027344,
-    "z": "8bc654d2.f0dde",
+    "x": 3608.075668334961,
+    "y": 967.9925384521484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ac864505.12601"
+        "984e984a.f448c8"
       ]
     ]
   },
   {
-    "id": "17823dcb.715f8a",
+    "id": "c732ba74.e6ac38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3573.075668334961,
-    "y": 976.4258728027344,
-    "z": "8bc654d2.f0dde",
+    "x": 3609.075668334961,
+    "y": 1020.9925384521484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bed44813.048dd"
+        "2eeb8181.d4367e"
       ]
     ]
   },
   {
-    "id": "62e0b7bc.37a4e",
+    "id": "275632fb.e09a86",
     "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": 3725.138137817383,
-    "y": 880.2855834960938,
-    "z": "8bc654d2.f0dde",
+    "x": 3761.138137817383,
+    "y": 924.8522491455078,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ac864505.12601",
+    "id": "984e984a.f448c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3715.075668334961,
-    "y": 923.4258728027344,
-    "z": "8bc654d2.f0dde",
+    "x": 3751.075668334961,
+    "y": 967.9925384521484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e84899ba.db50e8",
+    "id": "f6681e1c.b1626",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3775.566635131836,
-    "y": 792.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3811.566635131836,
+    "y": 837.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f9db2337.8fb9d"
+        "caab91f.12177f"
       ]
     ]
   },
   {
-    "id": "bed44813.048dd",
+    "id": "2eeb8181.d4367e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3726.566635131836,
-    "y": 975.9998474121094,
-    "z": "8bc654d2.f0dde",
+    "x": 3762.566635131836,
+    "y": 1020.5665130615234,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "423a02cf.14e434"
+        "9eb76f3a.cfcbd8"
       ]
     ]
   },
   {
-    "id": "f9db2337.8fb9d",
+    "id": "caab91f.12177f",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3950.566635131836,
-    "y": 766.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3986.566635131836,
+    "y": 811.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2c035f93.775ae8",
-        "a1971f98.6ccb48",
-        "dd62b4eb.26fb1"
+        "2172bcb.4fd5b44",
+        "c6b4aa53.9764a8",
+        "fbdccf10.5fabc"
       ]
     ]
   },
   {
-    "id": "423a02cf.14e434",
+    "id": "9eb76f3a.cfcbd8",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3910.566635131836,
-    "y": 883.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3946.566635131836,
+    "y": 928.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9f546ca0.9d33e8",
-        "2ec96d4e.1ca132",
-        "cb966d3f.bcf358"
+        "572a469b.71d458",
+        "b8b0db7f.0d0b98",
+        "56529717.d57cf"
       ]
     ]
   },
   {
-    "id": "2c035f93.775ae8",
+    "id": "2172bcb.4fd5b44",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4072.566635131836,
-    "y": 551.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4108.566635131836,
+    "y": 596.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6429cd23.35e7c4"
+        "b34792b6.2f84b"
       ]
     ]
   },
   {
-    "id": "a1971f98.6ccb48",
+    "id": "c6b4aa53.9764a8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4074.566635131836,
-    "y": 605.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4110.566635131836,
+    "y": 650.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "17c9fbf5.2a0a34"
+        "8791b1f2.9fddd"
       ]
     ]
   },
   {
-    "id": "9f546ca0.9d33e8",
+    "id": "572a469b.71d458",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4091.566665649414,
-    "y": 822,
-    "z": "8bc654d2.f0dde",
+    "x": 4127.566665649414,
+    "y": 866.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "22d232ad.fa9d6e"
+        "2e043645.b8ff02"
       ]
     ]
   },
   {
-    "id": "2ec96d4e.1ca132",
+    "id": "b8b0db7f.0d0b98",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4093.566665649414,
-    "y": 876,
-    "z": "8bc654d2.f0dde",
+    "x": 4129.566665649414,
+    "y": 920.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5c001c7.14606e4"
+        "8eeda316.6df7"
       ]
     ]
   },
   {
-    "id": "d98ccbbe.37e04",
+    "id": "9e47fb61.f661c8",
     "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": 4382.566635131836,
-    "y": 503.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4418.566635131836,
+    "y": 548.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "449eb720.722948",
+    "id": "21b58670.3a1192",
     "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": 4375.566635131836,
-    "y": 601.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4411.566635131836,
+    "y": 646.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "83bfbc5.ae6994",
+    "id": "d0dd5f40.4b5f38",
     "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": 4393.566665649414,
-    "y": 795,
-    "z": "8bc654d2.f0dde",
+    "x": 4429.566665649414,
+    "y": 839.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5244a859.c728e8",
+    "id": "d70d7c37.e21f5",
     "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": 4397.566665649414,
-    "y": 888,
-    "z": "8bc654d2.f0dde",
+    "x": 4433.566665649414,
+    "y": 932.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6ca3f458.2d99d4",
+    "id": "a539fdfb.953e38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3540.566665649414,
-    "y": 1560,
-    "z": "8bc654d2.f0dde",
+    "x": 3576.566665649414,
+    "y": 1604.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3eea4372.1c5814"
+        "7f7f51c3.cfe0e"
       ]
     ]
   },
   {
-    "id": "662947db.2b96e8",
+    "id": "a32c9d1e.59f95",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3550.057632446289,
-    "y": 1602.5740356445312,
-    "z": "8bc654d2.f0dde",
+    "x": 3586.057632446289,
+    "y": 1647.1407012939453,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f28295e0.d2c148"
+        "ea2bacf1.80819"
       ]
     ]
   },
   {
-    "id": "5677884d.d93c78",
+    "id": "fb2990eb.3d37b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3538.566665649414,
-    "y": 1649,
-    "z": "8bc654d2.f0dde",
+    "x": 3574.566665649414,
+    "y": 1693.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f900f622.22fda"
+        "495659dd.a8b668"
       ]
     ]
   },
   {
-    "id": "eddb7de7.123d5",
+    "id": "c88f575a.f847c",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3240.566665649414,
-    "y": 1522,
-    "z": "8bc654d2.f0dde",
+    "x": 3276.566665649414,
+    "y": 1566.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "bd585daa.5b0d3",
+    "id": "42798389.0acfb4",
     "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": 3283.566665649414,
-    "y": 1587,
-    "z": "8bc654d2.f0dde",
+    "x": 3319.566665649414,
+    "y": 1631.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6ca3f458.2d99d4",
-        "662947db.2b96e8",
-        "5677884d.d93c78"
+        "a539fdfb.953e38",
+        "a32c9d1e.59f95",
+        "fb2990eb.3d37b8"
       ]
     ]
   },
   {
-    "id": "855375ef.856b78",
+    "id": "4b5b0bf9.d92b04",
     "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": 3284.566665649414,
-    "y": 1257,
-    "z": "8bc654d2.f0dde",
+    "x": 3320.566665649414,
+    "y": 1301.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "74d070ad.2d8b38",
-        "f1856675.64f168"
+        "7927223e.403f8c",
+        "cb61ec61.ad89d"
       ]
     ]
   },
   {
-    "id": "f1856675.64f168",
+    "id": "cb61ec61.ad89d",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3505.566635131836,
-    "y": 1309.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3541.566635131836,
+    "y": 1354.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "77f0bbcf.b75e0c"
+        "b9b2d4da.80c098"
       ]
     ]
   },
   {
-    "id": "74d070ad.2d8b38",
+    "id": "7927223e.403f8c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3507.566635131836,
-    "y": 1342.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3543.566635131836,
+    "y": 1387.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6e268d43.53f934"
+        "3bca8d9d.c75392"
       ]
     ]
   },
   {
-    "id": "3eea4372.1c5814",
+    "id": "7f7f51c3.cfe0e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3713.233169555664,
-    "y": 1559,
-    "z": "8bc654d2.f0dde",
+    "x": 3749.233169555664,
+    "y": 1603.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f48e6ddf.17618",
-        "cc30c632.26f008"
+        "f7adce7b.f663c8",
+        "aab5a13f.7b9228"
       ]
     ]
   },
   {
-    "id": "f28295e0.d2c148",
+    "id": "ea2bacf1.80819",
     "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": 3703.6290435791016,
-    "y": 1605.8597717285156,
-    "z": "8bc654d2.f0dde",
+    "x": 3739.6290435791016,
+    "y": 1650.4264373779297,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f900f622.22fda",
+    "id": "495659dd.a8b668",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3707.566665649414,
-    "y": 1650,
-    "z": "8bc654d2.f0dde",
+    "x": 3743.566665649414,
+    "y": 1694.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f48e6ddf.17618",
+    "id": "f7adce7b.f663c8",
     "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": 3977.566665649414,
-    "y": 1543,
-    "z": "8bc654d2.f0dde",
+    "x": 4013.566665649414,
+    "y": 1587.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c31fbd4a.4c152",
-        "ca57bc98.e008f"
+        "eba55ae6.b47008",
+        "a5049a4a.932988"
       ]
     ]
   },
   {
-    "id": "ca57bc98.e008f",
+    "id": "a5049a4a.932988",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4200.566665649414,
-    "y": 1498,
-    "z": "8bc654d2.f0dde",
+    "x": 4236.566665649414,
+    "y": 1542.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ae27226e.c1211"
+        "b0af1c9f.1d33f"
       ]
     ]
   },
   {
-    "id": "c31fbd4a.4c152",
+    "id": "eba55ae6.b47008",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4202.566665649414,
-    "y": 1562,
-    "z": "8bc654d2.f0dde",
+    "x": 4238.566665649414,
+    "y": 1606.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "48b6888c.1688c8"
+        "3044898a.b774b6"
       ]
     ]
   },
   {
-    "id": "48b6888c.1688c8",
+    "id": "3044898a.b774b6",
     "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": 4364.566665649414,
-    "y": 1558,
-    "z": "8bc654d2.f0dde",
+    "x": 4400.566665649414,
+    "y": 1602.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ae27226e.c1211",
+    "id": "b0af1c9f.1d33f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4365.566665649414,
-    "y": 1495,
-    "z": "8bc654d2.f0dde",
+    "x": 4401.566665649414,
+    "y": 1539.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dc9805ea.b1d968",
-        "e17a88a7.3a0c68"
+        "3cd7ef1e.9f6f38",
+        "782ad12.44a143"
       ]
     ]
   },
   {
-    "id": "6e268d43.53f934",
+    "id": "3bca8d9d.c75392",
     "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": 3650.566635131836,
-    "y": 1339.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3686.566635131836,
+    "y": 1384.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "77f0bbcf.b75e0c",
+    "id": "b9b2d4da.80c098",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3653.566635131836,
-    "y": 1302.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3689.566635131836,
+    "y": 1347.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6b41cb54.146c7c",
-        "2227088d.da8978"
+        "2e849446.924674",
+        "15f06507.bc03a3"
       ]
     ]
   },
   {
-    "id": "6b41cb54.146c7c",
+    "id": "2e849446.924674",
     "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": 3827.566635131836,
-    "y": 1258.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3863.566635131836,
+    "y": 1303.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cc30c632.26f008",
+    "id": "aab5a13f.7b9228",
     "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": 3926.566635131836,
-    "y": 1652.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3962.566635131836,
+    "y": 1697.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4c51d8d9.7e50e"
+        "7f3dbf41.0b7cb"
       ]
     ]
   },
   {
-    "id": "4c51d8d9.7e50e",
+    "id": "7f3dbf41.0b7cb",
     "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": 4132.566635131836,
-    "y": 1652.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4168.566635131836,
+    "y": 1697.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ea6dd5aa.f54cc"
+        "33161afe.bf5fb6"
       ]
     ]
   },
   {
-    "id": "ea6dd5aa.f54cc",
+    "id": "33161afe.bf5fb6",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4347.852279663086,
-    "y": 1652.8217468261719,
-    "z": "8bc654d2.f0dde",
+    "x": 4383.852279663086,
+    "y": 1697.388412475586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "878f0a88.cc7f28"
+        "d1f5e6bd.d6c388"
       ]
     ]
   },
   {
-    "id": "2227088d.da8978",
+    "id": "15f06507.bc03a3",
     "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": 3842.566635131836,
-    "y": 1369.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3878.566635131836,
+    "y": 1414.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a1b22fed.dd46f",
-        "39006ff3.e4d42",
-        "90a88d63.a0deb"
+        "609f91e1.96d3c",
+        "c5dd830a.81bd98",
+        "f762b67a.3d2c8"
       ]
     ]
   },
   {
-    "id": "a1b22fed.dd46f",
+    "id": "609f91e1.96d3c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4038.0667572021484,
-    "y": 1321.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4074.0667572021484,
+    "y": 1366.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "11cc8b93.732e94"
+        "964976f5.819d98"
       ]
     ]
   },
   {
-    "id": "39006ff3.e4d42",
+    "id": "c5dd830a.81bd98",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4030.0667572021484,
-    "y": 1376.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4066.0667572021484,
+    "y": 1421.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dc84c818.c1238"
+        "bf5b62.bbb734a"
       ]
     ]
   },
   {
-    "id": "90a88d63.a0deb",
+    "id": "f762b67a.3d2c8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4035.0667572021484,
-    "y": 1433.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4071.0667572021484,
+    "y": 1478.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5b4aec5c.78ea6c"
+        "bc48235e.ca1af8"
       ]
     ]
   },
   {
-    "id": "5b4aec5c.78ea6c",
+    "id": "bc48235e.ca1af8",
     "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": 4187.066757202148,
-    "y": 1434.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4223.066757202148,
+    "y": 1479.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "dc84c818.c1238",
+    "id": "bf5b62.bbb734a",
     "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": 4198.066757202148,
-    "y": 1379.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4234.066757202148,
+    "y": 1424.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "11cc8b93.732e94",
+    "id": "964976f5.819d98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4182.449081420898,
-    "y": 1319.6556396484375,
-    "z": "8bc654d2.f0dde",
+    "x": 4218.449081420898,
+    "y": 1364.2223052978516,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3dd6ac8d.e6d824"
+        "242018b6.f49c88"
       ]
     ]
   },
   {
-    "id": "3dd6ac8d.e6d824",
+    "id": "242018b6.f49c88",
     "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": 4366.566635131836,
-    "y": 1333.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4402.566635131836,
+    "y": 1378.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2c6d0561.1001da"
+        "fc08eb6a.2320e"
       ]
     ]
   },
   {
-    "id": "e17a88a7.3a0c68",
+    "id": "782ad12.44a143",
     "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": 4535.566665649414,
-    "y": 1453,
-    "z": "8bc654d2.f0dde",
+    "x": 4571.566665649414,
+    "y": 1497.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "dc9805ea.b1d968",
+    "id": "3cd7ef1e.9f6f38",
     "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": 4536.566665649414,
-    "y": 1561,
-    "z": "8bc654d2.f0dde",
+    "x": 4572.566665649414,
+    "y": 1605.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4eccdb3c.a00b8c",
+    "id": "9dc8c404.7ec36",
     "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": 4537.566665649414,
-    "y": 1510,
-    "z": "8bc654d2.f0dde",
+    "x": 4573.566665649414,
+    "y": 1554.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "878f0a88.cc7f28",
+    "id": "d1f5e6bd.d6c388",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4554.683822631836,
-    "y": 1653.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4590.683822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a6df4a7c.6d4298",
-        "e55c6491.d1cf5",
-        "7eb455b8.997c94"
+        "333e33dc.560624",
+        "7db36be0.62778c",
+        "5d7040fa.99ac2"
       ]
     ]
   },
   {
-    "id": "a6df4a7c.6d4298",
+    "id": "333e33dc.560624",
     "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": 4769.683822631836,
-    "y": 1615.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4805.683822631836,
+    "y": 1659.906967163086,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e55c6491.d1cf5",
+    "id": "7db36be0.62778c",
     "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": 4766.683822631836,
-    "y": 1654.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4802.683822631836,
+    "y": 1698.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5121fcc7.d1555c"
+        "2d9a4fac.ae36b8"
       ]
     ]
   },
   {
-    "id": "7eb455b8.997c94",
+    "id": "5d7040fa.99ac2",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4722.183822631836,
-    "y": 1696.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4758.183822631836,
+    "y": 1740.906967163086,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5121fcc7.d1555c",
+    "id": "2d9a4fac.ae36b8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4947.183822631836,
-    "y": 1653.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4983.183822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dcdffb31.a68748"
+        "a4ece740.b4105"
       ]
     ]
   },
   {
-    "id": "ee290dd7.3447b8",
+    "id": "52e1d551.a483dc",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4766.566665649414,
-    "y": 1271,
-    "z": "8bc654d2.f0dde",
+    "x": 4802.566665649414,
+    "y": 1315.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f5c3f7a5.0472d8"
+        "7de9311.18a165"
       ]
     ]
   },
   {
-    "id": "f5c3f7a5.0472d8",
+    "id": "7de9311.18a165",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4943.566665649414,
-    "y": 1263,
-    "z": "8bc654d2.f0dde",
+    "x": 4979.566665649414,
+    "y": 1307.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "92327400.5b0ea",
-        "7dac197a.3be828"
+        "fff1a40e.199ba",
+        "7abb7683.fa5358"
       ]
     ]
   },
   {
-    "id": "2c6d0561.1001da",
+    "id": "fc08eb6a.2320e",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4561.566635131836,
-    "y": 1333.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4597.566635131836,
+    "y": 1378.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ee290dd7.3447b8",
-        "97637af.969a388"
+        "52e1d551.a483dc",
+        "6d2d083c.e53ec8"
       ]
     ]
   },
   {
-    "id": "97637af.969a388",
+    "id": "6d2d083c.e53ec8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4769.566665649414,
-    "y": 1345,
-    "z": "8bc654d2.f0dde",
+    "x": 4805.566665649414,
+    "y": 1389.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2b94ab82.f6af74"
+        "b42cfcde.f4ebc8"
       ]
     ]
   },
   {
-    "id": "2b94ab82.f6af74",
+    "id": "b42cfcde.f4ebc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4946.566665649414,
-    "y": 1337,
-    "z": "8bc654d2.f0dde",
+    "x": 4982.566665649414,
+    "y": 1381.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a745e5da.a32578"
+        "e8e280e3.a65e5"
       ]
     ]
   },
   {
-    "id": "dcdffb31.a68748",
+    "id": "a4ece740.b4105",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5105.183822631836,
-    "y": 1653.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 5141.183822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f0d23e06.a32c6"
+        "425d708e.783968"
       ]
     ]
   },
   {
-    "id": "f0d23e06.a32c6",
+    "id": "425d708e.783968",
     "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": 5312.183822631836,
-    "y": 1653.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 5348.183822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7dac197a.3be828",
+    "id": "7abb7683.fa5358",
     "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": 5151.566665649414,
-    "y": 1270,
-    "z": "8bc654d2.f0dde",
+    "x": 5187.566665649414,
+    "y": 1314.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "36ef2efb.214b2a",
-        "a6a3aa1c.6f7288",
-        "f4089fab.088a2"
+        "45403a46.69b7f4",
+        "ab6bed09.5e53d",
+        "1ce7c845.052f38"
       ]
     ]
   },
   {
-    "id": "92327400.5b0ea",
+    "id": "fff1a40e.199ba",
     "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": 5181.566665649414,
-    "y": 1218,
-    "z": "8bc654d2.f0dde",
+    "x": 5217.566665649414,
+    "y": 1262.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "36ef2efb.214b2a",
+    "id": "45403a46.69b7f4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5361.566665649414,
-    "y": 1261,
-    "z": "8bc654d2.f0dde",
+    "x": 5397.566665649414,
+    "y": 1305.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8d49602b.5cbbb8"
+        "f2e23e54.aa63c8"
       ]
     ]
   },
   {
-    "id": "a6a3aa1c.6f7288",
+    "id": "ab6bed09.5e53d",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5353.566665649414,
-    "y": 1316,
-    "z": "8bc654d2.f0dde",
+    "x": 5389.566665649414,
+    "y": 1360.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2502bb8.26e4744"
+        "29b1e9b9.e1584e"
       ]
     ]
   },
   {
-    "id": "f4089fab.088a2",
+    "id": "1ce7c845.052f38",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5358.566665649414,
-    "y": 1373,
-    "z": "8bc654d2.f0dde",
+    "x": 5394.566665649414,
+    "y": 1417.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "192598bd.b5d887"
+        "26b11425.c22444"
       ]
     ]
   },
   {
-    "id": "192598bd.b5d887",
+    "id": "26b11425.c22444",
     "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": 5510.566665649414,
-    "y": 1374,
-    "z": "8bc654d2.f0dde",
+    "x": 5546.566665649414,
+    "y": 1418.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "2502bb8.26e4744",
+    "id": "29b1e9b9.e1584e",
     "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": 5521.566665649414,
-    "y": 1319,
-    "z": "8bc654d2.f0dde",
+    "x": 5557.566665649414,
+    "y": 1363.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8d49602b.5cbbb8",
+    "id": "f2e23e54.aa63c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5505.948989868164,
-    "y": 1258.6556701660156,
-    "z": "8bc654d2.f0dde",
+    "x": 5541.948989868164,
+    "y": 1303.2223358154297,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "34dd56c8.a561f2"
+        "a969095b.c118"
       ]
     ]
   },
   {
-    "id": "a745e5da.a32578",
+    "id": "e8e280e3.a65e5",
     "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": 5181.566665649414,
-    "y": 1461,
-    "z": "8bc654d2.f0dde",
+    "x": 5217.566665649414,
+    "y": 1505.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "34dd56c8.a561f2",
+    "id": "a969095b.c118",
     "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": 5720.566665649414,
-    "y": 1255,
-    "z": "8bc654d2.f0dde",
+    "x": 5756.566665649414,
+    "y": 1299.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9cc65469.2e5488",
+    "id": "3c38a36b.8cf1d4",
     "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": 4370.566635131836,
-    "y": 539.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4406.566635131836,
+    "y": 584.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "bae36160.d0fbc",
+    "id": "66912289.29f5fc",
     "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": 4361.566635131836,
-    "y": 637.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4397.566635131836,
+    "y": 682.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6429cd23.35e7c4",
+    "id": "b34792b6.2f84b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4195.566635131836,
-    "y": 545.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4231.566635131836,
+    "y": 590.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d98ccbbe.37e04",
-        "9cc65469.2e5488"
+        "9e47fb61.f661c8",
+        "3c38a36b.8cf1d4"
       ]
     ]
   },
   {
-    "id": "17c9fbf5.2a0a34",
+    "id": "8791b1f2.9fddd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4201.566635131836,
-    "y": 609.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4237.566635131836,
+    "y": 654.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "449eb720.722948",
-        "bae36160.d0fbc"
+        "21b58670.3a1192",
+        "66912289.29f5fc"
       ]
     ]
   },
   {
-    "id": "22d232ad.fa9d6e",
+    "id": "2e043645.b8ff02",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4219.566665649414,
-    "y": 822,
-    "z": "8bc654d2.f0dde",
+    "x": 4255.566665649414,
+    "y": 866.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "83bfbc5.ae6994",
-        "7c60504e.d38f7"
+        "d0dd5f40.4b5f38",
+        "fac3c269.3e8818"
       ]
     ]
   },
   {
-    "id": "5c001c7.14606e4",
+    "id": "8eeda316.6df7",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4222.566665649414,
-    "y": 875,
-    "z": "8bc654d2.f0dde",
+    "x": 4258.566665649414,
+    "y": 919.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5244a859.c728e8",
-        "9835c9a0.4caf78"
+        "d70d7c37.e21f5",
+        "d978bf81.a682c8"
       ]
     ]
   },
   {
-    "id": "7c60504e.d38f7",
+    "id": "fac3c269.3e8818",
     "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": 4379.566665649414,
-    "y": 835,
-    "z": "8bc654d2.f0dde",
+    "x": 4415.566665649414,
+    "y": 879.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9835c9a0.4caf78",
+    "id": "d978bf81.a682c8",
     "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": 4382.566665649414,
-    "y": 926,
-    "z": "8bc654d2.f0dde",
+    "x": 4418.566665649414,
+    "y": 970.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c2220864.024798",
+    "id": "98a290a7.380a3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3674.566635131836,
-    "y": 2052.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3710.566635131836,
+    "y": 2097.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b80ff39a.5788d",
-        "d5ffb970.fa1968"
+        "e497858e.0123a",
+        "498e60f5.55f178"
       ]
     ]
   },
   {
-    "id": "db8ae4f9.347f",
+    "id": "7f085da3.5b6764",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3501.900131225586,
-    "y": 2053.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3537.900131225586,
+    "y": 2098.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c2220864.024798"
+        "98a290a7.380a3"
       ]
     ]
   },
   {
-    "id": "4d1c7431.f53f04",
+    "id": "92e1b5b8.c9d748",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3511.391098022461,
-    "y": 2096.574005126953,
-    "z": "8bc654d2.f0dde",
+    "x": 3547.391098022461,
+    "y": 2141.140670776367,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c720d68c.d6ef88"
+        "b56c748b.ef0b98"
       ]
     ]
   },
   {
-    "id": "f027027b.1605f8",
+    "id": "67d077ec.f8e2b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3499.900131225586,
-    "y": 2142.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3535.900131225586,
+    "y": 2187.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "174ecc35.cb4194"
+        "531aab62.3c8d74"
       ]
     ]
   },
   {
-    "id": "c720d68c.d6ef88",
+    "id": "b56c748b.ef0b98",
     "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": 3664.9625091552734,
-    "y": 2099.8597412109375,
-    "z": "8bc654d2.f0dde",
+    "x": 3700.9625091552734,
+    "y": 2144.4264068603516,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "174ecc35.cb4194",
+    "id": "531aab62.3c8d74",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3668.900131225586,
-    "y": 2143.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3704.900131225586,
+    "y": 2188.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b80ff39a.5788d",
+    "id": "e497858e.0123a",
     "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": 3960.900131225586,
-    "y": 2057.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 3996.900131225586,
+    "y": 2101.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f5a758df.e8e0d8",
-        "83d46017.2ef77"
+        "f5003287.c43b28",
+        "e21b6e0c.643e48"
       ]
     ]
   },
   {
-    "id": "83d46017.2ef77",
+    "id": "e21b6e0c.643e48",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4183.900131225586,
-    "y": 2012.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4219.900131225586,
+    "y": 2056.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "128bbd7c.ee7803"
+        "1c25bfa5.0e84a8"
       ]
     ]
   },
   {
-    "id": "f5a758df.e8e0d8",
+    "id": "f5003287.c43b28",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4185.900131225586,
-    "y": 2076.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4221.900131225586,
+    "y": 2120.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7922a686.9432f8"
+        "9df0e8d3.70e7b"
       ]
     ]
   },
   {
-    "id": "7922a686.9432f8",
+    "id": "9df0e8d3.70e7b",
     "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": 4344.900131225586,
-    "y": 2095.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4380.900131225586,
+    "y": 2139.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "128bbd7c.ee7803",
+    "id": "1c25bfa5.0e84a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4348.900131225586,
-    "y": 2009.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4384.900131225586,
+    "y": 2053.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ecc94bdb.36f218",
-        "70d8643e.5fc584"
+        "15645f19.451cd9",
+        "5b635208.85addc"
       ]
     ]
   },
   {
-    "id": "dd28e890.6f37f",
+    "id": "18652387.ef4d1c",
     "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": 3273.900131225586,
-    "y": 2088.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3309.900131225586,
+    "y": 2133.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "db8ae4f9.347f",
-        "4d1c7431.f53f04",
-        "f027027b.1605f8"
+        "7f085da3.5b6764",
+        "92e1b5b8.c9d748",
+        "67d077ec.f8e2b8"
       ]
     ]
   },
   {
-    "id": "6cb9de7.531902",
+    "id": "8fa3650.6227a18",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3234.900131225586,
-    "y": 2032.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3270.900131225586,
+    "y": 2077.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d3754757.4f2538",
+    "id": "29a6af57.132c2",
     "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": 3293.900131225586,
-    "y": 1828.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3329.900131225586,
+    "y": 1873.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c926dd8a.c40d78",
-        "b866a3cd.1307c8"
+        "7f4e16fd.13b25",
+        "9c29704e.b9eca8"
       ]
     ]
   },
   {
-    "id": "b866a3cd.1307c8",
+    "id": "9c29704e.b9eca8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3516.900131225586,
-    "y": 1814.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3552.900131225586,
+    "y": 1859.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "963b51c2.5c60a8"
+        "bb1e4e57.280888"
       ]
     ]
   },
   {
-    "id": "c926dd8a.c40d78",
+    "id": "7f4e16fd.13b25",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3518.900131225586,
-    "y": 1847.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3554.900131225586,
+    "y": 1892.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "288c4b3e.38e3ac"
+        "b75dfd73.636e48"
       ]
     ]
   },
   {
-    "id": "288c4b3e.38e3ac",
+    "id": "b75dfd73.636e48",
     "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": 3661.900131225586,
-    "y": 1844.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3697.900131225586,
+    "y": 1889.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "963b51c2.5c60a8",
+    "id": "bb1e4e57.280888",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3664.900131225586,
-    "y": 1807.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3700.900131225586,
+    "y": 1852.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dba238c.ade58c8",
-        "11c5499c.e33516"
+        "bda8773a.f12a1",
+        "d5e4b6e4.115dd8"
       ]
     ]
   },
   {
-    "id": "dba238c.ade58c8",
+    "id": "bda8773a.f12a1",
     "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": 3858.900131225586,
-    "y": 1811.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 3894.900131225586,
+    "y": 1855.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d5ffb970.fa1968",
+    "id": "498e60f5.55f178",
     "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": 3911.900100708008,
-    "y": 2179.9999389648438,
-    "z": "8bc654d2.f0dde",
+    "x": 3947.900100708008,
+    "y": 2224.566604614258,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8ab0c323.e760e"
+        "f195472b.83ff2"
       ]
     ]
   },
   {
-    "id": "8ab0c323.e760e",
+    "id": "f195472b.83ff2",
     "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": 4117.900100708008,
-    "y": 2179.9999389648438,
-    "z": "8bc654d2.f0dde",
+    "x": 4153.900100708008,
+    "y": 2224.566604614258,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ef601430.2ce96"
+        "2e029795.f674f8"
       ]
     ]
   },
   {
-    "id": "ef601430.2ce96",
+    "id": "2e029795.f674f8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4335.185745239258,
-    "y": 2178.8217163085938,
-    "z": "8bc654d2.f0dde",
+    "x": 4371.185745239258,
+    "y": 2223.388381958008,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e64538ad.e88608"
+        "9d2261f5.b9fa08"
       ]
     ]
   },
   {
-    "id": "11c5499c.e33516",
+    "id": "d5e4b6e4.115dd8",
     "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": 3880.900131225586,
-    "y": 1879.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 3916.900131225586,
+    "y": 1923.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "72da73e.01fae8c",
-        "1bf4f20c.844916",
-        "c2abc766.4ac0f"
+        "6730b25.e0c5f4c",
+        "c5d11aca.de4aa8",
+        "359fd71e.08e5b"
       ]
     ]
   },
   {
-    "id": "72da73e.01fae8c",
+    "id": "6730b25.e0c5f4c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4076.4002532958984,
-    "y": 1831.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4112.400253295898,
+    "y": 1875.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e5dd1f31.8ac458"
+        "11cc1f31.73aba1"
       ]
     ]
   },
   {
-    "id": "1bf4f20c.844916",
+    "id": "c5d11aca.de4aa8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4068.4002532958984,
-    "y": 1886.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4104.400253295898,
+    "y": 1930.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2c7c5a6c.8f4a66"
+        "5b1bf93a.85704"
       ]
     ]
   },
   {
-    "id": "c2abc766.4ac0f",
+    "id": "359fd71e.08e5b",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4073.4002532958984,
-    "y": 1943.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4109.400253295898,
+    "y": 1987.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a0f15b8e.a7ebb"
+        "150deb8f.b69cd4"
       ]
     ]
   },
   {
-    "id": "a0f15b8e.a7ebb",
+    "id": "150deb8f.b69cd4",
     "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": 4225.400253295898,
-    "y": 1944.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4261.400253295898,
+    "y": 1988.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "2c7c5a6c.8f4a66",
+    "id": "5b1bf93a.85704",
     "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": 4236.400253295898,
-    "y": 1889.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4272.400253295898,
+    "y": 1933.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e5dd1f31.8ac458",
+    "id": "11cc1f31.73aba1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4220.782577514648,
-    "y": 1828.65576171875,
-    "z": "8bc654d2.f0dde",
+    "x": 4256.782577514648,
+    "y": 1873.222427368164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5bc7c506.3f7314"
+        "cff6dd9b.8cbec"
       ]
     ]
   },
   {
-    "id": "ecc94bdb.36f218",
+    "id": "15645f19.451cd9",
     "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": 4518.900131225586,
-    "y": 1970.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4554.900131225586,
+    "y": 2014.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "70d8643e.5fc584",
+    "id": "5b635208.85addc",
     "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": 4519.900131225586,
-    "y": 2075.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4555.900131225586,
+    "y": 2119.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "75e052b3.6ff0fc",
+    "id": "f4c1e1b8.e7b4e8",
     "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": 4514.900131225586,
-    "y": 2024.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4550.900131225586,
+    "y": 2068.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e64538ad.e88608",
+    "id": "9d2261f5.b9fa08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4542.017288208008,
-    "y": 2168.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4578.017288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "58b39a0b.a28104",
-        "908d048a.fd0138",
-        "5394d746.97415"
+        "84d8ab80.c7c5d8",
+        "e6773f2f.211b88",
+        "2391fc90.5865f4"
       ]
     ]
   },
   {
-    "id": "58b39a0b.a28104",
+    "id": "84d8ab80.c7c5d8",
     "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": 4757.017288208008,
-    "y": 2130.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4793.017288208008,
+    "y": 2174.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "908d048a.fd0138",
+    "id": "e6773f2f.211b88",
     "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": 4754.017288208008,
-    "y": 2169.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4790.017288208008,
+    "y": 2213.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "160d9213.6a516e"
+        "e6f8fe6a.d80188"
       ]
     ]
   },
   {
-    "id": "5394d746.97415",
+    "id": "2391fc90.5865f4",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4709.517288208008,
-    "y": 2211.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4745.517288208008,
+    "y": 2255.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "160d9213.6a516e",
+    "id": "e6f8fe6a.d80188",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4934.517288208008,
-    "y": 2168.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4970.517288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2403cbf1.90bae4"
+        "fdc72134.67c23"
       ]
     ]
   },
   {
-    "id": "2403cbf1.90bae4",
+    "id": "fdc72134.67c23",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5092.517288208008,
-    "y": 2168.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 5128.517288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "15dae2c1.fe6bdd"
+        "be11f8e.1056f08"
       ]
     ]
   },
   {
-    "id": "15dae2c1.fe6bdd",
+    "id": "be11f8e.1056f08",
     "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": 5299.517288208008,
-    "y": 2168.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 5335.517288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e7ce121f.269bb",
+    "id": "8905f8e1.68af1",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4802.900131225586,
-    "y": 1847.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4838.900131225586,
+    "y": 1891.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "30725ca7.222ea4"
+        "ca38006f.4cfdd"
       ]
     ]
   },
   {
-    "id": "30725ca7.222ea4",
+    "id": "ca38006f.4cfdd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4979.900131225586,
-    "y": 1839.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5015.900131225586,
+    "y": 1883.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "82bc9190.99083",
-        "c6a75ef3.9aa488"
+        "9fddc1a7.528c8",
+        "516ef3bb.d53aec"
       ]
     ]
   },
   {
-    "id": "5bc7c506.3f7314",
+    "id": "cff6dd9b.8cbec",
     "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": 4404.900131225586,
-    "y": 1843.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4440.900131225586,
+    "y": 1887.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9e2fa3d8.88246"
+        "4e481827.26cf7"
       ]
     ]
   },
   {
-    "id": "9e2fa3d8.88246",
+    "id": "4e481827.26cf7",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4599.900131225586,
-    "y": 1843.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4635.900131225586,
+    "y": 1887.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e7ce121f.269bb",
-        "87abf2c8.a21648"
+        "8905f8e1.68af1",
+        "eb2add71.4c5b38"
       ]
     ]
   },
   {
-    "id": "c6a75ef3.9aa488",
+    "id": "516ef3bb.d53aec",
     "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": 5187.900131225586,
-    "y": 1846.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5223.900131225586,
+    "y": 1890.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d33681ca.12c55",
-        "54cfcb70.c20a5c",
-        "76901bc2.c646ec"
+        "8f1e6966.2ed9b",
+        "eb0b97a0.d2554",
+        "8b053235.7e7848"
       ]
     ]
   },
   {
-    "id": "c7485083.08e3d",
+    "id": "13674b50.1cc875",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4981.900131225586,
-    "y": 1912.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5017.900131225586,
+    "y": 1956.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9f7ab33f.3d3ee8"
+        "fd136ece.b5724"
       ]
     ]
   },
   {
-    "id": "87abf2c8.a21648",
+    "id": "eb2add71.4c5b38",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4804.900131225586,
-    "y": 1920.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4840.900131225586,
+    "y": 1964.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c7485083.08e3d"
+        "13674b50.1cc875"
       ]
     ]
   },
   {
-    "id": "82bc9190.99083",
+    "id": "9fddc1a7.528c8",
     "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": 5217.900131225586,
-    "y": 1794.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5253.900131225586,
+    "y": 1838.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9f7ab33f.3d3ee8",
+    "id": "fd136ece.b5724",
     "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": 5216.900131225586,
-    "y": 2036.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5252.900131225586,
+    "y": 2080.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d33681ca.12c55",
+    "id": "8f1e6966.2ed9b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5397.900131225586,
-    "y": 1837.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5433.900131225586,
+    "y": 1881.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "52bdc174.53236"
+        "9db69d63.dc9d08"
       ]
     ]
   },
   {
-    "id": "54cfcb70.c20a5c",
+    "id": "eb0b97a0.d2554",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5389.900131225586,
-    "y": 1892.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5425.900131225586,
+    "y": 1936.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "da0362e9.7cf8b8"
+        "c57fd560.6db4a"
       ]
     ]
   },
   {
-    "id": "76901bc2.c646ec",
+    "id": "8b053235.7e7848",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5394.900131225586,
-    "y": 1949.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5430.900131225586,
+    "y": 1993.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "656ad13e.13aaf8"
+        "6e911852.3a5e28"
       ]
     ]
   },
   {
-    "id": "656ad13e.13aaf8",
+    "id": "6e911852.3a5e28",
     "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": 5546.900131225586,
-    "y": 1950.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5582.900131225586,
+    "y": 1994.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "da0362e9.7cf8b8",
+    "id": "c57fd560.6db4a",
     "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": 5557.900131225586,
-    "y": 1895.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5593.900131225586,
+    "y": 1939.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "52bdc174.53236",
+    "id": "9db69d63.dc9d08",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5542.282455444336,
-    "y": 1834.65576171875,
-    "z": "8bc654d2.f0dde",
+    "x": 5578.282455444336,
+    "y": 1879.222427368164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2dd4dc53.801b1c"
+        "e6169acb.b321e8"
       ]
     ]
   },
   {
-    "id": "2dd4dc53.801b1c",
+    "id": "e6169acb.b321e8",
     "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": 5756.900131225586,
-    "y": 1831.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5792.900131225586,
+    "y": 1875.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "10147ab3.fed6fd",
+    "id": "c49ed897.0159e8",
     "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": 3241.566635131836,
-    "y": 1649.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3277.566635131836,
+    "y": 1694.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "bb3da11a.4b756",
+    "id": "758e6e49.b62098",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4537.566635131836,
-    "y": 623.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4573.566635131836,
+    "y": 668.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "550747e5.fd6e4",
+    "id": "ebf6202d.cf95a8",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4547.566665649414,
-    "y": 820,
-    "z": "8bc654d2.f0dde",
+    "x": 4583.566665649414,
+    "y": 864.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "425867c4.b0a9",
+    "id": "9d2ec307.fb07b8",
     "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": 3244.566604614258,
-    "y": 2157.9999389648438,
-    "z": "8bc654d2.f0dde",
+    "x": 3280.566604614258,
+    "y": 2202.566604614258,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e3e1a44c.9927b8",
+    "id": "c81a19d9.9b256",
     "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": 3381.566665649414,
-    "y": 2814,
-    "z": "8bc654d2.f0dde",
+    "x": 3417.566665649414,
+    "y": 2858.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a62d4e.fca9aac",
+    "id": "b5b402c1.c35e88",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3258.566665649414,
-    "y": 2924,
-    "z": "8bc654d2.f0dde",
+    "x": 3294.566665649414,
+    "y": 2968.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "81493f2.f26234",
-        "6c24115d.c6e7c"
+        "1932a37.6a327dd",
+        "e9120928.0c2298"
       ]
     ]
   },
   {
-    "id": "81493f2.f26234",
+    "id": "1932a37.6a327dd",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3442.566665649414,
-    "y": 2903,
-    "z": "8bc654d2.f0dde",
+    "x": 3478.566665649414,
+    "y": 2947.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3aff0eaf.ff7b7a"
+        "82607164.646368"
       ]
     ]
   },
   {
-    "id": "6c24115d.c6e7c",
+    "id": "e9120928.0c2298",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3334.566665649414,
-    "y": 5081,
-    "z": "8bc654d2.f0dde",
+    "x": 3370.566665649414,
+    "y": 5125.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5bc4950a.db01dc"
+        "ff313408.b74908"
       ]
     ]
   },
   {
-    "id": "5bc4950a.db01dc",
+    "id": "ff313408.b74908",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3489.566665649414,
-    "y": 5074,
-    "z": "8bc654d2.f0dde",
+    "x": 3525.566665649414,
+    "y": 5118.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2f2701b5.2dac16",
-        "316110e0.e54cc",
-        "b160de6d.e8ced8",
-        "595e7f4b.3b8bd8",
-        "8bf8bc6f.53ce6",
-        "1e2222c.7b917dd"
+        "172df7ad.1d8918",
+        "e9491637.d51c9",
+        "ed589f33.dee34",
+        "8bbbb496.3df16",
+        "581d9366.e6ee44",
+        "f0668881.7d6d6"
       ]
     ]
   },
   {
-    "id": "3aff0eaf.ff7b7a",
+    "id": "82607164.646368",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3585.566665649414,
-    "y": 2903,
-    "z": "8bc654d2.f0dde",
+    "x": 3621.566665649414,
+    "y": 2947.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5168a07f.a36df8",
-        "6c599b75.a60fcc",
-        "35850a83.44a89e",
-        "ae160236.4157c8",
-        "b7fd9c88.558b98",
-        "6e041a0e.19b3cc",
-        "612f5852.aaa57",
-        "8d9898f5.dd7e",
-        "638e1104.d7c428",
-        "d797d3a4.8fe9",
-        "ce4e4e08.0ce56",
-        "a4cacc19.7d376",
-        "57e31ea9.c7173",
-        "bf6be8f0.fb6c88",
-        "982a1a56.4966b8",
-        "8feec705.936fd8",
-        "eb6eb29c.21a438",
-        "cad73781.1cf898",
-        "bdd8ea07.2740c",
-        "8877dbf4.9fef7",
-        "374b533b.d2c934",
-        "e008f489.a45f08"
+        "a3d597a8.021388",
+        "2f89ad50.333c2a",
+        "7f37398e.ac4788",
+        "c4c44808.41f1d8",
+        "7f311072.1019e",
+        "a4b5361a.3a19d8",
+        "22f4d985.fe3c1e",
+        "dc9eeea6.2c8698",
+        "7a27d008.22f4d",
+        "7fc66b60.eeacbc",
+        "4cc13ef6.adae78",
+        "19fd1bdb.1b78e4",
+        "d873f718.81f988",
+        "cea863c0.4ccb38",
+        "6825a3b9.0c4a74",
+        "97368f95.9c3c68",
+        "550c2be9.9018d4",
+        "540352c5.31c62c",
+        "87e2b691.2d12d8",
+        "25259a32.c04fe6",
+        "b87e18c5.0db5e8",
+        "88b90ca8.e250c"
       ]
     ]
   },
   {
-    "id": "638e1104.d7c428",
+    "id": "7a27d008.22f4d",
     "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": 3895.566665649414,
-    "y": 3218,
-    "z": "8bc654d2.f0dde",
+    "x": 3931.566665649414,
+    "y": 3262.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "5168a07f.a36df8",
+    "id": "a3d597a8.021388",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-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/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3843.566665649414,
-    "y": 3260,
-    "z": "8bc654d2.f0dde",
+    "x": 3879.566665649414,
+    "y": 3304.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "6c599b75.a60fcc",
+    "id": "2f89ad50.333c2a",
     "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": 3972.566665649414,
-    "y": 3302,
-    "z": "8bc654d2.f0dde",
+    "x": 4008.566665649414,
+    "y": 3346.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e80dd6ae.f178",
+    "id": "568e89f6.76041",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 3818.566665649414,
-    "y": 3177,
-    "z": "8bc654d2.f0dde",
+    "x": 3854.566665649414,
+    "y": 3221.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b4b36e39.27fc08",
+    "id": "cfc92e2e.d4332",
     "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": 4343.566665649414,
-    "y": 3698,
-    "z": "8bc654d2.f0dde",
+    "x": 4379.566665649414,
+    "y": 3742.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "35850a83.44a89e",
+    "id": "7f37398e.ac4788",
     "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": 3907.566665649414,
-    "y": 3737,
-    "z": "8bc654d2.f0dde",
+    "x": 3943.566665649414,
+    "y": 3781.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ae160236.4157c8",
+    "id": "c4c44808.41f1d8",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-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/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3855.566665649414,
-    "y": 3788,
-    "z": "8bc654d2.f0dde",
+    "x": 3891.566665649414,
+    "y": 3832.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b7fd9c88.558b98",
+    "id": "7f311072.1019e",
     "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": 3991.566665649414,
-    "y": 3835,
-    "z": "8bc654d2.f0dde",
+    "x": 4027.566665649414,
+    "y": 3879.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f07a7af4.49b438",
+    "id": "b73302ea.6b3c9",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 3848.566665649414,
-    "y": 3697,
-    "z": "8bc654d2.f0dde",
+    "x": 3884.566665649414,
+    "y": 3741.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d7c1d718.25aef8",
+    "id": "f06d4892.086d48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4278.566665649414,
-    "y": 3894,
-    "z": "8bc654d2.f0dde",
+    "x": 4314.566665649414,
+    "y": 3938.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "6e041a0e.19b3cc",
+    "id": "a4b5361a.3a19d8",
     "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": 3869.566665649414,
-    "y": 3941,
-    "z": "8bc654d2.f0dde",
+    "x": 3905.566665649414,
+    "y": 3985.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3be15b0.8cc9ea6",
-        "8fcafedd.8f9ff8",
-        "74f3c2d6.5194d4"
+        "7c79fc80.066eb4",
+        "c371f5b2.5890b8",
+        "8674a08a.891028"
       ]
     ]
   },
   {
-    "id": "3be15b0.8cc9ea6",
+    "id": "7c79fc80.066eb4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4116.566665649414,
-    "y": 3895,
-    "z": "8bc654d2.f0dde",
+    "x": 4152.566665649414,
+    "y": 3939.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d7c1d718.25aef8"
+        "f06d4892.086d48"
       ]
     ]
   },
   {
-    "id": "8fcafedd.8f9ff8",
+    "id": "c371f5b2.5890b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4117.057632446289,
-    "y": 3940.5740356445312,
-    "z": "8bc654d2.f0dde",
+    "x": 4153.057632446289,
+    "y": 3985.1407012939453,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "535b8241.bba134"
+        "f874dece.70a19"
       ]
     ]
   },
   {
-    "id": "74f3c2d6.5194d4",
+    "id": "8674a08a.891028",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4114.566665649414,
-    "y": 3984,
-    "z": "8bc654d2.f0dde",
+    "x": 4150.566665649414,
+    "y": 4028.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4abd8099.5640c"
+        "395b0fd4.a6a4c"
       ]
     ]
   },
   {
-    "id": "535b8241.bba134",
+    "id": "f874dece.70a19",
     "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": 4279.629043579102,
-    "y": 3940.8597717285156,
-    "z": "8bc654d2.f0dde",
+    "x": 4315.629043579102,
+    "y": 3985.4264373779297,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4abd8099.5640c",
+    "id": "395b0fd4.a6a4c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4283.566665649414,
-    "y": 3985,
-    "z": "8bc654d2.f0dde",
+    "x": 4319.566665649414,
+    "y": 4029.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "982a1a56.4966b8",
+    "id": "6825a3b9.0c4a74",
     "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": 3923.566665649414,
-    "y": 4283,
-    "z": "8bc654d2.f0dde",
+    "x": 3959.566665649414,
+    "y": 4327.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8feec705.936fd8",
+    "id": "97368f95.9c3c68",
     "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": 3926.566665649414,
-    "y": 4328,
-    "z": "8bc654d2.f0dde",
+    "x": 3962.566665649414,
+    "y": 4372.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "cad73781.1cf898",
+    "id": "540352c5.31c62c",
     "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": 3918.566665649414,
-    "y": 4056,
-    "z": "8bc654d2.f0dde",
+    "x": 3954.566665649414,
+    "y": 4100.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "bdd8ea07.2740c",
+    "id": "87e2b691.2d12d8",
     "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": 3920.566665649414,
-    "y": 4103,
-    "z": "8bc654d2.f0dde",
+    "x": 3956.566665649414,
+    "y": 4147.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b21853e4.c6418",
+    "id": "de9883f2.40e1e",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 3839.566665649414,
-    "y": 4236,
-    "z": "8bc654d2.f0dde",
+    "x": 3875.566665649414,
+    "y": 4280.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f1842c11.743b7",
+    "id": "8e94a286.9bf3d",
     "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": 4449.566665649414,
-    "y": 4902,
-    "z": "8bc654d2.f0dde",
+    "x": 4485.566665649414,
+    "y": 4946.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f2701b5.2dac16",
+    "id": "172df7ad.1d8918",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3704.566665649414,
-    "y": 5055,
-    "z": "8bc654d2.f0dde",
+    "x": 3740.566665649414,
+    "y": 5099.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bb4138b0.4e1d88",
-        "3497566e.93319a"
+        "42ddce9e.8ae7c",
+        "527e3f0b.1dc1d"
       ]
     ]
   },
   {
-    "id": "3497566e.93319a",
+    "id": "527e3f0b.1dc1d",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3876.566665649414,
-    "y": 5052,
-    "z": "8bc654d2.f0dde",
+    "x": 3912.566665649414,
+    "y": 5096.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c7f4755e.39d608"
+        "7bd89115.7af5d"
       ]
     ]
   },
   {
-    "id": "bb4138b0.4e1d88",
+    "id": "42ddce9e.8ae7c",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3828.566665649414,
-    "y": 5899,
-    "z": "8bc654d2.f0dde",
+    "x": 3864.566665649414,
+    "y": 5943.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6c4c0ada.7452e4"
+        "ba444b0.6d090b8"
       ]
     ]
   },
   {
-    "id": "4c3530ee.3fa66",
+    "id": "678feee9.54f5e",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3889.566665649414,
-    "y": 5022,
-    "z": "8bc654d2.f0dde",
+    "x": 3925.566665649414,
+    "y": 5066.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "56d0be77.8f738",
+    "id": "f4c6dae7.f846f8",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3899.566665649414,
-    "y": 5857,
-    "z": "8bc654d2.f0dde",
+    "x": 3935.566665649414,
+    "y": 5901.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "612f5852.aaa57",
+    "id": "22f4d985.fe3c1e",
     "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": 3922.566665649414,
-    "y": 4431,
-    "z": "8bc654d2.f0dde",
+    "x": 3958.566665649414,
+    "y": 4475.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7f4755e.39d608",
+    "id": "7bd89115.7af5d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4052.566665649414,
-    "y": 5054,
-    "z": "8bc654d2.f0dde",
+    "x": 4088.566665649414,
+    "y": 5098.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "230e1b13.237ccc",
-        "5181bb49.6fa9a4",
-        "fd0048f2.8665c8",
-        "78647ab5.49b354",
-        "f0982e54.06c37",
-        "828e934c.bce518",
-        "f1842c11.743b7",
-        "76d94500.85b34c",
-        "66bf889f.a4f118"
+        "a830956d.47074",
+        "1755eaf4.354305",
+        "bc42d413.82595",
+        "e6e246b3.ed891",
+        "ea96eb7.ae6d798",
+        "64dc9cdb.f55c8c",
+        "8e94a286.9bf3d",
+        "f715ac9f.9b32b8",
+        "79d51ab0.5a125c"
       ]
     ]
   },
   {
-    "id": "ae961dcf.a0b6c",
+    "id": "979e33e8.311e38",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5497.566665649414,
-    "y": 4527,
-    "z": "8bc654d2.f0dde",
+    "x": 5533.566665649414,
+    "y": 4571.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "230e1b13.237ccc",
+    "id": "a830956d.47074",
     "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": 4430.566665649414,
-    "y": 5557,
-    "z": "8bc654d2.f0dde",
+    "x": 4466.566665649414,
+    "y": 5601.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8d9898f5.dd7e",
+    "id": "dc9eeea6.2c8698",
     "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": 3901.566665649414,
-    "y": 3431,
-    "z": "8bc654d2.f0dde",
+    "x": 3937.566665649414,
+    "y": 3475.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "d797d3a4.8fe9",
+    "id": "7fc66b60.eeacbc",
     "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": 3899.566665649414,
-    "y": 2888,
-    "z": "8bc654d2.f0dde",
+    "x": 3935.566665649414,
+    "y": 2932.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce4e4e08.0ce56",
+    "id": "4cc13ef6.adae78",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-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/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3847.566665649414,
-    "y": 2936,
-    "z": "8bc654d2.f0dde",
+    "x": 3883.566665649414,
+    "y": 2980.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "a4cacc19.7d376",
+    "id": "19fd1bdb.1b78e4",
     "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": 3975.566665649414,
-    "y": 2983,
-    "z": "8bc654d2.f0dde",
+    "x": 4011.566665649414,
+    "y": 3027.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ae968df.974b9f",
+    "id": "49213484.6d2684",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 3812.566665649414,
-    "y": 2846,
-    "z": "8bc654d2.f0dde",
+    "x": 3848.566665649414,
+    "y": 2890.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "57e31ea9.c7173",
+    "id": "d873f718.81f988",
     "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='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />",
     "comments": "",
     "outputs": 1,
-    "x": 3809.566665649414,
-    "y": 3074,
-    "z": "8bc654d2.f0dde",
+    "x": 3845.566665649414,
+    "y": 3118.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "bf6be8f0.fb6c88",
+    "id": "cea863c0.4ccb38",
     "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": 3902.566665649414,
-    "y": 3127,
-    "z": "8bc654d2.f0dde",
+    "x": 3938.566665649414,
+    "y": 3171.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "155d8942.126f0f",
+    "id": "8a16772c.f0d08",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 3793.566665649414,
-    "y": 3030,
-    "z": "8bc654d2.f0dde",
+    "x": 3829.566665649414,
+    "y": 3074.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "eda430a0.e8a4b8",
+    "id": "d8aa6375.55f12",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3797.566665649414,
-    "y": 3346,
-    "z": "8bc654d2.f0dde",
+    "x": 3833.566665649414,
+    "y": 3390.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "78647ab5.49b354",
+    "id": "e6e246b3.ed891",
     "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='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4366.566665649414,
-    "y": 4535,
-    "z": "8bc654d2.f0dde",
+    "x": 4402.566665649414,
+    "y": 4579.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "db99df8c.8021",
+    "id": "546f5300.a4bc44",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4350.566665649414,
-    "y": 4491,
-    "z": "8bc654d2.f0dde",
+    "x": 4386.566665649414,
+    "y": 4535.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fea8fd97.74e2c8",
+    "id": "b36d849f.6b142",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5097.566665649414,
-    "y": 4522,
-    "z": "8bc654d2.f0dde",
+    "x": 5133.566665649414,
+    "y": 4566.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5a0b429f.b8f42c",
+    "id": "df003672.bddd2",
     "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": 5184.566665649414,
-    "y": 4564,
-    "z": "8bc654d2.f0dde",
+    "x": 5220.566665649414,
+    "y": 4608.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "5930a956.25a2b",
+    "id": "dbb46179.c47f78",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-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/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5132.566665649414,
-    "y": 4612,
-    "z": "8bc654d2.f0dde",
+    "x": 5168.566665649414,
+    "y": 4656.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8f7ba394.827068",
+    "id": "837adbb2.1c01e8",
     "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": 5260.566665649414,
-    "y": 4659,
-    "z": "8bc654d2.f0dde",
+    "x": 5296.566665649414,
+    "y": 4703.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "828e934c.bce518",
+    "id": "64dc9cdb.f55c8c",
     "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": 4437.566665649414,
-    "y": 4944,
-    "z": "8bc654d2.f0dde",
+    "x": 4473.566665649414,
+    "y": 4988.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "29a2a107.550e86",
+    "id": "f767aa90.80364",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4420.566665649414,
-    "y": 5006,
-    "z": "8bc654d2.f0dde",
+    "x": 4456.566665649414,
+    "y": 5050.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5181bb49.6fa9a4",
+    "id": "1755eaf4.354305",
     "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": 4531.566665649414,
-    "y": 5048,
-    "z": "8bc654d2.f0dde",
+    "x": 4567.566665649414,
+    "y": 5092.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "a3e1b718.3ad9",
+    "id": "4953b8d7.b454c8",
     "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": 4979.566665649414,
-    "y": 5101,
-    "z": "8bc654d2.f0dde",
+    "x": 5015.566665649414,
+    "y": 5145.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "778aa80b.aa4e1",
+    "id": "b4d97863.c15da",
     "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": 4289.566665649414,
-    "y": 5799,
-    "z": "8bc654d2.f0dde",
+    "x": 4325.566665649414,
+    "y": 5843.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "5829dcc0.7722b4",
+    "id": "d715f85a.00ec7",
     "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='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4187.566665649414,
-    "y": 5748,
-    "z": "8bc654d2.f0dde",
+    "x": 4223.566665649414,
+    "y": 5792.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e74f47d7.82472",
+    "id": "5114dbce.799f0c",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4171.566665649414,
-    "y": 5704,
-    "z": "8bc654d2.f0dde",
+    "x": 4207.566665649414,
+    "y": 5748.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "edf4200a.b4f218",
+    "id": "a495cbe2.05f3",
     "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": 4957.566665649414,
-    "y": 5961,
-    "z": "8bc654d2.f0dde",
+    "x": 4993.566665649414,
+    "y": 6005.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "fd0048f2.8665c8",
+    "id": "bc42d413.82595",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4358.566665649414,
-    "y": 5105,
-    "z": "8bc654d2.f0dde",
+    "x": 4394.566665649414,
+    "y": 5149.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ad0bda8.59e5ba8",
-        "a82a76f3.4e09c"
+        "5a8de4b.cef309c",
+        "99b44375.9d0098"
       ]
     ]
   },
   {
-    "id": "ad0bda8.59e5ba8",
+    "id": "5a8de4b.cef309c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4569.566665649414,
-    "y": 5105,
-    "z": "8bc654d2.f0dde",
+    "x": 4605.566665649414,
+    "y": 5149.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "85a5596f.5bdcf8"
+        "41a866cb.6d5e88"
       ]
     ]
   },
   {
-    "id": "85a5596f.5bdcf8",
+    "id": "41a866cb.6d5e88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4725.566665649414,
-    "y": 5101,
-    "z": "8bc654d2.f0dde",
+    "x": 4761.566665649414,
+    "y": 5145.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a3e1b718.3ad9",
-        "31466e0d.9a3dba",
-        "19c788e0.a62557"
+        "4953b8d7.b454c8",
+        "5f4b3cc4.eb62f4",
+        "76c11af1.9e9b94"
       ]
     ]
   },
   {
-    "id": "a82a76f3.4e09c",
+    "id": "99b44375.9d0098",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4565.566665649414,
-    "y": 5153,
-    "z": "8bc654d2.f0dde",
+    "x": 4601.566665649414,
+    "y": 5197.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9fc5ee1f.667928"
+        "c40ddff0.38613"
       ]
     ]
   },
   {
-    "id": "9fc5ee1f.667928",
+    "id": "c40ddff0.38613",
     "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": 4713.566665649414,
-    "y": 5148,
-    "z": "8bc654d2.f0dde",
+    "x": 4749.566665649414,
+    "y": 5192.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4161f07f.2b4a78",
+    "id": "e8bdf848.077f2",
     "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": 5221.566665649414,
-    "y": 4730,
-    "z": "8bc654d2.f0dde",
+    "x": 5257.566665649414,
+    "y": 4774.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "90827cac.7f3cc8",
+    "id": "5b668059.1f482",
     "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": 2387.566665649414,
-    "y": 141,
-    "z": "8bc654d2.f0dde",
+    "x": 2423.566665649414,
+    "y": 185.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e557ce2.09f823",
+    "id": "989a0e11.127538",
     "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": 2321.566665649414,
-    "y": 177,
-    "z": "8bc654d2.f0dde",
+    "x": 2357.566665649414,
+    "y": 221.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "47435c42.bdd92c",
+    "id": "e2d9aece.1465f",
     "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": 2506.566665649414,
-    "y": 104,
-    "z": "8bc654d2.f0dde",
+    "x": 2542.566665649414,
+    "y": 148.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b6d8895e.58d1b",
+    "id": "8228476b.dfc93",
     "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": 4256.566665649414,
-    "y": 5865,
-    "z": "8bc654d2.f0dde",
+    "x": 4292.566665649414,
+    "y": 5909.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c1456abb.063048",
+    "id": "394125b3.b0b57a",
     "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": 4389.566665649414,
-    "y": 5913,
-    "z": "8bc654d2.f0dde",
+    "x": 4425.566665649414,
+    "y": 5957.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "da4c1b48.fae9f8",
+    "id": "64250c00.f41444",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4208.566665649414,
-    "y": 5971,
-    "z": "8bc654d2.f0dde",
+    "x": 4244.566665649414,
+    "y": 6015.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "86ae7c06.4b48",
-        "7bcdf21f.be49d4"
+        "24759095.ee144",
+        "cef50f43.3e9f48"
       ]
     ]
   },
   {
-    "id": "86ae7c06.4b48",
+    "id": "24759095.ee144",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4401.566665649414,
-    "y": 5972,
-    "z": "8bc654d2.f0dde",
+    "x": 4437.566665649414,
+    "y": 6016.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "97f7b4f.de4c2c8"
+        "c0599a44.570328"
       ]
     ]
   },
   {
-    "id": "97f7b4f.de4c2c8",
+    "id": "c0599a44.570328",
     "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": 4557.566665649414,
-    "y": 5969,
-    "z": "8bc654d2.f0dde",
+    "x": 4593.566665649414,
+    "y": 6013.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7bcdf21f.be49d4",
+    "id": "cef50f43.3e9f48",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4405.566665649414,
-    "y": 6016,
-    "z": "8bc654d2.f0dde",
+    "x": 4441.566665649414,
+    "y": 6060.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c9f63d74.2677a"
+        "2c2e6801.1f5998"
       ]
     ]
   },
   {
-    "id": "c9f63d74.2677a",
+    "id": "2c2e6801.1f5998",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4544.566665649414,
-    "y": 6011,
-    "z": "8bc654d2.f0dde",
+    "x": 4580.566665649414,
+    "y": 6055.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "edf4200a.b4f218",
-        "684d5c9e.960e44",
-        "fa17bed2.102338",
-        "4394fc56.b0a524",
-        "c58358a8.9796d8",
-        "f1d05d51.ef74a8",
-        "9dd9cb2c.0f6d38",
-        "e3b520b5.76f3e",
-        "1492db48.4787f5",
-        "4433eaac.652284",
-        "5e482e7e.e4be78",
-        "b03c5831.d4c5f"
+        "a495cbe2.05f3",
+        "d341cf2c.6ddc78",
+        "882a079d.0537c8",
+        "9acad1b0.c8f3c8",
+        "1591d847.9e7b3",
+        "2e348bab.75e0fc",
+        "3c4d6cf1.e2588c",
+        "cf206ffb.cf7668",
+        "5a9ba33a.7d1a8c",
+        "68c1a73b.58dcd8",
+        "221756d1.77b252",
+        "6b274a0f.281994"
       ]
     ]
   },
   {
-    "id": "9dd9cb2c.0f6d38",
+    "id": "3c4d6cf1.e2588c",
     "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": 4741.566665649414,
-    "y": 6690,
-    "z": "8bc654d2.f0dde",
+    "x": 4777.566665649414,
+    "y": 6734.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1b9180c4.9f766f",
-        "3223a99b.bae36e",
-        "f1d0a095.e9e33"
+        "f71173d.2556e9",
+        "36d425a2.cca582",
+        "63e9e58.35d851c"
       ]
     ]
   },
   {
-    "id": "1b9180c4.9f766f",
+    "id": "f71173d.2556e9",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4946.566665649414,
-    "y": 6687,
-    "z": "8bc654d2.f0dde",
+    "x": 4982.566665649414,
+    "y": 6731.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "901d20b6.63b228"
+        "211a75a9.b19e7a"
       ]
     ]
   },
   {
-    "id": "3223a99b.bae36e",
+    "id": "36d425a2.cca582",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4930.057632446289,
-    "y": 6748.574035644531,
-    "z": "8bc654d2.f0dde",
+    "x": 4966.057632446289,
+    "y": 6793.140701293945,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "74136956.3d8c9"
+        "2ef14bb4.55e2cc"
       ]
     ]
   },
   {
-    "id": "f1d0a095.e9e33",
+    "id": "63e9e58.35d851c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4927.566665649414,
-    "y": 6792,
-    "z": "8bc654d2.f0dde",
+    "x": 4963.566665649414,
+    "y": 6836.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c0df29cc.8ad0d8"
+        "61cb6aef.0faa54"
       ]
     ]
   },
   {
-    "id": "901d20b6.63b228",
+    "id": "211a75a9.b19e7a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5102.566665649414,
-    "y": 6701,
-    "z": "8bc654d2.f0dde",
+    "x": 5138.566665649414,
+    "y": 6745.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1ef77bcc.af8c2c"
+        "1dafef09.17b7d9"
       ]
     ]
   },
   {
-    "id": "74136956.3d8c9",
+    "id": "2ef14bb4.55e2cc",
     "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": 5092.629043579102,
-    "y": 6748.859771728516,
-    "z": "8bc654d2.f0dde",
+    "x": 5128.629043579102,
+    "y": 6793.42643737793,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c0df29cc.8ad0d8",
+    "id": "61cb6aef.0faa54",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5094.566665649414,
-    "y": 6791,
-    "z": "8bc654d2.f0dde",
+    "x": 5130.566665649414,
+    "y": 6835.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1ef77bcc.af8c2c",
+    "id": "1dafef09.17b7d9",
     "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": 5349.566665649414,
-    "y": 6698,
-    "z": "8bc654d2.f0dde",
+    "x": 5385.566665649414,
+    "y": 6742.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "77c4c783.c3eb4"
+        "33d48bc3.4a3004"
       ]
     ]
   },
   {
-    "id": "77c4c783.c3eb4",
+    "id": "33d48bc3.4a3004",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5586.566665649414,
-    "y": 6694,
-    "z": "8bc654d2.f0dde",
+    "x": 5622.566665649414,
+    "y": 6738.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aa349c90.ef423"
+        "509c6355.839cf4"
       ]
     ]
   },
   {
-    "id": "41bd4d7e.8e8f9c",
+    "id": "9a8b6da5.4a6238",
     "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": 5829.566665649414,
-    "y": 6666,
-    "z": "8bc654d2.f0dde",
+    "x": 5865.566665649414,
+    "y": 6710.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "858dc053.37b33",
-        "5e74f51.5b7928c"
+        "4704615c.3c69f",
+        "3a6fe540.e42ee2"
       ]
     ]
   },
   {
-    "id": "858dc053.37b33",
+    "id": "4704615c.3c69f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6034.566665649414,
-    "y": 6686,
-    "z": "8bc654d2.f0dde",
+    "x": 6070.566665649414,
+    "y": 6730.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aa349c90.ef423"
+        "509c6355.839cf4"
       ]
     ]
   },
   {
-    "id": "5e74f51.5b7928c",
+    "id": "3a6fe540.e42ee2",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6033.566665649414,
-    "y": 6639,
-    "z": "8bc654d2.f0dde",
+    "x": 6069.566665649414,
+    "y": 6683.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "aa349c90.ef423",
+    "id": "509c6355.839cf4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4777.566665649414,
-    "y": 6961,
-    "z": "8bc654d2.f0dde",
+    "x": 4813.566665649414,
+    "y": 7005.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b674f90b.943ea8"
+        "867fbf45.6b76e8"
       ]
     ]
   },
   {
-    "id": "4b6f312b.4e491",
+    "id": "b664359c.e37a3",
     "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": 6239.566635131836,
-    "y": 6898.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6275.566635131836,
+    "y": 6943.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e9dae4fe.64e148",
+    "id": "125d4567.492113",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4839.566665649414,
-    "y": 6637,
-    "z": "8bc654d2.f0dde",
+    "x": 4875.566665649414,
+    "y": 6681.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f1d05d51.ef74a8",
+    "id": "2e348bab.75e0fc",
     "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": 4721.566665649414,
-    "y": 6525,
-    "z": "8bc654d2.f0dde",
+    "x": 4757.566665649414,
+    "y": 6569.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "87a0032d.5441b8",
+    "id": "cf763643.011b",
     "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": 5066.566665649414,
-    "y": 6356,
-    "z": "8bc654d2.f0dde",
+    "x": 5102.566665649414,
+    "y": 6400.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e7a622d1.3aac3"
+        "e8f56973.27478"
       ]
     ]
   },
   {
-    "id": "e7a622d1.3aac3",
+    "id": "e8f56973.27478",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5286.566665649414,
-    "y": 6362,
-    "z": "8bc654d2.f0dde",
+    "x": 5322.566665649414,
+    "y": 6406.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d7851175.526278"
+        "fde5a354.539f28"
       ]
     ]
   },
   {
-    "id": "d7851175.526278",
+    "id": "fde5a354.539f28",
     "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": 5473.566665649414,
-    "y": 6322,
-    "z": "8bc654d2.f0dde",
+    "x": 5509.566665649414,
+    "y": 6366.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "56e3e30c.886de4"
+        "575e4bf2.eff614"
       ]
     ]
   },
   {
-    "id": "56e3e30c.886de4",
+    "id": "575e4bf2.eff614",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5665.566665649414,
-    "y": 6325,
-    "z": "8bc654d2.f0dde",
+    "x": 5701.566665649414,
+    "y": 6369.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c0a5fdcc.0dad4"
+        "d993f92.1703888"
       ]
     ]
   },
   {
-    "id": "c0a5fdcc.0dad4",
+    "id": "d993f92.1703888",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5874.566665649414,
-    "y": 6323,
-    "z": "8bc654d2.f0dde",
+    "x": 5910.566665649414,
+    "y": 6367.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e3b520b5.76f3e",
+    "id": "cf206ffb.cf7668",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4773.566665649414,
-    "y": 6350,
-    "z": "8bc654d2.f0dde",
+    "x": 4809.566665649414,
+    "y": 6394.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "87a0032d.5441b8"
+        "cf763643.011b"
       ]
     ]
   },
   {
-    "id": "fa17bed2.102338",
+    "id": "882a079d.0537c8",
     "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": 4781.566665649414,
-    "y": 6243,
-    "z": "8bc654d2.f0dde",
+    "x": 4817.566665649414,
+    "y": 6287.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b854c35b.ab4dd8",
-        "6917c22f.3449c4",
-        "56393d6a.f28b34"
+        "bc620ade.df0f58",
+        "6623a49b.f6c65c",
+        "19b34b3d.8c8655"
       ]
     ]
   },
   {
-    "id": "b854c35b.ab4dd8",
+    "id": "bc620ade.df0f58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5017.566665649414,
-    "y": 6226,
-    "z": "8bc654d2.f0dde",
+    "x": 5053.566665649414,
+    "y": 6270.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "6917c22f.3449c4",
+    "id": "6623a49b.f6c65c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5014.566665649414,
-    "y": 6267,
-    "z": "8bc654d2.f0dde",
+    "x": 5050.566665649414,
+    "y": 6311.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "56393d6a.f28b34",
+    "id": "19b34b3d.8c8655",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5028.566665649414,
-    "y": 6307,
-    "z": "8bc654d2.f0dde",
+    "x": 5064.566665649414,
+    "y": 6351.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "4394fc56.b0a524",
+    "id": "9acad1b0.c8f3c8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4717.566665649414,
-    "y": 6402,
-    "z": "8bc654d2.f0dde",
+    "x": 4753.566665649414,
+    "y": 6446.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c58358a8.9796d8",
+    "id": "1591d847.9e7b3",
     "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": 4725.566665649414,
-    "y": 6460,
-    "z": "8bc654d2.f0dde",
+    "x": 4761.566665649414,
+    "y": 6504.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "684d5c9e.960e44",
+    "id": "d341cf2c.6ddc78",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4730.566665649414,
-    "y": 6200,
-    "z": "8bc654d2.f0dde",
+    "x": 4766.566665649414,
+    "y": 6244.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4f9189d2.f34a8",
+    "id": "2fabd91.b08d0a6",
     "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": 4845.566665649414,
-    "y": 6152,
-    "z": "8bc654d2.f0dde",
+    "x": 4881.566665649414,
+    "y": 6196.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b674f90b.943ea8",
+    "id": "867fbf45.6b76e8",
     "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": 5020.566665649414,
-    "y": 6958,
-    "z": "8bc654d2.f0dde",
+    "x": 5056.566665649414,
+    "y": 7002.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f695cd31.082f9",
-        "a92f49c6.640148"
+        "ca20f18b.d4eba8",
+        "a546871e.5bfa7"
       ]
     ]
   },
   {
-    "id": "f695cd31.082f9",
+    "id": "ca20f18b.d4eba8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5249.566665649414,
-    "y": 6935,
-    "z": "8bc654d2.f0dde",
+    "x": 5285.566665649414,
+    "y": 6979.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fe65cd53.d11278"
+        "4274d693.44e7"
       ]
     ]
   },
   {
-    "id": "a92f49c6.640148",
+    "id": "a546871e.5bfa7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5249.566665649414,
-    "y": 6984,
-    "z": "8bc654d2.f0dde",
+    "x": 5285.566665649414,
+    "y": 7028.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8c69c55b.110248",
+    "id": "9d07c8b0.2ee89",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5982.566635131836,
-    "y": 6989.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6018.566635131836,
+    "y": 7034.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aeda0706.1d102",
-        "4b6f312b.4e491",
-        "eebb4557.9c03c"
+        "90c25785.3a5d5",
+        "b664359c.e37a3",
+        "9e3c844f.310898"
       ]
     ]
   },
   {
-    "id": "ca7dd8b0.fcddf",
+    "id": "8461f132.9df9d8",
     "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": 6367.566635131836,
-    "y": 6952.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6403.566635131836,
+    "y": 6997.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "eebb4557.9c03c",
+    "id": "9e3c844f.310898",
     "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": 6337.566635131836,
-    "y": 7012.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6373.566635131836,
+    "y": 7057.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "aeda0706.1d102",
+    "id": "90c25785.3a5d5",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 6244.566635131836,
-    "y": 6840.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6280.566635131836,
+    "y": 6885.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6c4c0ada.7452e4",
+    "id": "ba444b0.6d090b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3980.566665649414,
-    "y": 5898,
-    "z": "8bc654d2.f0dde",
+    "x": 4016.566665649414,
+    "y": 5942.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5829dcc0.7722b4",
-        "b6d8895e.58d1b",
-        "c1456abb.063048",
-        "da4c1b48.fae9f8",
-        "778aa80b.aa4e1"
+        "d715f85a.00ec7",
+        "8228476b.dfc93",
+        "394125b3.b0b57a",
+        "64250c00.f41444",
+        "b4d97863.c15da"
       ]
     ]
   },
   {
-    "id": "146e3d98.17031a",
+    "id": "c0768f56.37d61",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4722.566665649414,
-    "y": 6300,
-    "z": "8bc654d2.f0dde",
+    "x": 4758.566665649414,
+    "y": 6344.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1492db48.4787f5",
+    "id": "5a9ba33a.7d1a8c",
     "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": 4850.566665649414,
-    "y": 6042,
-    "z": "8bc654d2.f0dde",
+    "x": 4886.566665649414,
+    "y": 6086.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "cc643bc5.4660a",
+    "id": "42948c30.98f5ec",
     "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": 4987.566665649414,
-    "y": 5992,
-    "z": "8bc654d2.f0dde",
+    "x": 5023.566665649414,
+    "y": 6036.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "eb6eb29c.21a438",
+    "id": "550c2be9.9018d4",
     "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='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3814.566665649414,
-    "y": 3385,
-    "z": "8bc654d2.f0dde",
+    "x": 3850.566665649414,
+    "y": 3429.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "3ddb9817.a2345",
+    "id": "371edf0a.6e17f",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3992.566635131836,
-    "y": 1619.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4028.566635131836,
+    "y": 1664.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "87712f4d.617c48",
+    "id": "de567305.4a43d8",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3971.566604614258,
-    "y": 2131.9999389648438,
-    "z": "8bc654d2.f0dde",
+    "x": 4007.566604614258,
+    "y": 2176.566604614258,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4a9500be.eb8d5",
+    "id": "25146472.eb3624",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 3806.566665649414,
-    "y": 4006,
-    "z": "8bc654d2.f0dde",
+    "x": 3842.566665649414,
+    "y": 4050.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1cb779c6.3641ce",
+    "id": "c5539a8b.106aa",
     "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": 3896.566665649414,
-    "y": 6386,
-    "z": "8bc654d2.f0dde",
+    "x": 3932.566665649414,
+    "y": 6430.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "316110e0.e54cc",
+    "id": "e9491637.d51c9",
     "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": 3698.566665649414,
-    "y": 4915,
-    "z": "8bc654d2.f0dde",
+    "x": 3734.566665649414,
+    "y": 4959.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b160de6d.e8ced8",
+    "id": "ed589f33.dee34",
     "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": 3831.566665649414,
-    "y": 4963,
-    "z": "8bc654d2.f0dde",
+    "x": 3867.566665649414,
+    "y": 5007.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f0982e54.06c37",
+    "id": "ea96eb7.ae6d798",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4377.566665649414,
-    "y": 4591,
-    "z": "8bc654d2.f0dde",
+    "x": 4413.566665649414,
+    "y": 4635.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c8f13ad.170ba48",
-        "e5fec2af.744f18"
+        "a8f10916.be28b",
+        "f59d19a8.d9c4d8"
       ]
     ]
   },
   {
-    "id": "c8f13ad.170ba48",
+    "id": "a8f10916.be28b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4570.566665649414,
-    "y": 4592,
-    "z": "8bc654d2.f0dde",
+    "x": 4606.566665649414,
+    "y": 4636.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7d8426b0.28b2e8"
+        "f728dec2.62b3a"
       ]
     ]
   },
   {
-    "id": "e5fec2af.744f18",
+    "id": "f59d19a8.d9c4d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4574.566665649414,
-    "y": 4636,
-    "z": "8bc654d2.f0dde",
+    "x": 4610.566665649414,
+    "y": 4680.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bbb62c5.19c455"
+        "c09bd16a.0b32d"
       ]
     ]
   },
   {
-    "id": "bbb62c5.19c455",
+    "id": "c09bd16a.0b32d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4713.566665649414,
-    "y": 4631,
-    "z": "8bc654d2.f0dde",
+    "x": 4749.566665649414,
+    "y": 4675.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fdbb486.bd6db38",
-        "ecce0ba1.70791",
-        "5cdec210.c3723c"
+        "d9114bfc.f7bce",
+        "6c2541da.5d16b8",
+        "b22f3c73.35c508"
       ]
     ]
   },
   {
-    "id": "7d8426b0.28b2e8",
+    "id": "f728dec2.62b3a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4713.566665649414,
-    "y": 4588,
-    "z": "8bc654d2.f0dde",
+    "x": 4749.566665649414,
+    "y": 4632.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5a0b429f.b8f42c",
-        "5930a956.25a2b",
-        "8f7ba394.827068",
-        "4161f07f.2b4a78"
+        "df003672.bddd2",
+        "dbb46179.c47f78",
+        "837adbb2.1c01e8",
+        "e8bdf848.077f2"
       ]
     ]
   },
   {
-    "id": "fdbb486.bd6db38",
+    "id": "d9114bfc.f7bce",
     "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": 5115.566909790039,
-    "y": 4853,
-    "z": "8bc654d2.f0dde",
+    "x": 5151.566909790039,
+    "y": 4897.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1b42c685.843199",
+    "id": "430a9d16.e4affc",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5122.566909790039,
-    "y": 4807,
-    "z": "8bc654d2.f0dde",
+    "x": 5158.566909790039,
+    "y": 4851.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4433eaac.652284",
+    "id": "68c1a73b.58dcd8",
     "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": 4912.566665649414,
-    "y": 6586,
-    "z": "8bc654d2.f0dde",
+    "x": 4948.566665649414,
+    "y": 6630.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ecce0ba1.70791",
+    "id": "6c2541da.5d16b8",
     "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": 5233.566909790039,
-    "y": 4895,
-    "z": "8bc654d2.f0dde",
+    "x": 5269.566909790039,
+    "y": 4939.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "31466e0d.9a3dba",
+    "id": "5f4b3cc4.eb62f4",
     "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": 5108.566665649414,
-    "y": 5153,
-    "z": "8bc654d2.f0dde",
+    "x": 5144.566665649414,
+    "y": 5197.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7cb9f6d.ac734",
+    "id": "c7484b6a.1b27e8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3453.566665649414,
-    "y": 4486,
-    "z": "8bc654d2.f0dde",
+    "x": 3489.566665649414,
+    "y": 4530.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9ba8b5cc.a415f",
+    "id": "8eb23d5.90166c",
     "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": 3975.566665649414,
-    "y": 4587,
-    "z": "8bc654d2.f0dde",
+    "x": 4011.566665649414,
+    "y": 4631.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "595e7f4b.3b8bd8",
+    "id": "8bbbb496.3df16",
     "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": 3432.566665649414,
-    "y": 4530,
-    "z": "8bc654d2.f0dde",
+    "x": 3468.566665649414,
+    "y": 4574.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2a6568f7.a02838",
-        "9843c265.208d4",
-        "db80e493.f550d"
+        "a18c125a.02e14",
+        "7f2705d6.db1694",
+        "a9eb2c91.698e38"
       ]
     ]
   },
   {
-    "id": "9843c265.208d4",
+    "id": "7f2705d6.db1694",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3621.057632446289,
-    "y": 4498.57421875,
-    "z": "8bc654d2.f0dde",
+    "x": 3657.057632446289,
+    "y": 4543.140884399414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d1fd8036.140ed8"
+        "2e3353bd.ee574c"
       ]
     ]
   },
   {
-    "id": "db80e493.f550d",
+    "id": "a9eb2c91.698e38",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3609.566665649414,
-    "y": 4538,
-    "z": "8bc654d2.f0dde",
+    "x": 3645.566665649414,
+    "y": 4582.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b0bc7666.9d27d8"
+        "5c8fdc07.865394"
       ]
     ]
   },
   {
-    "id": "d1fd8036.140ed8",
+    "id": "2e3353bd.ee574c",
     "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": 3780.629165649414,
-    "y": 4496.85986328125,
-    "z": "8bc654d2.f0dde",
+    "x": 3816.629165649414,
+    "y": 4541.426528930664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b0bc7666.9d27d8",
+    "id": "5c8fdc07.865394",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3770.566665649414,
-    "y": 4539,
-    "z": "8bc654d2.f0dde",
+    "x": 3806.566665649414,
+    "y": 4583.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "aa03472e.31d4e8",
+    "id": "9ccbfbe.3763808",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3772.566665649414,
-    "y": 4583,
-    "z": "8bc654d2.f0dde",
+    "x": 3808.566665649414,
+    "y": 4627.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4ba9a34f.8b45e4",
-        "9ba8b5cc.a415f"
+        "b718fb4d.1d2eb",
+        "8eb23d5.90166c"
       ]
     ]
   },
   {
-    "id": "2a6568f7.a02838",
+    "id": "a18c125a.02e14",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3614.566665649414,
-    "y": 4575,
-    "z": "8bc654d2.f0dde",
+    "x": 3650.566665649414,
+    "y": 4619.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aa03472e.31d4e8"
+        "9ccbfbe.3763808"
       ]
     ]
   },
   {
-    "id": "4ba9a34f.8b45e4",
+    "id": "b718fb4d.1d2eb",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3933.566665649414,
-    "y": 4515,
-    "z": "8bc654d2.f0dde",
+    "x": 3969.566665649414,
+    "y": 4559.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8bf8bc6f.53ce6",
+    "id": "581d9366.e6ee44",
     "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": 3798.566665649414,
-    "y": 4854,
-    "z": "8bc654d2.f0dde",
+    "x": 3834.566665649414,
+    "y": 4898.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "d58a2a07.e32878",
+    "id": "3bda63fd.be934c",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5913.449966430664,
-    "y": 6603.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5949.449966430664,
+    "y": 6648.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5cdec210.c3723c",
+    "id": "b22f3c73.35c508",
     "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": 5113.233901977539,
-    "y": 4991.08349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5149.233901977539,
+    "y": 5035.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "7d691c73.0a445c",
+    "id": "72bb0449.7c6c4c",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5115.450698852539,
-    "y": 4950.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5151.450698852539,
+    "y": 4995.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "19c788e0.a62557",
+    "id": "76c11af1.9e9b94",
     "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": 4989.233657836914,
-    "y": 5241.08349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5025.233657836914,
+    "y": 5285.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b53673c2.40ae68",
+    "id": "9cb7b649.72fc8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4991.450454711914,
-    "y": 5200.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5027.450454711914,
+    "y": 5245.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cb99e55a.09312",
+    "id": "ac700fc2.3e2c98",
     "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": 5079.033462524414,
-    "y": 5603.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5115.033462524414,
+    "y": 5648.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b6bbe449.e349b8",
+    "id": "9aeab5a.07483c8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4906.033462524414,
-    "y": 5660.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 4942.033462524414,
+    "y": 5705.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9f020db8.9d3b98",
-        "42fb1006.cd98b"
+        "7adad055.f81858",
+        "1c623aa1.b56e9d"
       ]
     ]
   },
   {
-    "id": "9f020db8.9d3b98",
+    "id": "7adad055.f81858",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5117.033462524414,
-    "y": 5660.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5153.033462524414,
+    "y": 5705.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "406d3b53.ee3654"
+        "8b4d22b1.51563"
       ]
     ]
   },
   {
-    "id": "42fb1006.cd98b",
+    "id": "1c623aa1.b56e9d",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5113.033462524414,
-    "y": 5708.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5149.033462524414,
+    "y": 5753.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fa70895e.520cf8"
+        "1d139b8d.b9ffb4"
       ]
     ]
   },
   {
-    "id": "406d3b53.ee3654",
+    "id": "8b4d22b1.51563",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5273.033462524414,
-    "y": 5656.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5309.033462524414,
+    "y": 5701.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8249d2ac.0a73f8",
-        "2838a041.93c678",
-        "45d14641.c6458"
+        "f5948089.056778",
+        "eda1ec63.f88a8",
+        "116803c1.b8c5c4"
       ]
     ]
   },
   {
-    "id": "fa70895e.520cf8",
+    "id": "1d139b8d.b9ffb4",
     "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": 5261.033462524414,
-    "y": 5703.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5297.033462524414,
+    "y": 5748.083267211914,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f332f23.f01a81",
+    "id": "fa3077ab.1dba8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5582.917251586914,
-    "y": 5757.39990234375,
-    "z": "8bc654d2.f0dde",
+    "x": 5618.917251586914,
+    "y": 5801.966567993164,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "45d14641.c6458",
+    "id": "116803c1.b8c5c4",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5586.700454711914,
-    "y": 5795.60009765625,
-    "z": "8bc654d2.f0dde",
+    "x": 5622.700454711914,
+    "y": 5840.166763305664,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "2838a041.93c678",
+    "id": "eda1ec63.f88a8",
     "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": 5693.033462524414,
-    "y": 5708.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5729.033462524414,
+    "y": 5753.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8249d2ac.0a73f8",
+    "id": "f5948089.056778",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5577.033462524414,
-    "y": 5656.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5613.033462524414,
+    "y": 5701.083267211914,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3aa78165.d5c51e",
+    "id": "d30afa49.07b758",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4968.033462524414,
-    "y": 5561.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5004.033462524414,
+    "y": 5606.083267211914,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5e482e7e.e4be78",
+    "id": "221756d1.77b252",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4680.366470336914,
-    "y": 5736.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 4716.366470336914,
+    "y": 5781.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cb99e55a.09312",
-        "b6bbe449.e349b8",
-        "5021b590.5d75e4",
-        "316a2790.87ce5"
+        "ac700fc2.3e2c98",
+        "9aeab5a.07483c8",
+        "986cd5c9.02e9d",
+        "cfe4284f.245dc"
       ]
     ]
   },
   {
-    "id": "b03c5831.d4c5f",
+    "id": "6b274a0f.281994",
     "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": 4980.399673461914,
-    "y": 6097.2001953125,
-    "z": "8bc654d2.f0dde",
+    "x": 5016.399673461914,
+    "y": 6141.766860961914,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b60a5a20.1568d",
+    "id": "9356e875.de45c8",
     "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": 5786.683334350586,
-    "y": 6934.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5822.683334350586,
+    "y": 6978.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "fe65cd53.d11278",
+    "id": "4274d693.44e7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5405.683334350586,
-    "y": 6937.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5441.683334350586,
+    "y": 6981.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b60a5a20.1568d",
-        "364f2ed4.be66d2",
-        "3daa885e.628288"
+        "9356e875.de45c8",
+        "f4fb32f5.290118",
+        "fc73441.6e16238"
       ]
     ]
   },
   {
-    "id": "364f2ed4.be66d2",
+    "id": "f4fb32f5.290118",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5631.683334350586,
-    "y": 6989.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5667.683334350586,
+    "y": 7033.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1f12c870.4650c"
+        "7d48e95d.36571"
       ]
     ]
   },
   {
-    "id": "1f12c870.4650c",
+    "id": "7d48e95d.36571",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5810.683334350586,
-    "y": 6988.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5846.683334350586,
+    "y": 7032.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8c69c55b.110248"
+        "9d07c8b0.2ee89"
       ]
     ]
   },
   {
-    "id": "3daa885e.628288",
+    "id": "fc73441.6e16238",
     "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": 5632.683334350586,
-    "y": 6882.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5668.683334350586,
+    "y": 6926.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "651f3c1e.ddf684",
+    "id": "c7583bfe.6dbd",
     "type": "notify",
     "name": "notify",
     "xml": "<notify plugin='' resource='' action='' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2626.683334350586,
-    "y": 931.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 2662.683334350586,
+    "y": 975.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f71bee39.3d2f68",
+    "id": "17e6527f.ea49de",
     "type": "set",
     "name": "set network-route-three",
     "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",
     "comments": "",
-    "x": 3304.683334350586,
-    "y": 707.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3340.683334350586,
+    "y": 751.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1f090c0d.f20bac",
+    "id": "4ef95e12.fd687",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3520.683334350586,
-    "y": 1035.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3556.683334350586,
+    "y": 1079.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "4c96009f.d63af8",
+    "id": "76cbe80c.f4e188",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3516.192398071289,
-    "y": 1077.542724609375,
-    "z": "8bc654d2.f0dde",
+    "x": 3552.192398071289,
+    "y": 1122.109390258789,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "30702b44.ca2744",
+    "id": "2e93ec7e.d04c6c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3520.192367553711,
-    "y": 1125.5426940917969,
-    "z": "8bc654d2.f0dde",
+    "x": 3556.192367553711,
+    "y": 1170.109359741211,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f0fe90c1.1ee158"
+        "b4c3abcb.bb0aa8"
       ]
     ]
   },
   {
-    "id": "f0fe90c1.1ee158",
+    "id": "b4c3abcb.bb0aa8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3677.683334350586,
-    "y": 1125.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3713.683334350586,
+    "y": 1169.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "24f554c8.25b494"
+        "c59d6859.c80d1"
       ]
     ]
   },
   {
-    "id": "24f554c8.25b494",
+    "id": "c59d6859.c80d1",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3847.683364868164,
-    "y": 1128.1168212890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3883.683364868164,
+    "y": 1172.6834869384766,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "92b753af.8b83b",
-        "e0d04b94.0a949",
-        "3f783acd.f1212e"
+        "b806c285.3c1eb",
+        "1890bb58.2d4ee5",
+        "614f0a7f.a53cf4"
       ]
     ]
   },
   {
-    "id": "92b753af.8b83b",
+    "id": "b806c285.3c1eb",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4021.683334350586,
-    "y": 1066.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4057.683334350586,
+    "y": 1110.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "34be9217.24bb7e"
+        "224fa1be.62b94e"
       ]
     ]
   },
   {
-    "id": "e0d04b94.0a949",
+    "id": "1890bb58.2d4ee5",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4023.683334350586,
-    "y": 1120.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4059.683334350586,
+    "y": 1164.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1a5ec0d1.1d1527"
+        "5ec2cf4e.ba2b2"
       ]
     ]
   },
   {
-    "id": "34be9217.24bb7e",
+    "id": "224fa1be.62b94e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4149.683334350586,
-    "y": 1066.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4185.683334350586,
+    "y": 1110.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c2e9a46e.2fa128",
-        "d3171aa3.cb0078"
+        "a900cf11.02bcd",
+        "1c2b8eb2.2e6009"
       ]
     ]
   },
   {
-    "id": "1a5ec0d1.1d1527",
+    "id": "5ec2cf4e.ba2b2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4152.683334350586,
-    "y": 1119.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4188.683334350586,
+    "y": 1163.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1fb8ea51.9b1c8e",
-        "b9df456c.24fc38"
+        "459af4e0.72f56c",
+        "8371ef21.19884"
       ]
     ]
   },
   {
-    "id": "d3171aa3.cb0078",
+    "id": "1c2b8eb2.2e6009",
     "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": 4310.683334350586,
-    "y": 1090.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4346.683334350586,
+    "y": 1134.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1fb8ea51.9b1c8e",
+    "id": "459af4e0.72f56c",
     "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": 4327.683334350586,
-    "y": 1132.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4363.683334350586,
+    "y": 1176.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b9df456c.24fc38",
+    "id": "8371ef21.19884",
     "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": 4312.683334350586,
-    "y": 1170.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4348.683334350586,
+    "y": 1214.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c2e9a46e.2fa128",
+    "id": "a900cf11.02bcd",
     "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": 4324.683334350586,
-    "y": 1050.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4360.683334350586,
+    "y": 1094.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "dc69c361.915968",
+    "id": "f4867be8.a3739",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4489.683334350586,
-    "y": 1066.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4525.683334350586,
+    "y": 1110.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6cb3b80a.d81b1",
+    "id": "c22e8ab9.0a6b88",
     "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": 3280.683334350586,
-    "y": 1052.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3316.683334350586,
+    "y": 1096.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1f090c0d.f20bac",
-        "4c96009f.d63af8",
-        "30702b44.ca2744"
+        "4ef95e12.fd687",
+        "76cbe80c.f4e188",
+        "2e93ec7e.d04c6c"
       ]
     ]
   },
   {
-    "id": "3f783acd.f1212e",
+    "id": "614f0a7f.a53cf4",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3966.683334350586,
-    "y": 1184.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4002.683334350586,
+    "y": 1228.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ce69203c.a7c0d"
+        "7f1b4232.b1cfb4"
       ]
     ]
   },
   {
-    "id": "ce69203c.a7c0d",
+    "id": "7f1b4232.b1cfb4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4140.683334350586,
-    "y": 1179.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4176.683334350586,
+    "y": 1223.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "77a19b24.92e3d4",
-        "6c3b4ea8.3b622"
+        "838abc45.59f7a",
+        "db00c52c.5ed268"
       ]
     ]
   },
   {
-    "id": "6c3b4ea8.3b622",
+    "id": "db00c52c.5ed268",
     "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": 4310.683334350586,
-    "y": 1252.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4346.683334350586,
+    "y": 1296.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "77a19b24.92e3d4",
+    "id": "838abc45.59f7a",
     "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": 4364.683334350586,
-    "y": 1212.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4400.683334350586,
+    "y": 1256.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a7c6adcc.5c3908",
+    "id": "ff2b32b5.5b2a08",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4478.683334350586,
-    "y": 1237.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4514.683334350586,
+    "y": 1281.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cb966d3f.bcf358",
+    "id": "56529717.d57cf",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4037.683334350586,
-    "y": 940.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4073.683334350586,
+    "y": 984.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "359af935.19ef46"
+        "ee2de2c6.4f08d8"
       ]
     ]
   },
   {
-    "id": "ca572ac1.2b94f8",
+    "id": "ca426e77.b8a868",
     "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": 4381.683334350586,
-    "y": 1008.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4417.683334350586,
+    "y": 1052.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "60fff9bd.2ccfe",
+    "id": "f04a072d.a1bc78",
     "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": 4435.683334350586,
-    "y": 968.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4471.683334350586,
+    "y": 1012.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "74e2fab5.3910b4",
+    "id": "494ac499.527a64",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4579.683334350586,
-    "y": 997.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4615.683334350586,
+    "y": 1041.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "359af935.19ef46",
+    "id": "ee2de2c6.4f08d8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4211.683334350586,
-    "y": 935.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4247.683334350586,
+    "y": 979.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "60fff9bd.2ccfe",
-        "ca572ac1.2b94f8"
+        "f04a072d.a1bc78",
+        "ca426e77.b8a868"
       ]
     ]
   },
   {
-    "id": "dd62b4eb.26fb1",
+    "id": "fbdccf10.5fabc",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4097.683334350586,
-    "y": 678.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4133.683334350586,
+    "y": 722.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "eaab099.c2c5e78"
+        "b0420846.4df49"
       ]
     ]
   },
   {
-    "id": "44f31aac.78bf4c",
+    "id": "6f89ab47.26e854",
     "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": 4441.683334350586,
-    "y": 746.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4477.683334350586,
+    "y": 790.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e00b5614.1b212",
+    "id": "bf3e885.5679178",
     "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": 4495.683334350586,
-    "y": 706.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4531.683334350586,
+    "y": 750.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fb8145.224d2eb8",
+    "id": "fd3136c3.1f9f9",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4609.683334350586,
-    "y": 731.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4645.683334350586,
+    "y": 775.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "eaab099.c2c5e78",
+    "id": "b0420846.4df49",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4271.683334350586,
-    "y": 673.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4307.683334350586,
+    "y": 717.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e00b5614.1b212",
-        "44f31aac.78bf4c"
+        "bf3e885.5679178",
+        "6f89ab47.26e854"
       ]
     ]
   },
   {
-    "id": "47b6d6c0.771098",
+    "id": "d5e167ce.f19998",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3678.683334350586,
-    "y": 2555.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3714.683334350586,
+    "y": 2599.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d5c762a3.e1b22",
-        "cd80f814.c17fb8"
+        "eb74e655.05ff7",
+        "e886ebc1.1661e8"
       ]
     ]
   },
   {
-    "id": "6a53c92c.c39ad8",
+    "id": "47201997.7cc3c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3506.016830444336,
-    "y": 2556.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3542.016830444336,
+    "y": 2600.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "47b6d6c0.771098"
+        "d5e167ce.f19998"
       ]
     ]
   },
   {
-    "id": "15ee64d.915489b",
+    "id": "164be473.b70384",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3515.507797241211,
-    "y": 2598.690704345703,
-    "z": "8bc654d2.f0dde",
+    "x": 3551.507797241211,
+    "y": 2643.257369995117,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ffc72b13.54b308",
+    "id": "784aa04.7c1dfe",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3504.016830444336,
-    "y": 2645.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3540.016830444336,
+    "y": 2689.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "d5c762a3.e1b22",
+    "id": "eb74e655.05ff7",
     "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": 3965.016830444336,
-    "y": 2559.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4001.016830444336,
+    "y": 2603.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "39f97b3f.483dec",
-        "a10b377c.8904d8"
+        "3f64df6c.c641f8",
+        "e65de275.42f878"
       ]
     ]
   },
   {
-    "id": "a10b377c.8904d8",
+    "id": "e65de275.42f878",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4188.016830444336,
-    "y": 2514.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4224.016830444336,
+    "y": 2558.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1c79745.54c4b0c"
+        "34b4944b.960704"
       ]
     ]
   },
   {
-    "id": "39f97b3f.483dec",
+    "id": "3f64df6c.c641f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4190.016830444336,
-    "y": 2578.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4226.016830444336,
+    "y": 2622.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5e26eb53.994624"
+        "699d84d7.6602fc"
       ]
     ]
   },
   {
-    "id": "59ced5c4.1cbb54",
+    "id": "9c75cfb6.9dae68",
     "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": 3278.016830444336,
-    "y": 2591.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3314.016830444336,
+    "y": 2635.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6a53c92c.c39ad8",
-        "15ee64d.915489b",
-        "ffc72b13.54b308"
+        "47201997.7cc3c",
+        "164be473.b70384",
+        "784aa04.7c1dfe"
       ]
     ]
   },
   {
-    "id": "bf53a639.73b6d8",
+    "id": "23b8fd1e.0cb2fa",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3239.016830444336,
-    "y": 2535.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3275.016830444336,
+    "y": 2579.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7411f30.15b1c8c",
+    "id": "647f2e19.e50158",
     "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": 3298.016830444336,
-    "y": 2331.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3334.016830444336,
+    "y": 2375.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dd801267.ae8a78",
-        "2c468159.26cb9e"
+        "5e42c344.eae60c",
+        "af9299b9.b3a958"
       ]
     ]
   },
   {
-    "id": "2c468159.26cb9e",
+    "id": "af9299b9.b3a958",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3521.016830444336,
-    "y": 2317.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3557.016830444336,
+    "y": 2361.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1f5c2f54.7e50d9"
+        "9102a653.17d73"
       ]
     ]
   },
   {
-    "id": "dd801267.ae8a78",
+    "id": "5e42c344.eae60c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3523.016830444336,
-    "y": 2350.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3559.016830444336,
+    "y": 2394.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "1f5c2f54.7e50d9",
+    "id": "9102a653.17d73",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3669.016830444336,
-    "y": 2310.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3705.016830444336,
+    "y": 2354.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "33d7ee91.be9492",
-        "2cd16653.cccd12"
+        "9818833d.58ad9",
+        "288d55d1.6f744a"
       ]
     ]
   },
   {
-    "id": "33d7ee91.be9492",
+    "id": "9818833d.58ad9",
     "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": 3863.016830444336,
-    "y": 2313.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 3899.016830444336,
+    "y": 2357.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cd80f814.c17fb8",
+    "id": "e886ebc1.1661e8",
     "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": 3916.016799926758,
-    "y": 2682.1166381835938,
-    "z": "8bc654d2.f0dde",
+    "x": 3952.016799926758,
+    "y": 2726.683303833008,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f197c90a.b0bfd8"
+        "f013a1b2.101138"
       ]
     ]
   },
   {
-    "id": "f197c90a.b0bfd8",
+    "id": "f013a1b2.101138",
     "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": 4122.016799926758,
-    "y": 2682.1166381835938,
-    "z": "8bc654d2.f0dde",
+    "x": 4158.016799926758,
+    "y": 2726.683303833008,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ee87c14f.7e00c8"
+        "386bba62.16259e"
       ]
     ]
   },
   {
-    "id": "2cd16653.cccd12",
+    "id": "288d55d1.6f744a",
     "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": 3885.016830444336,
-    "y": 2381.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 3921.016830444336,
+    "y": 2425.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b86ed6f1.7f482",
-        "f1a441ce.e5665",
-        "de4f03bc.b1dad"
+        "50cea31f.42d1c4",
+        "35a7b03.f8d85d",
+        "21702f57.67315"
       ]
     ]
   },
   {
-    "id": "b86ed6f1.7f482",
+    "id": "50cea31f.42d1c4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.5169525146484,
-    "y": 2333.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4116.516952514648,
+    "y": 2377.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4728dd3.dc78424"
+        "295cc726.ea872"
       ]
     ]
   },
   {
-    "id": "f1a441ce.e5665",
+    "id": "35a7b03.f8d85d",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4072.5169525146484,
-    "y": 2388.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4108.516952514648,
+    "y": 2432.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "250a014d.a07c5e"
+        "2c7fef61.a7451"
       ]
     ]
   },
   {
-    "id": "de4f03bc.b1dad",
+    "id": "21702f57.67315",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4077.5169525146484,
-    "y": 2445.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4113.516952514648,
+    "y": 2489.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c4850afb.039ba"
+        "9bbdca0e.a0cf58"
       ]
     ]
   },
   {
-    "id": "c4850afb.039ba",
+    "id": "9bbdca0e.a0cf58",
     "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": 4229.516952514648,
-    "y": 2446.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4265.516952514648,
+    "y": 2490.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4728dd3.dc78424",
+    "id": "295cc726.ea872",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4224.899276733398,
-    "y": 2330.7724609375,
-    "z": "8bc654d2.f0dde",
+    "x": 4260.899276733398,
+    "y": 2375.339126586914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f5f74636.92701"
+        "723c9a0.e71c268"
       ]
     ]
   },
   {
-    "id": "b2338e3d.f752e8",
+    "id": "9a8ce081.e6446",
     "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": 3300.683334350586,
-    "y": 2670.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3336.683334350586,
+    "y": 2714.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b3bc28cb.23625",
+    "id": "c2ddeb07.7a6948",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3975.683303833008,
-    "y": 2634.1166381835938,
-    "z": "8bc654d2.f0dde",
+    "x": 4011.683303833008,
+    "y": 2678.683303833008,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5e26eb53.994624",
+    "id": "699d84d7.6602fc",
     "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": 4349.016830444336,
-    "y": 2597.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4385.016830444336,
+    "y": 2641.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1c79745.54c4b0c",
+    "id": "34b4944b.960704",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4353.016830444336,
-    "y": 2511.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4389.016830444336,
+    "y": 2555.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fe7cdeb0.daac9",
-        "34c0d4b1.5c7dfc"
+        "276189b1.3ed3ce",
+        "a978fa30.e2e848"
       ]
     ]
   },
   {
-    "id": "ee87c14f.7e00c8",
+    "id": "386bba62.16259e",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4339.302444458008,
-    "y": 2680.9384155273438,
-    "z": "8bc654d2.f0dde",
+    "x": 4375.302444458008,
+    "y": 2725.505081176758,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fc8a72d4.98e42"
+        "89559da6.e6cb3"
       ]
     ]
   },
   {
-    "id": "250a014d.a07c5e",
+    "id": "2c7fef61.a7451",
     "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": 4240.516952514648,
-    "y": 2391.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4276.516952514648,
+    "y": 2435.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fe7cdeb0.daac9",
+    "id": "276189b1.3ed3ce",
     "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": 4523.016830444336,
-    "y": 2472.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4559.016830444336,
+    "y": 2516.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "34c0d4b1.5c7dfc",
+    "id": "a978fa30.e2e848",
     "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": 4524.016830444336,
-    "y": 2577.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4560.016830444336,
+    "y": 2621.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6a8cd207.c1e8c4",
+    "id": "1a2899c1.f9127e",
     "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": 4519.016830444336,
-    "y": 2526.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4555.016830444336,
+    "y": 2570.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fc8a72d4.98e42",
+    "id": "89559da6.e6cb3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4546.133987426758,
-    "y": 2670.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4582.133987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8f4cacd5.ce6228",
-        "4e56644.a64779c",
-        "68f649.e92691b8"
+        "8f483fd3.15e2b",
+        "5a0d7606.c42ec8",
+        "f5ace162.1d1728"
       ]
     ]
   },
   {
-    "id": "8f4cacd5.ce6228",
+    "id": "8f483fd3.15e2b",
     "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": 4761.133987426758,
-    "y": 2632.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4797.133987426758,
+    "y": 2677.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4e56644.a64779c",
+    "id": "5a0d7606.c42ec8",
     "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": 4758.133987426758,
-    "y": 2671.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4794.133987426758,
+    "y": 2716.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9a6ae8ae.1adf3"
+        "be061b72.c7b818"
       ]
     ]
   },
   {
-    "id": "68f649.e92691b8",
+    "id": "f5ace162.1d1728",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4713.633987426758,
-    "y": 2713.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4749.633987426758,
+    "y": 2758.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d8d22b92.e3f9c8",
+    "id": "b11d681f.057f4",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4807.016830444336,
-    "y": 2349.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4843.016830444336,
+    "y": 2393.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8d5de697.738fb"
+        "530fa7ff.bc17d"
       ]
     ]
   },
   {
-    "id": "f5f74636.92701",
+    "id": "723c9a0.e71c268",
     "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": 4409.016830444336,
-    "y": 2345.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4445.016830444336,
+    "y": 2389.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "458de584.eb17d4"
+        "46b1f311.91a404"
       ]
     ]
   },
   {
-    "id": "458de584.eb17d4",
+    "id": "46b1f311.91a404",
     "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": 4604.016830444336,
-    "y": 2345.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4640.016830444336,
+    "y": 2389.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d8d22b92.e3f9c8",
-        "aa17b1cc.ebb808"
+        "b11d681f.057f4",
+        "6f790d02.3c377c"
       ]
     ]
   },
   {
-    "id": "aa17b1cc.ebb808",
+    "id": "6f790d02.3c377c",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4809.016830444336,
-    "y": 2422.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4845.016830444336,
+    "y": 2466.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "74ed71f8.f337d8"
+        "e6043cfa.36703"
       ]
     ]
   },
   {
-    "id": "9a6ae8ae.1adf3",
+    "id": "be061b72.c7b818",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4938.633987426758,
-    "y": 2670.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4974.633987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "48cbb65c.c75f18"
+        "ce777f2e.3171a8"
       ]
     ]
   },
   {
-    "id": "48cbb65c.c75f18",
+    "id": "ce777f2e.3171a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5096.633987426758,
-    "y": 2670.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 5132.633987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5d1f9a1.a44f9e4"
+        "b697c93d.c44198"
       ]
     ]
   },
   {
-    "id": "5d1f9a1.a44f9e4",
+    "id": "b697c93d.c44198",
     "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": 5303.633987426758,
-    "y": 2670.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 5339.633987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8d5de697.738fb",
+    "id": "530fa7ff.bc17d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4984.016830444336,
-    "y": 2341.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5020.016830444336,
+    "y": 2385.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "557f2b2a.e4488c",
-        "b7eb9cb4.7bd228"
+        "5455e2bb.51abf4",
+        "38fcf2b0.31bbc6"
       ]
     ]
   },
   {
-    "id": "b7eb9cb4.7bd228",
+    "id": "38fcf2b0.31bbc6",
     "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": 5192.016830444336,
-    "y": 2348.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5228.016830444336,
+    "y": 2392.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2cc0f80f.8e664",
-        "e33c4c36.9c6408",
-        "decf6255.02de4"
+        "46db257f.be5d5c",
+        "10ef5dcf.987c42",
+        "cdb4ea9.23d2198"
       ]
     ]
   },
   {
-    "id": "74ed71f8.f337d8",
+    "id": "e6043cfa.36703",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4986.016830444336,
-    "y": 2414.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5022.016830444336,
+    "y": 2458.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ddc00f08.8fee3"
+        "dba257b1.4bfa28"
       ]
     ]
   },
   {
-    "id": "557f2b2a.e4488c",
+    "id": "5455e2bb.51abf4",
     "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": 5222.016830444336,
-    "y": 2296.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5258.016830444336,
+    "y": 2340.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ddc00f08.8fee3",
+    "id": "dba257b1.4bfa28",
     "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": 5221.016830444336,
-    "y": 2538.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5257.016830444336,
+    "y": 2582.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "2cc0f80f.8e664",
+    "id": "46db257f.be5d5c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5402.016830444336,
-    "y": 2339.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5438.016830444336,
+    "y": 2383.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aada8b04.37bbe"
+        "40633d04.a1b504"
       ]
     ]
   },
   {
-    "id": "e33c4c36.9c6408",
+    "id": "10ef5dcf.987c42",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5394.016830444336,
-    "y": 2394.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5430.016830444336,
+    "y": 2438.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "52b0fc34.6385e4"
+        "7af2b98b.8d665"
       ]
     ]
   },
   {
-    "id": "decf6255.02de4",
+    "id": "cdb4ea9.23d2198",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5399.016830444336,
-    "y": 2451.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5435.016830444336,
+    "y": 2495.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1d0f9aee.0f2085"
+        "f683ae7d.1eb048"
       ]
     ]
   },
   {
-    "id": "1d0f9aee.0f2085",
+    "id": "f683ae7d.1eb048",
     "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": 5551.016830444336,
-    "y": 2452.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5587.016830444336,
+    "y": 2496.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "52b0fc34.6385e4",
+    "id": "7af2b98b.8d665",
     "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": 5562.016830444336,
-    "y": 2397.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5598.016830444336,
+    "y": 2441.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "aada8b04.37bbe",
+    "id": "40633d04.a1b504",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5546.399154663086,
-    "y": 2336.7724609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5582.399154663086,
+    "y": 2381.339126586914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b0a8403b.df77f8"
+        "8b20e4dc.c76628"
       ]
     ]
   },
   {
-    "id": "b0a8403b.df77f8",
+    "id": "8b20e4dc.c76628",
     "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": 5761.016830444336,
-    "y": 2333.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5797.016830444336,
+    "y": 2377.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8b07e19d.5f94",
+    "id": "c989c621.8b708",
     "type": "switchNode",
     "name": "switch secondary empty?",
     "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3274.683334350586,
-    "y": 806.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3310.683334350586,
+    "y": 850.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ba76d6d3.05fe9",
-        "fe627d30.e07a9"
+        "c25ccae3.59498",
+        "69b0287f.333378"
       ]
     ]
   },
   {
-    "id": "ba76d6d3.05fe9",
+    "id": "c25ccae3.59498",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3396.683364868164,
-    "y": 751.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 3432.683364868164,
+    "y": 795.6833648681641,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aae22e84.83191"
+        "18001e31.10fe62"
       ]
     ]
   },
   {
-    "id": "fe627d30.e07a9",
+    "id": "69b0287f.333378",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3383.683364868164,
-    "y": 860.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 3419.683364868164,
+    "y": 904.6833648681641,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "652bcf4e.b1513"
+        "643ae015.6b3ff8"
       ]
     ]
   },
   {
-    "id": "aae22e84.83191",
+    "id": "18001e31.10fe62",
     "type": "set",
     "name": "set hasSecondary false",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
     "comments": "",
-    "x": 3611.683334350586,
-    "y": 588.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3647.683334350586,
+    "y": 632.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "652bcf4e.b1513",
+    "id": "643ae015.6b3ff8",
     "type": "set",
     "name": "set hasSecondary true",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 3607.683334350586,
-    "y": 632.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3643.683334350586,
+    "y": 676.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8877dbf4.9fef7",
+    "id": "25259a32.c04fe6",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3804.683364868164,
-    "y": 3532.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 3840.683364868164,
+    "y": 3576.683364868164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8a807ecd.e2d688"
+        "e17fd7c.5d8d2a8"
       ]
     ]
   },
   {
-    "id": "8a807ecd.e2d688",
+    "id": "e17fd7c.5d8d2a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3995.683364868164,
-    "y": 3536.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 4031.683364868164,
+    "y": 3580.683364868164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "157127d1.cb4078"
+        "6f9d8ee6.40f9a8"
       ]
     ]
   },
   {
-    "id": "157127d1.cb4078",
+    "id": "6f9d8ee6.40f9a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4122.683364868164,
-    "y": 3535.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 4158.683364868164,
+    "y": 3579.683364868164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "75df7ed7.bf083",
-        "34e17ebd.74d332"
+        "5d450f44.f186c8",
+        "87679aab.884488"
       ]
     ]
   },
   {
-    "id": "34e17ebd.74d332",
+    "id": "87679aab.884488",
     "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": 4344.683364868164,
-    "y": 3424.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 4380.683364868164,
+    "y": 3468.683364868164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "877b276.88c73d8",
+    "id": "88b89d66.20648",
     "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": 3349.566665649414,
-    "y": 464,
-    "z": "8bc654d2.f0dde",
+    "x": 3385.566665649414,
+    "y": 508.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "75df7ed7.bf083",
+    "id": "5d450f44.f186c8",
     "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": 4340.566665649414,
-    "y": 3483,
-    "z": "8bc654d2.f0dde",
+    "x": 4376.566665649414,
+    "y": 3527.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "298158e5.1b02b8",
-        "8816a027.c5ad7"
+        "a8e3fac.bdef108",
+        "d683cc3e.7534e8"
       ]
     ]
   },
   {
-    "id": "298158e5.1b02b8",
+    "id": "a8e3fac.bdef108",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4550.566665649414,
-    "y": 3460,
-    "z": "8bc654d2.f0dde",
+    "x": 4586.566665649414,
+    "y": 3504.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2754d16a.8d72ae"
+        "d7e8440b.3d707"
       ]
     ]
   },
   {
-    "id": "2754d16a.8d72ae",
+    "id": "d7e8440b.3d707",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4676.566665649414,
-    "y": 3460,
-    "z": "8bc654d2.f0dde",
+    "x": 4712.566665649414,
+    "y": 3504.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1ec26074.15dbf"
+        "23eff82f.a0dc88"
       ]
     ]
   },
   {
-    "id": "7bc2899d.3cc8d",
+    "id": "a5367218.35d1e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4681.566665649414,
-    "y": 3509,
-    "z": "8bc654d2.f0dde",
+    "x": 4717.566665649414,
+    "y": 3553.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4336d7d0.b3e05",
-        "60df6ba0.591fdc",
-        "73d9646c.b91d7c",
-        "81cba3c.9ee8de"
+        "67e71008.eb1898",
+        "df5e72dc.bc108",
+        "728f0d90.8753cc",
+        "8686c784.f837e"
       ]
     ]
   },
   {
-    "id": "8816a027.c5ad7",
+    "id": "d683cc3e.7534e8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4555.566665649414,
-    "y": 3509,
-    "z": "8bc654d2.f0dde",
+    "x": 4591.566665649414,
+    "y": 3553.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7bc2899d.3cc8d"
+        "a5367218.35d1e"
       ]
     ]
   },
   {
-    "id": "1ec26074.15dbf",
+    "id": "23eff82f.a0dc88",
     "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": 5004.566665649414,
-    "y": 3457,
-    "z": "8bc654d2.f0dde",
+    "x": 5040.566665649414,
+    "y": 3501.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "4336d7d0.b3e05",
+    "id": "67e71008.eb1898",
     "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": 4957.566665649414,
-    "y": 3548,
-    "z": "8bc654d2.f0dde",
+    "x": 4993.566665649414,
+    "y": 3592.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "60df6ba0.591fdc",
+    "id": "df5e72dc.bc108",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-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/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4905.566665649414,
-    "y": 3590,
-    "z": "8bc654d2.f0dde",
+    "x": 4941.566665649414,
+    "y": 3634.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "73d9646c.b91d7c",
+    "id": "728f0d90.8753cc",
     "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": 5034.566665649414,
-    "y": 3632,
-    "z": "8bc654d2.f0dde",
+    "x": 5070.566665649414,
+    "y": 3676.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "63767aff.e83474",
+    "id": "41be2f96.b765f8",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 4920.566665649414,
-    "y": 3505,
-    "z": "8bc654d2.f0dde",
+    "x": 4956.566665649414,
+    "y": 3549.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "81cba3c.9ee8de",
+    "id": "8686c784.f837e",
     "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": 5012.566665649414,
-    "y": 3680,
-    "z": "8bc654d2.f0dde",
+    "x": 5048.566665649414,
+    "y": 3724.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "238550a0.c6cd18",
+    "id": "561c7038.198b5",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3832.566665649414,
-    "y": 3483,
-    "z": "8bc654d2.f0dde",
+    "x": 3868.566665649414,
+    "y": 3527.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "374b533b.d2c934",
+    "id": "b87e18c5.0db5e8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3807.566665649414,
-    "y": 4154,
-    "z": "8bc654d2.f0dde",
+    "x": 3843.566665649414,
+    "y": 4198.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "42d7b44a.367424"
+        "be1f4e62.15aa38"
       ]
     ]
   },
   {
-    "id": "42d7b44a.367424",
+    "id": "be1f4e62.15aa38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3999.566665649414,
-    "y": 4149,
-    "z": "8bc654d2.f0dde",
+    "x": 4035.566665649414,
+    "y": 4193.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aa122d60.47dec8"
+        "a0659afe.abed3"
       ]
     ]
   },
   {
-    "id": "aa122d60.47dec8",
+    "id": "a0659afe.abed3",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4128.566665649414,
-    "y": 4149,
-    "z": "8bc654d2.f0dde",
+    "x": 4164.566665649414,
+    "y": 4193.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bc496cc4.1ac428"
+        "aacb47f4.be072"
       ]
     ]
   },
   {
-    "id": "bc496cc4.1ac428",
+    "id": "aacb47f4.be072",
     "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": 4460.566665649414,
-    "y": 4147,
-    "z": "8bc654d2.f0dde",
+    "x": 4496.566665649414,
+    "y": 4191.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e008f489.a45f08",
+    "id": "88b90ca8.e250c",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3795.566665649414,
-    "y": 4378,
-    "z": "8bc654d2.f0dde",
+    "x": 3831.566665649414,
+    "y": 4422.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7e1de7f3.95bcb"
+        "d69507e0.d93c6"
       ]
     ]
   },
   {
-    "id": "7e1de7f3.95bcb",
+    "id": "d69507e0.d93c6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3975.566665649414,
-    "y": 4377,
-    "z": "8bc654d2.f0dde",
+    "x": 4011.566665649414,
+    "y": 4421.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5cd7b855.2a4ef"
+        "280736a4.7aa0f2"
       ]
     ]
   },
   {
-    "id": "5cd7b855.2a4ef",
+    "id": "280736a4.7aa0f2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4104.566665649414,
-    "y": 4377,
-    "z": "8bc654d2.f0dde",
+    "x": 4140.566665649414,
+    "y": 4421.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e3d19dba.c0bd7"
+        "ff5dea73.98b998"
       ]
     ]
   },
   {
-    "id": "e3d19dba.c0bd7",
+    "id": "ff5dea73.98b998",
     "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": 4322.449966430664,
-    "y": 4375.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 4358.449966430664,
+    "y": 4420.449966430664,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "53c7d161.8eb9"
+        "860e2e4b.61a0d8"
       ]
     ]
   },
   {
-    "id": "53c7d161.8eb9",
+    "id": "860e2e4b.61a0d8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4537.449966430664,
-    "y": 4375.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 4573.449966430664,
+    "y": 4420.449966430664,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fbe01cc.5b1afe"
+        "3ff2617b.840e76"
       ]
     ]
   },
   {
-    "id": "fbe01cc.5b1afe",
+    "id": "3ff2617b.840e76",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4669.449966430664,
-    "y": 4375.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 4705.449966430664,
+    "y": 4420.449966430664,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2bf4a87a.e670f8"
+        "96149cb2.d633c"
       ]
     ]
   },
   {
-    "id": "2bf4a87a.e670f8",
+    "id": "96149cb2.d633c",
     "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": 5033.566665649414,
-    "y": 4375,
-    "z": "8bc654d2.f0dde",
+    "x": 5069.566665649414,
+    "y": 4419.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e2222c.7b917dd",
+    "id": "f0668881.7d6d6",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3470.566665649414,
-    "y": 4633,
-    "z": "8bc654d2.f0dde",
+    "x": 3506.566665649414,
+    "y": 4677.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "99a3a0e8.0b0e08"
+        "2492336a.68b20c"
       ]
     ]
   },
   {
-    "id": "99a3a0e8.0b0e08",
+    "id": "2492336a.68b20c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3650.566665649414,
-    "y": 4632,
-    "z": "8bc654d2.f0dde",
+    "x": 3686.566665649414,
+    "y": 4676.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "34a5a7ab.8782f"
+        "f54b8794.2acdd"
       ]
     ]
   },
   {
-    "id": "34a5a7ab.8782f",
+    "id": "f54b8794.2acdd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3779.566665649414,
-    "y": 4632,
-    "z": "8bc654d2.f0dde",
+    "x": 3815.566665649414,
+    "y": 4676.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "41dd40eb.c66e7"
+        "c3a4f53e.304d78"
       ]
     ]
   },
   {
-    "id": "1e73a5a2.1f85da",
+    "id": "84f57def.b063a",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3515.566665649414,
-    "y": 4691,
-    "z": "8bc654d2.f0dde",
+    "x": 3551.566665649414,
+    "y": 4735.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d18a7342.6feac8",
+    "id": "cebbd661.72d4b8",
     "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": 4081.566665649414,
-    "y": 4790,
-    "z": "8bc654d2.f0dde",
+    "x": 4117.566665649414,
+    "y": 4834.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "41dd40eb.c66e7",
+    "id": "c3a4f53e.304d78",
     "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": 3545.566665649414,
-    "y": 4724,
-    "z": "8bc654d2.f0dde",
+    "x": 3581.566665649414,
+    "y": 4768.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f4cc70f5.9b6bc",
-        "ce8af9cd.332b9",
-        "130dfbc3.4a6c5c"
+        "9d76d7ba.037948",
+        "c6779daf.7d7a8",
+        "62f3b274.175fb4"
       ]
     ]
   },
   {
-    "id": "ce8af9cd.332b9",
+    "id": "c6779daf.7d7a8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3727.057632446289,
-    "y": 4701.57421875,
-    "z": "8bc654d2.f0dde",
+    "x": 3763.057632446289,
+    "y": 4746.140884399414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3c80b807.6a4d88"
+        "168b9f85.394368"
       ]
     ]
   },
   {
-    "id": "130dfbc3.4a6c5c",
+    "id": "62f3b274.175fb4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3715.566665649414,
-    "y": 4741,
-    "z": "8bc654d2.f0dde",
+    "x": 3751.566665649414,
+    "y": 4785.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c80f59b7.c8277"
+        "6d9d5aec.85fd34"
       ]
     ]
   },
   {
-    "id": "3c80b807.6a4d88",
+    "id": "168b9f85.394368",
     "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": 3886.629165649414,
-    "y": 4699.85986328125,
-    "z": "8bc654d2.f0dde",
+    "x": 3922.629165649414,
+    "y": 4744.426528930664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c80f59b7.c8277",
+    "id": "6d9d5aec.85fd34",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3876.566665649414,
-    "y": 4742,
-    "z": "8bc654d2.f0dde",
+    "x": 3912.566665649414,
+    "y": 4786.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "96ee8bec.e5c4a8",
+    "id": "1514bf18.105d59",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3878.566665649414,
-    "y": 4786,
-    "z": "8bc654d2.f0dde",
+    "x": 3914.566665649414,
+    "y": 4830.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "60b9b66c.eef658",
-        "d18a7342.6feac8"
+        "16719b54.ca935d",
+        "cebbd661.72d4b8"
       ]
     ]
   },
   {
-    "id": "f4cc70f5.9b6bc",
+    "id": "9d76d7ba.037948",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3720.566665649414,
-    "y": 4778,
-    "z": "8bc654d2.f0dde",
+    "x": 3756.566665649414,
+    "y": 4822.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "96ee8bec.e5c4a8"
+        "1514bf18.105d59"
       ]
     ]
   },
   {
-    "id": "60b9b66c.eef658",
+    "id": "16719b54.ca935d",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4039.566665649414,
-    "y": 4718,
-    "z": "8bc654d2.f0dde",
+    "x": 4075.566665649414,
+    "y": 4762.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "eedd5a70.956fd8",
+    "id": "993866bb.1b2058",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4405.566665649414,
-    "y": 5286,
-    "z": "8bc654d2.f0dde",
+    "x": 4441.566665649414,
+    "y": 5330.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "76d94500.85b34c",
+    "id": "f715ac9f.9b32b8",
     "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": 4560.566665649414,
-    "y": 5327,
-    "z": "8bc654d2.f0dde",
+    "x": 4596.566665649414,
+    "y": 5371.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "5f94b51d.236064",
+    "id": "c2d27f90.576768",
     "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": 5003.566665649414,
-    "y": 5375,
-    "z": "8bc654d2.f0dde",
+    "x": 5039.566665649414,
+    "y": 5419.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "66bf889f.a4f118",
+    "id": "79d51ab0.5a125c",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4376.566665649414,
-    "y": 5385,
-    "z": "8bc654d2.f0dde",
+    "x": 4412.566665649414,
+    "y": 5429.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b509f4ce.23c808",
-        "425be1a9.ccccd8"
+        "fbb7e2aa.d5f0a8",
+        "7443db3b.00f94c"
       ]
     ]
   },
   {
-    "id": "b509f4ce.23c808",
+    "id": "fbb7e2aa.d5f0a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4612.566665649414,
-    "y": 5369,
-    "z": "8bc654d2.f0dde",
+    "x": 4648.566665649414,
+    "y": 5413.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1cce9d9d.44252a"
+        "2a6159e8.abaf0e"
       ]
     ]
   },
   {
-    "id": "1cce9d9d.44252a",
+    "id": "2a6159e8.abaf0e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4756.566665649414,
-    "y": 5371,
-    "z": "8bc654d2.f0dde",
+    "x": 4792.566665649414,
+    "y": 5415.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5f94b51d.236064",
-        "efe8a2f7.303938",
-        "b992a481.10f3f"
+        "c2d27f90.576768",
+        "5c6afd36.faf1f4",
+        "86183466.e0956"
       ]
     ]
   },
   {
-    "id": "425be1a9.ccccd8",
+    "id": "7443db3b.00f94c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4611.566665649414,
-    "y": 5417,
-    "z": "8bc654d2.f0dde",
+    "x": 4647.566665649414,
+    "y": 5461.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "efe8a2f7.303938",
+    "id": "5c6afd36.faf1f4",
     "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": 5124.566665649414,
-    "y": 5422,
-    "z": "8bc654d2.f0dde",
+    "x": 5160.566665649414,
+    "y": 5466.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b992a481.10f3f",
+    "id": "86183466.e0956",
     "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": 5006.233657836914,
-    "y": 5507.08349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5042.233657836914,
+    "y": 5551.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "3dbfccd3.2b6904",
+    "id": "85909b06.96d1d8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5007.450454711914,
-    "y": 5465.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5043.450454711914,
+    "y": 5510.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c4e3627c.f5b198",
+    "id": "d5d61aed.e9642",
     "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": 5538.566665649414,
-    "y": 5854,
-    "z": "8bc654d2.f0dde",
+    "x": 5574.566665649414,
+    "y": 5898.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "316a2790.87ce5",
+    "id": "cfe4284f.245dc",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4911.566665649414,
-    "y": 5864,
-    "z": "8bc654d2.f0dde",
+    "x": 4947.566665649414,
+    "y": 5908.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2b91cb0d.4b878c",
-        "b9e860d6.0863a"
+        "67276eef.04fd3",
+        "9ce9471a.def67"
       ]
     ]
   },
   {
-    "id": "2b91cb0d.4b878c",
+    "id": "67276eef.04fd3",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5144.566665649414,
-    "y": 5858,
-    "z": "8bc654d2.f0dde",
+    "x": 5180.566665649414,
+    "y": 5902.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "617327bf.d18368"
+        "7fd061d3.3dea5"
       ]
     ]
   },
   {
-    "id": "617327bf.d18368",
+    "id": "7fd061d3.3dea5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5291.566665649414,
-    "y": 5866,
-    "z": "8bc654d2.f0dde",
+    "x": 5327.566665649414,
+    "y": 5910.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c4e3627c.f5b198",
-        "7767e038.8b5bf",
-        "5189b1c7.a8726"
+        "d5d61aed.e9642",
+        "f7e19ea0.d5ede",
+        "ccb01b06.92e6a8"
       ]
     ]
   },
   {
-    "id": "b9e860d6.0863a",
+    "id": "9ce9471a.def67",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5145.566665649414,
-    "y": 5908,
-    "z": "8bc654d2.f0dde",
+    "x": 5181.566665649414,
+    "y": 5952.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "7767e038.8b5bf",
+    "id": "f7e19ea0.d5ede",
     "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": 5659.566665649414,
-    "y": 5901,
-    "z": "8bc654d2.f0dde",
+    "x": 5695.566665649414,
+    "y": 5945.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "5189b1c7.a8726",
+    "id": "ccb01b06.92e6a8",
     "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": 5541.233657836914,
-    "y": 5986.08349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5577.233657836914,
+    "y": 6030.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "be3f8000.1758f8",
+    "id": "e15ccbfd.b5904",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5542.450454711914,
-    "y": 5944.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5578.450454711914,
+    "y": 5989.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5021b590.5d75e4",
+    "id": "986cd5c9.02e9d",
     "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": 5072.566665649414,
-    "y": 5814,
-    "z": "8bc654d2.f0dde",
+    "x": 5108.566665649414,
+    "y": 5858.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "92959871.fa0e08",
+    "id": "b4899b08.51e5b",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4906.566665649414,
-    "y": 5775,
-    "z": "8bc654d2.f0dde",
+    "x": 4942.566665649414,
+    "y": 5819.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "899de386.880988",
+    "id": "c617e6ee.8b983",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3233.816665649414,
-    "y": 6384.25,
-    "z": "8bc654d2.f0dde",
+    "x": 3269.816665649414,
+    "y": 6428.816665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1f7a42c6.29cf15",
-        "5608d8df.18871"
+        "9cb4bafc.51db",
+        "31675b48.f480a4"
       ]
     ]
   },
   {
-    "id": "1f7a42c6.29cf15",
+    "id": "9cb4bafc.51db",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3424.816665649414,
-    "y": 6388.25,
-    "z": "8bc654d2.f0dde",
+    "x": 3460.816665649414,
+    "y": 6432.816665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d6990f3f.a131a8"
+        "4d6a56c7.6a325"
       ]
     ]
   },
   {
-    "id": "d6990f3f.a131a8",
+    "id": "4d6a56c7.6a325",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3551.816665649414,
-    "y": 6387.25,
-    "z": "8bc654d2.f0dde",
+    "x": 3587.816665649414,
+    "y": 6431.816665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1cb779c6.3641ce"
+        "c5539a8b.106aa"
       ]
     ]
   },
   {
-    "id": "5608d8df.18871",
+    "id": "31675b48.f480a4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3420.816665649414,
-    "y": 6458.25,
-    "z": "8bc654d2.f0dde",
+    "x": 3456.816665649414,
+    "y": 6502.816665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9d5d9d30.3fbe28"
+        "8a9f9d03.ba9c7"
       ]
     ]
   },
   {
-    "id": "60292317.f03774",
+    "id": "9f506842.a5d348",
     "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": 3970.316665649414,
-    "y": 6457.33349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 4006.316665649414,
+    "y": 6501.900161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d5d9d30.3fbe28",
+    "id": "8a9f9d03.ba9c7",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3554.316665649414,
-    "y": 6460.33349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 3590.316665649414,
+    "y": 6504.900161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "60292317.f03774"
+        "9f506842.a5d348"
       ]
     ]
   }