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=d0f35f91930ec4fee00c0a5b600d03f49508b835;hpb=dfd2ca0b01409de98d89b36abdc82bd08cf474ca;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 d0f35f91..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": "401457dc.d91b78",
+    "id": "77a1d01c.aa0f88",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 112,
-    "y": 81,
-    "z": "211aaefb.d906ea",
+    "x": 168.56666564941406,
+    "y": 174.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a013fef2.6f2958"
+        "1e3c1648.671ee2"
       ]
     ]
   },
   {
-    "id": "a013fef2.6f2958",
+    "id": "1e3c1648.671ee2",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,5633 +22,7887 @@
     "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": 396.2856903076172,
-    "y": 142.23810863494873,
-    "z": "211aaefb.d906ea",
+    "x": 452.85235595703125,
+    "y": 235.8047742843628,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6ff7b54f.12fd9c"
+        "cf91a24a.cfe63"
       ]
     ]
   },
   {
-    "id": "6ff7b54f.12fd9c",
+    "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": 402.42860412597656,
-    "y": 227.00003051757812,
-    "z": "211aaefb.d906ea",
+    "x": 458.9952697753906,
+    "y": 320.5666961669922,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "515432f3.743c34"
+        "8dc5a038.179a08"
       ]
     ]
   },
   {
-    "id": "515432f3.743c34",
+    "id": "8dc5a038.179a08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 752,
-    "y": 286,
-    "z": "211aaefb.d906ea",
+    "x": 808.5666656494141,
+    "y": 379.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dd15978c.a7e49",
-        "818743.6c6790c",
-        "ecb6f865.396d18"
+        "9b12be39.ac6768",
+        "27bb57a4.5f987",
+        "2a2da752.b59748"
       ]
     ]
   },
   {
-    "id": "dd15978c.a7e49",
+    "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": 1053.33349609375,
-    "y": 556.9302978515625,
-    "z": "211aaefb.d906ea",
+    "x": 1109.900161743164,
+    "y": 650.4969635009766,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "818743.6c6790c",
+    "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": 1074.761962890625,
-    "y": 259.33331298828125,
-    "z": "211aaefb.d906ea",
+    "x": 1131.328628540039,
+    "y": 352.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5ecdc66f.f6a9f8",
-        "a5115d.53bf7ea",
-        "6a040cf4.34a5f4"
+        "6a4d10dc.68d4a",
+        "5691a128.aafbf8",
+        "5af1bedf.a7a338"
       ]
     ]
   },
   {
-    "id": "5ecdc66f.f6a9f8",
+    "id": "6a4d10dc.68d4a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1299.761962890625,
-    "y": 117.33331298828125,
-    "z": "211aaefb.d906ea",
+    "x": 1356.328628540039,
+    "y": 210.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "79d6f337.acb234"
+        "80bca2fd.976568"
       ]
     ]
   },
   {
-    "id": "a5115d.53bf7ea",
+    "id": "5691a128.aafbf8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1295.2529296875,
-    "y": 186.9073486328125,
-    "z": "211aaefb.d906ea",
+    "x": 1351.819595336914,
+    "y": 280.47401428222656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5f1113a0.08e40c"
+        "7f99fec5.4581e"
       ]
     ]
   },
   {
-    "id": "6a040cf4.34a5f4",
+    "id": "5af1bedf.a7a338",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1283.761962890625,
-    "y": 233.33331298828125,
-    "z": "211aaefb.d906ea",
+    "x": 1340.328628540039,
+    "y": 326.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "90f3a407.501d38"
+        "811c97ff.d24ba8"
       ]
     ]
   },
   {
-    "id": "de3b14d3.6ada2",
+    "id": "1663aedd.7a50f9",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1053.761962890625,
-    "y": 147.33331298828125,
-    "z": "211aaefb.d906ea",
+    "x": 1110.328628540039,
+    "y": 240.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ecb6f865.396d18",
+    "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": 1041.761962890625,
-    "y": 199.33331298828125,
-    "z": "211aaefb.d906ea",
+    "x": 1098.328628540039,
+    "y": 292.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "79d6f337.acb234",
+    "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": 1540,
-    "y": 114,
-    "z": "211aaefb.d906ea",
+    "x": 1596.566665649414,
+    "y": 207.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "43c20e21.f32cd8",
-        "28c5af7a.923d38"
+        "9eedb337.58df9",
+        "1db64f77.692391"
       ]
     ]
   },
   {
-    "id": "5f1113a0.08e40c",
+    "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": 1450.0623779296875,
-    "y": 189.85977172851562,
-    "z": "211aaefb.d906ea",
+    "x": 1506.6290435791016,
+    "y": 283.4264373779297,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "90f3a407.501d38",
+    "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": 1454,
-    "y": 234,
-    "z": "211aaefb.d906ea",
+    "x": 1510.566665649414,
+    "y": 327.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "43c20e21.f32cd8",
+    "id": "9eedb337.58df9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1745,
-    "y": 151,
-    "z": "211aaefb.d906ea",
+    "x": 1801.566665649414,
+    "y": 244.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "80d61dda.518fc"
+        "e3d32c54.b9a328"
       ]
     ]
   },
   {
-    "id": "28c5af7a.923d38",
+    "id": "1db64f77.692391",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1755,
-    "y": 78,
-    "z": "211aaefb.d906ea",
+    "x": 1811.566665649414,
+    "y": 171.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "80d61dda.518fc",
+    "id": "e3d32c54.b9a328",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1738,
-    "y": 226,
-    "z": "211aaefb.d906ea",
+    "x": 1794.566665649414,
+    "y": 319.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "28653cf0.44562c",
-        "75a68f8a.78ad9",
-        "3bc8660b.b8496a",
-        "1213b45b.844d1c",
-        "2c9dde75.d2cff2"
+        "bb266e42.d64ce8",
+        "33816966.623666",
+        "6367b887.741ef",
+        "a5dc6d6.f390b9",
+        "c617e6ee.8b983"
       ]
     ]
   },
   {
-    "id": "98945bed.eff0a8",
+    "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": 2224,
-    "y": 277,
-    "z": "211aaefb.d906ea",
+    "x": 2280.566665649414,
+    "y": 370.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2960f1eb.c720a6",
-        "872a9fc7.c0cff",
-        "8c06b22e.eee49"
+        "b15d3419.e56af8",
+        "8179030d.1dc9b8",
+        "c175e9c7.17a5f8"
       ]
     ]
   },
   {
-    "id": "2960f1eb.c720a6",
+    "id": "b15d3419.e56af8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2440,
-    "y": 344,
-    "z": "211aaefb.d906ea",
+    "x": 2496.566665649414,
+    "y": 437.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c7e960b7.dc23f"
+        "e4dfd7bc.ebf1f8"
       ]
     ]
   },
   {
-    "id": "872a9fc7.c0cff",
+    "id": "8179030d.1dc9b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2440.490966796875,
-    "y": 243.573974609375,
-    "z": "211aaefb.d906ea",
+    "x": 2497.057632446289,
+    "y": 337.14064025878906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6cf8dc3d.cca5ac"
+        "a4be790d.e1feb"
       ]
     ]
   },
   {
-    "id": "8c06b22e.eee49",
+    "id": "c175e9c7.17a5f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2436,
-    "y": 293,
-    "z": "211aaefb.d906ea",
+    "x": 2492.566665649414,
+    "y": 386.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9afdf1e0.0463b"
+        "7226e4d.271f21c"
       ]
     ]
   },
   {
-    "id": "28653cf0.44562c",
+    "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": 1941,
-    "y": 258,
-    "z": "211aaefb.d906ea",
+    "x": 1997.566665649414,
+    "y": 351.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b0c3b925.5a198",
-        "98945bed.eff0a8",
-        "59db3330.69645c",
-        "4ebbcee7.69b52"
+        "a610825f.3baab8",
+        "410f1f1c.a0bc8",
+        "5b668059.1f482",
+        "989a0e11.127538"
       ]
     ]
   },
   {
-    "id": "b0c3b925.5a198",
+    "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": 2221,
-    "y": 196,
-    "z": "211aaefb.d906ea",
+    "x": 2277.566665649414,
+    "y": 289.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1213b45b.844d1c",
+    "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": 1915,
-    "y": 208,
-    "z": "211aaefb.d906ea",
+    "x": 1971.566665649414,
+    "y": 301.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "75a68f8a.78ad9",
+    "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/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1958,
-    "y": 67,
-    "z": "211aaefb.d906ea",
+    "x": 2014.566665649414,
+    "y": 160.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "3bc8660b.b8496a",
+    "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/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
+    "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": 1970,
-    "y": 108,
-    "z": "211aaefb.d906ea",
+    "x": 2026.566665649414,
+    "y": 201.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "886bedb4.af1a3",
+    "id": "bc72be6f.8dc5b",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 1995,
-    "y": 20,
-    "z": "211aaefb.d906ea",
+    "x": 2051.566665649414,
+    "y": 113.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1506b37b.81c545",
+    "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": 1915,
-    "y": 154,
-    "z": "211aaefb.d906ea",
+    "x": 1971.566665649414,
+    "y": 247.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6cf8dc3d.cca5ac",
+    "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": 2619,
-    "y": 246,
-    "z": "211aaefb.d906ea",
+    "x": 2675.566665649414,
+    "y": 339.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9afdf1e0.0463b",
+    "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": 2618.9375,
-    "y": 295.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 2675.504165649414,
+    "y": 388.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c7e960b7.dc23f",
+    "id": "e4dfd7bc.ebf1f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2620.9375,
-    "y": 346.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 2677.504165649414,
+    "y": 439.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "39c57327.b8862c"
+        "4971434.1d7e03c"
       ]
     ]
   },
   {
-    "id": "39c57327.b8862c",
+    "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": 2913.9375,
-    "y": 293.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 2970.504165649414,
+    "y": 386.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3bec086a.17141",
-        "202b395f.8fc9be",
-        "205a58b1.00a5c"
+        "24e6d7c1.5d2048",
+        "3ed3e5cb.f1266a",
+        "c01f466a.2c59b8"
       ]
     ]
   },
   {
-    "id": "202b395f.8fc9be",
+    "id": "3ed3e5cb.f1266a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3187.428466796875,
-    "y": 185.7142333984375,
-    "z": "211aaefb.d906ea",
+    "x": 3273.995101928711,
+    "y": 119.28089904785156,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "113df3fa.92a3d4"
+        "23469507.c7cb02"
       ]
     ]
   },
   {
-    "id": "113df3fa.92a3d4",
+    "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": 3365,
-    "y": 186,
-    "z": "211aaefb.d906ea",
+    "x": 3451.566635131836,
+    "y": 119.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "205a58b1.00a5c",
+    "id": "c01f466a.2c59b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3182.9375,
-    "y": 235.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 3269.504135131836,
+    "y": 168.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "158df1dd.6f3716"
+        "196361cf.857fbe"
       ]
     ]
   },
   {
-    "id": "158df1dd.6f3716",
+    "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": 3364.9375,
-    "y": 235.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 3451.504135131836,
+    "y": 168.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3bec086a.17141",
+    "id": "24e6d7c1.5d2048",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3186.9375,
-    "y": 286.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 3273.504135131836,
+    "y": 219.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b7f25fb9.397e68"
+        "51b732b0.20c4ec"
       ]
     ]
   },
   {
-    "id": "b7f25fb9.397e68",
+    "id": "51b732b0.20c4ec",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3366.9375,
-    "y": 286.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 3453.504135131836,
+    "y": 219.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b5f441a1.12264"
+        "b7af5f8.780582"
       ]
     ]
   },
   {
-    "id": "b5f441a1.12264",
+    "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": 2933,
-    "y": 421,
-    "z": "211aaefb.d906ea",
+    "x": 2989.566665649414,
+    "y": 514.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8b1d1a2b.bf0fd8",
-        "1b31225e.143a7e"
+        "73dd535b.21de04",
+        "941bba5e.9658d"
       ]
     ]
   },
   {
-    "id": "1b31225e.143a7e",
+    "id": "941bba5e.9658d",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3243,
-    "y": 428,
-    "z": "211aaefb.d906ea",
+    "x": 3329.566635131836,
+    "y": 361.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8b1d1a2b.bf0fd8",
+    "id": "73dd535b.21de04",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3242,
-    "y": 482,
-    "z": "211aaefb.d906ea",
+    "x": 3328.566635131836,
+    "y": 415.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f82eb181.80b6b8"
+        "33242734.b6ef48"
       ]
     ]
   },
   {
-    "id": "a23264d4.676238",
+    "id": "8e081bd8.979208",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3987,
-    "y": 436,
-    "z": "211aaefb.d906ea",
+    "x": 4073.566635131836,
+    "y": 369.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ff9fd818.342fc"
+        "ce0fbf14.8d016"
       ]
     ]
   },
   {
-    "id": "ff9fd818.342fc",
+    "id": "ce0fbf14.8d016",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4163.9998779296875,
-    "y": 428.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 4250.566513061523,
+    "y": 362.56654357910156,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "792ffad7.7e059c",
-        "f4f213f7.1f09b"
+        "1a44842.2180c7c",
+        "958a84e8.9fbc48"
       ]
     ]
   },
   {
-    "id": "f82eb181.80b6b8",
+    "id": "33242734.b6ef48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3406,
-    "y": 408,
-    "z": "211aaefb.d906ea",
+    "x": 3492.566635131836,
+    "y": 341.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ecdd8960.6c28f",
-        "89ab1181.5cfe68"
+        "afaee3e0.e6df98",
+        "db5b85f.aeb77f8"
       ]
     ]
   },
   {
-    "id": "ecdd8960.6c28f",
+    "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": 3687,
-    "y": 364,
-    "z": "211aaefb.d906ea",
+    "x": 3773.566635131836,
+    "y": 297.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b496725b.6310f"
+        "c2880ab0.c73eb"
       ]
     ]
   },
   {
-    "id": "b496725b.6310f",
+    "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": 3949,
-    "y": 364,
-    "z": "211aaefb.d906ea",
+    "x": 4035.566635131836,
+    "y": 297.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a23264d4.676238"
+        "8e081bd8.979208"
       ]
     ]
   },
   {
-    "id": "792ffad7.7e059c",
+    "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": 4406.9998779296875,
-    "y": 385.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 4493.566513061523,
+    "y": 319.56654357910156,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f4f213f7.1f09b",
+    "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": 4395.9998779296875,
-    "y": 440.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 4482.566513061523,
+    "y": 374.56654357910156,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "738543a5.e85744",
-        "13a5e063.163af8",
-        "e90bc7b5.1f09c"
+        "4710cc76.36ad1c",
+        "efa019b.ed98a68",
+        "b08c41e4.127bd8"
       ]
     ]
   },
   {
-    "id": "e90bc7b5.1f09c",
+    "id": "b08c41e4.127bd8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4649,
-    "y": 327,
-    "z": "211aaefb.d906ea",
+    "x": 4733.566879272461,
+    "y": 315.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5d8fd93.58407a8"
+        "7eb7952c.f46d84"
       ]
     ]
   },
   {
-    "id": "5d8fd93.58407a8",
+    "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": 4797.571533203125,
-    "y": 327.2857666015625,
-    "z": "211aaefb.d906ea",
+    "x": 4882.138412475586,
+    "y": 315.85243225097656,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "53518ce7.6d697c",
+    "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": 4796.509033203125,
-    "y": 371.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 4881.075912475586,
+    "y": 359.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "13a5e063.163af8",
+    "id": "efa019b.ed98a68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4637.509033203125,
-    "y": 371.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 4722.075912475586,
+    "y": 359.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "53518ce7.6d697c"
+        "dd0313dc.1a2988"
       ]
     ]
   },
   {
-    "id": "738543a5.e85744",
+    "id": "4710cc76.36ad1c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4644.509033203125,
-    "y": 450.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 4729.075912475586,
+    "y": 438.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "937d3d5d.26f97"
+        "fbbb1a1a.e2c5b8"
       ]
     ]
   },
   {
-    "id": "937d3d5d.26f97",
+    "id": "fbbb1a1a.e2c5b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4783.509033203125,
-    "y": 450.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 4868.075912475586,
+    "y": 438.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "72f3c760.2ca228",
-        "8ec14dfe.92b848"
+        "7a803641.fde268",
+        "6a2b20cd.32701"
       ]
     ]
   },
   {
-    "id": "72f3c760.2ca228",
+    "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": 4989,
-    "y": 448,
-    "z": "211aaefb.d906ea",
+    "x": 5073.566879272461,
+    "y": 436.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8ec14dfe.92b848",
+    "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": 4988,
-    "y": 494,
-    "z": "211aaefb.d906ea",
+    "x": 5072.566879272461,
+    "y": 482.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "89ab1181.5cfe68",
+    "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": 3504,
-    "y": 480,
-    "z": "211aaefb.d906ea",
+    "x": 3590.566635131836,
+    "y": 413.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f7fb6622.9ee6a8"
+        "3d651743.57b188"
       ]
     ]
   },
   {
-    "id": "f7fb6622.9ee6a8",
+    "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": 3784,
-    "y": 480,
-    "z": "211aaefb.d906ea",
+    "x": 3870.566635131836,
+    "y": 413.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ae35e793.89faa8"
+        "823d6ddb.3083e8"
       ]
     ]
   },
   {
-    "id": "ae35e793.89faa8",
+    "id": "823d6ddb.3083e8",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2197.0001220703125,
-    "y": 733.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 2253.5667877197266,
+    "y": 826.5667877197266,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c9798d0a.ecd3b"
+        "a4f7cdf6.5208e8"
       ]
     ]
   },
   {
-    "id": "c9798d0a.ecd3b",
+    "id": "a4f7cdf6.5208e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2374,
-    "y": 726,
-    "z": "211aaefb.d906ea",
+    "x": 2430.566665649414,
+    "y": 819.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c196b024.7ddda8",
-        "7125c66b.59e98"
+        "eb8d4808.206a1",
+        "4f79166b.81752"
       ]
     ]
   },
   {
-    "id": "c196b024.7ddda8",
+    "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": 2617,
-    "y": 683,
-    "z": "211aaefb.d906ea",
+    "x": 2673.566665649414,
+    "y": 776.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7125c66b.59e98",
+    "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": 2606,
-    "y": 738,
-    "z": "211aaefb.d906ea",
+    "x": 2662.566665649414,
+    "y": 831.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9959c5db.04ddc8",
-        "5c37ab7d.23ef4c",
-        "360651b5.116166"
+        "62989b79.9cfe9c",
+        "1988a7a4.ff123",
+        "85413e7a.b1b628"
       ]
     ]
   },
   {
-    "id": "9959c5db.04ddc8",
+    "id": "62989b79.9cfe9c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2897.490966796875,
-    "y": 716.573974609375,
-    "z": "211aaefb.d906ea",
+    "x": 2954.057632446289,
+    "y": 810.1406402587891,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "95b8ba37.0aee2"
+        "f822b8e9.269d"
       ]
     ]
   },
   {
-    "id": "5c37ab7d.23ef4c",
+    "id": "1988a7a4.ff123",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2886,
-    "y": 761,
-    "z": "211aaefb.d906ea",
+    "x": 2942.566665649414,
+    "y": 854.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f8728a74.d6db68"
+        "b1dab01.deaad5"
       ]
     ]
   },
   {
-    "id": "95b8ba37.0aee2",
+    "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": 3046.0625,
-    "y": 716.8597412109375,
-    "z": "211aaefb.d906ea",
+    "x": 3102.629165649414,
+    "y": 810.4264068603516,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f8728a74.d6db68",
+    "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": 3045,
-    "y": 761,
-    "z": "211aaefb.d906ea",
+    "x": 3101.566665649414,
+    "y": 854.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "360651b5.116166",
+    "id": "85413e7a.b1b628",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2893,
-    "y": 840,
-    "z": "211aaefb.d906ea",
+    "x": 2949.566665649414,
+    "y": 933.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7326b1f2.1f515"
+        "fb178b5b.3c4ae8"
       ]
     ]
   },
   {
-    "id": "7326b1f2.1f515",
+    "id": "fb178b5b.3c4ae8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3032,
-    "y": 840,
-    "z": "211aaefb.d906ea",
+    "x": 3088.566665649414,
+    "y": 933.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "defc50da.4e3908",
-        "b7df8e67.09b008",
-        "8bf3b76.abce348",
-        "25a0f8e1.052e18",
-        "b381c251.6b96c",
-        "89e7916b.fb9e18",
-        "5511f093.c411d8",
-        "d2628754.9207b8",
-        "6481b806.b26798",
-        "20bb7eae.be3a32",
-        "9fcb0922.e08ed",
-        "3db2acf8.6fe83c",
-        "d8a34ec.a6346b",
-        "2783e99.3726216"
+        "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": "57e34af8.6ff4e4",
+    "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": 3346,
-    "y": 646,
-    "z": "211aaefb.d906ea",
+    "x": 3437.566665649414,
+    "y": 467.56663513183594,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "defc50da.4e3908",
+    "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": 3327,
-    "y": 696,
-    "z": "211aaefb.d906ea",
+    "x": 3418.566604614258,
+    "y": 546.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "2783e99.3726216",
+    "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": 3284,
-    "y": 741,
-    "z": "211aaefb.d906ea",
+    "x": 3375.566604614258,
+    "y": 591.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b7df8e67.09b008",
+    "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": 3259,
-    "y": 804,
-    "z": "211aaefb.d906ea",
+    "x": 3340.566635131836,
+    "y": 645.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8bf3b76.abce348",
+    "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": 3260,
-    "y": 859,
-    "z": "211aaefb.d906ea",
+    "x": 3341.566635131836,
+    "y": 700.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "25a0f8e1.052e18",
+    "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": 3276,
-    "y": 907,
-    "z": "211aaefb.d906ea",
+    "x": 3339.566635131836,
+    "y": 964.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bd8c7e03.e7323",
-        "d55fdbac.2e4bb8",
-        "1bd38601.f7d742"
+        "bc9dba3e.42915",
+        "4ccb40e3.75eb",
+        "6e77d52e.d49a5c"
       ]
     ]
   },
   {
-    "id": "b381c251.6b96c",
+    "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": 3265,
-    "y": 993.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3334.566635131836,
+    "y": 1025.5665130615234,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1da7e0f.b56889f",
-        "484d133e.c5022c",
-        "511cb1cb.4e0758"
+        "ddf0ef9b.af495",
+        "d012a2e6.7e886",
+        "c732ba74.e6ac38"
       ]
     ]
   },
   {
-    "id": "bd8c7e03.e7323",
+    "id": "bc9dba3e.42915",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3477,
-    "y": 791,
-    "z": "211aaefb.d906ea",
+    "x": 3650.566635131836,
+    "y": 735.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2e4151be.e64316"
+        "d26a86c.70f36f8"
       ]
     ]
   },
   {
-    "id": "d55fdbac.2e4bb8",
+    "id": "4ccb40e3.75eb",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3472.509033203125,
-    "y": 840.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 3646.075668334961,
+    "y": 784.9926605224609,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "13e83f49.acd859"
+        "3592fdd4.1e4502"
       ]
     ]
   },
   {
-    "id": "1bd38601.f7d742",
+    "id": "6e77d52e.d49a5c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3476.509033203125,
-    "y": 893.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 3650.075668334961,
+    "y": 837.9926605224609,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bbf6b192.5183e"
+        "f6681e1c.b1626"
       ]
     ]
   },
   {
-    "id": "2e4151be.e64316",
+    "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": 3625.571533203125,
-    "y": 790.2857666015625,
-    "z": "211aaefb.d906ea",
+    "x": 3799.138168334961,
+    "y": 734.8524017333984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "13e83f49.acd859",
+    "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": 3615.509033203125,
-    "y": 840.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 3789.075668334961,
+    "y": 784.9926605224609,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1da7e0f.b56889f",
+    "id": "ddf0ef9b.af495",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3488,
-    "y": 963.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3612.566604614258,
+    "y": 925.5664825439453,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "27b6a672.93ff42"
+        "275632fb.e09a86"
       ]
     ]
   },
   {
-    "id": "484d133e.c5022c",
+    "id": "d012a2e6.7e886",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3483.509033203125,
-    "y": 1013.4259033203125,
-    "z": "211aaefb.d906ea",
+    "x": 3608.075668334961,
+    "y": 967.9925384521484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9dfa6094.6f7fc"
+        "984e984a.f448c8"
       ]
     ]
   },
   {
-    "id": "511cb1cb.4e0758",
+    "id": "c732ba74.e6ac38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3484.509033203125,
-    "y": 1066.4259033203125,
-    "z": "211aaefb.d906ea",
+    "x": 3609.075668334961,
+    "y": 1020.9925384521484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "597eb63e.8508f8"
+        "2eeb8181.d4367e"
       ]
     ]
   },
   {
-    "id": "27b6a672.93ff42",
+    "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": 3636.571533203125,
-    "y": 963.28564453125,
-    "z": "211aaefb.d906ea",
+    "x": 3761.138137817383,
+    "y": 924.8522491455078,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9dfa6094.6f7fc",
+    "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": 3626.509033203125,
-    "y": 1013.4259033203125,
-    "z": "211aaefb.d906ea",
+    "x": 3751.075668334961,
+    "y": 967.9925384521484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "bbf6b192.5183e",
+    "id": "f6681e1c.b1626",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3638,
-    "y": 893,
-    "z": "211aaefb.d906ea",
+    "x": 3811.566635131836,
+    "y": 837.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "254a0cd4.86f82c"
+        "caab91f.12177f"
       ]
     ]
   },
   {
-    "id": "597eb63e.8508f8",
+    "id": "2eeb8181.d4367e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3638,
-    "y": 1065.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3762.566635131836,
+    "y": 1020.5665130615234,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e889443b.6afcf"
+        "9eb76f3a.cfcbd8"
       ]
     ]
   },
   {
-    "id": "254a0cd4.86f82c",
+    "id": "caab91f.12177f",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3810,
-    "y": 893,
-    "z": "211aaefb.d906ea",
+    "x": 3986.566635131836,
+    "y": 811.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6d2ef37a.d5fd0c",
-        "52c8f078.ee2cf"
+        "2172bcb.4fd5b44",
+        "c6b4aa53.9764a8",
+        "fbdccf10.5fabc"
       ]
     ]
   },
   {
-    "id": "e889443b.6afcf",
+    "id": "9eb76f3a.cfcbd8",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3811,
-    "y": 1066,
-    "z": "211aaefb.d906ea",
+    "x": 3946.566635131836,
+    "y": 928.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a0b3468.4c1dbb8",
-        "ed4bd4a4.7c002"
+        "572a469b.71d458",
+        "b8b0db7f.0d0b98",
+        "56529717.d57cf"
       ]
     ]
   },
   {
-    "id": "6d2ef37a.d5fd0c",
+    "id": "2172bcb.4fd5b44",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3986,
-    "y": 872,
-    "z": "211aaefb.d906ea",
+    "x": 4108.566635131836,
+    "y": 596.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e77feac5.4ef39"
+        "b34792b6.2f84b"
       ]
     ]
   },
   {
-    "id": "52c8f078.ee2cf",
+    "id": "c6b4aa53.9764a8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3988,
-    "y": 926,
-    "z": "211aaefb.d906ea",
+    "x": 4110.566635131836,
+    "y": 650.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dc5de667.94277"
+        "8791b1f2.9fddd"
       ]
     ]
   },
   {
-    "id": "a0b3468.4c1dbb8",
+    "id": "572a469b.71d458",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3987,
-    "y": 1036,
-    "z": "211aaefb.d906ea",
+    "x": 4127.566665649414,
+    "y": 866.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "79d85b32.4dba8c"
+        "2e043645.b8ff02"
       ]
     ]
   },
   {
-    "id": "ed4bd4a4.7c002",
+    "id": "b8b0db7f.0d0b98",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3989,
-    "y": 1090,
-    "z": "211aaefb.d906ea",
+    "x": 4129.566665649414,
+    "y": 920.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5799e4b6.bb5c84"
+        "8eeda316.6df7"
       ]
     ]
   },
   {
-    "id": "985f8e8b.05bee8",
+    "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": 4296,
-    "y": 824,
-    "z": "211aaefb.d906ea",
+    "x": 4418.566635131836,
+    "y": 548.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f70bc04c.4e53a8",
+    "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": 4289,
-    "y": 922,
-    "z": "211aaefb.d906ea",
+    "x": 4411.566635131836,
+    "y": 646.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "279fdf30.7efb5",
+    "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": 4289,
-    "y": 1009,
-    "z": "211aaefb.d906ea",
+    "x": 4429.566665649414,
+    "y": 839.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "59ab7a89.d7cd04",
+    "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": 4293,
-    "y": 1102,
-    "z": "211aaefb.d906ea",
+    "x": 4433.566665649414,
+    "y": 932.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "88375125.392df",
+    "id": "a539fdfb.953e38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3520,
-    "y": 1511,
-    "z": "211aaefb.d906ea",
+    "x": 3576.566665649414,
+    "y": 1604.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "70cb5f48.205d5"
+        "7f7f51c3.cfe0e"
       ]
     ]
   },
   {
-    "id": "f9f9639f.39277",
+    "id": "a32c9d1e.59f95",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3529.490966796875,
-    "y": 1553.5740356445312,
-    "z": "211aaefb.d906ea",
+    "x": 3586.057632446289,
+    "y": 1647.1407012939453,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3188784d.74df2"
+        "ea2bacf1.80819"
       ]
     ]
   },
   {
-    "id": "5caadc0.419f8a4",
+    "id": "fb2990eb.3d37b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3518,
-    "y": 1600,
-    "z": "211aaefb.d906ea",
+    "x": 3574.566665649414,
+    "y": 1693.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "150b9d67.7501b3"
+        "495659dd.a8b668"
       ]
     ]
   },
   {
-    "id": "3a7a9a9d.f62dc6",
+    "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": 3220,
-    "y": 1473,
-    "z": "211aaefb.d906ea",
+    "x": 3276.566665649414,
+    "y": 1566.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5511f093.c411d8",
+    "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": 3263,
-    "y": 1538,
-    "z": "211aaefb.d906ea",
+    "x": 3319.566665649414,
+    "y": 1631.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "88375125.392df",
-        "f9f9639f.39277",
-        "5caadc0.419f8a4"
+        "a539fdfb.953e38",
+        "a32c9d1e.59f95",
+        "fb2990eb.3d37b8"
       ]
     ]
   },
   {
-    "id": "89e7916b.fb9e18",
+    "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": 3264,
-    "y": 1208,
-    "z": "211aaefb.d906ea",
+    "x": 3320.566665649414,
+    "y": 1301.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e837ae68.fc604",
-        "bb41717d.607c08"
+        "7927223e.403f8c",
+        "cb61ec61.ad89d"
       ]
     ]
   },
   {
-    "id": "bb41717d.607c08",
+    "id": "cb61ec61.ad89d",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3487,
-    "y": 1194,
-    "z": "211aaefb.d906ea",
+    "x": 3541.566635131836,
+    "y": 1354.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d2362461.2f81"
+        "b9b2d4da.80c098"
       ]
     ]
   },
   {
-    "id": "e837ae68.fc604",
+    "id": "7927223e.403f8c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3489,
-    "y": 1227,
-    "z": "211aaefb.d906ea",
+    "x": 3543.566635131836,
+    "y": 1387.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3512d9a4.ea10d6"
+        "3bca8d9d.c75392"
       ]
     ]
   },
   {
-    "id": "70cb5f48.205d5",
+    "id": "7f7f51c3.cfe0e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3692.66650390625,
-    "y": 1510,
-    "z": "211aaefb.d906ea",
+    "x": 3749.233169555664,
+    "y": 1603.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e94025a.e4524d8",
-        "c5dba695.8712a"
+        "f7adce7b.f663c8",
+        "aab5a13f.7b9228"
       ]
     ]
   },
   {
-    "id": "3188784d.74df2",
+    "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": 3683.0623779296875,
-    "y": 1556.8597717285156,
-    "z": "211aaefb.d906ea",
+    "x": 3739.6290435791016,
+    "y": 1650.4264373779297,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "150b9d67.7501b3",
+    "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": 3687,
-    "y": 1601,
-    "z": "211aaefb.d906ea",
+    "x": 3743.566665649414,
+    "y": 1694.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e94025a.e4524d8",
+    "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": 3957,
-    "y": 1494,
-    "z": "211aaefb.d906ea",
+    "x": 4013.566665649414,
+    "y": 1587.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e5529b75.8cebe8",
-        "23d40330.51306c"
+        "eba55ae6.b47008",
+        "a5049a4a.932988"
       ]
     ]
   },
   {
-    "id": "23d40330.51306c",
+    "id": "a5049a4a.932988",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4180,
-    "y": 1449,
-    "z": "211aaefb.d906ea",
+    "x": 4236.566665649414,
+    "y": 1542.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3c287465.76fa9c"
+        "b0af1c9f.1d33f"
       ]
     ]
   },
   {
-    "id": "e5529b75.8cebe8",
+    "id": "eba55ae6.b47008",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4182,
-    "y": 1513,
-    "z": "211aaefb.d906ea",
+    "x": 4238.566665649414,
+    "y": 1606.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "68bbdd27.0bc724"
+        "3044898a.b774b6"
       ]
     ]
   },
   {
-    "id": "68bbdd27.0bc724",
+    "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": 4344,
-    "y": 1509,
-    "z": "211aaefb.d906ea",
+    "x": 4400.566665649414,
+    "y": 1602.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3c287465.76fa9c",
+    "id": "b0af1c9f.1d33f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4345,
-    "y": 1446,
-    "z": "211aaefb.d906ea",
+    "x": 4401.566665649414,
+    "y": 1539.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bdb7c671.344b18",
-        "c34e936c.c687c"
+        "3cd7ef1e.9f6f38",
+        "782ad12.44a143"
       ]
     ]
   },
   {
-    "id": "c36404f4.836da8",
-    "type": "save",
-    "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3959,
-    "y": 1653,
-    "z": "211aaefb.d906ea",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "b7b75306.125ca8",
-    "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": 4004,
-    "y": 1563,
-    "z": "211aaefb.d906ea",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "6cc070b0.831948",
-    "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": 4087,
-    "y": 1701,
-    "z": "211aaefb.d906ea",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "3512d9a4.ea10d6",
+    "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": 3632,
-    "y": 1224,
-    "z": "211aaefb.d906ea",
+    "x": 3686.566635131836,
+    "y": 1384.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d2362461.2f81",
+    "id": "b9b2d4da.80c098",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3635,
-    "y": 1187,
-    "z": "211aaefb.d906ea",
+    "x": 3689.566635131836,
+    "y": 1347.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e726be0e.35ac3",
-        "2627d74c.d6bd68"
+        "2e849446.924674",
+        "15f06507.bc03a3"
       ]
     ]
   },
   {
-    "id": "e726be0e.35ac3",
+    "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": 3809,
-    "y": 1143,
-    "z": "211aaefb.d906ea",
+    "x": 3863.566635131836,
+    "y": 1303.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c5dba695.8712a",
+    "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": 3911,
-    "y": 1778,
-    "z": "211aaefb.d906ea",
+    "x": 3962.566635131836,
+    "y": 1697.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e649e24c.a2956"
+        "7f3dbf41.0b7cb"
       ]
     ]
   },
   {
-    "id": "e649e24c.a2956",
+    "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": 4117,
-    "y": 1778,
-    "z": "211aaefb.d906ea",
+    "x": 4168.566635131836,
+    "y": 1697.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b51c6327.c26b2"
+        "33161afe.bf5fb6"
       ]
     ]
   },
   {
-    "id": "b51c6327.c26b2",
+    "id": "33161afe.bf5fb6",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4332.28564453125,
-    "y": 1777.82177734375,
-    "z": "211aaefb.d906ea",
+    "x": 4383.852279663086,
+    "y": 1697.388412475586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4a081ef3.a11e7"
+        "d1f5e6bd.d6c388"
       ]
     ]
   },
   {
-    "id": "2627d74c.d6bd68",
+    "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": 3824,
-    "y": 1254,
-    "z": "211aaefb.d906ea",
+    "x": 3878.566635131836,
+    "y": 1414.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e436419e.4fabd8",
-        "652a3cad.15b09c",
-        "70700ce3.d1704c"
+        "609f91e1.96d3c",
+        "c5dd830a.81bd98",
+        "f762b67a.3d2c8"
       ]
     ]
   },
   {
-    "id": "e436419e.4fabd8",
+    "id": "609f91e1.96d3c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4019.5001220703125,
-    "y": 1206,
-    "z": "211aaefb.d906ea",
+    "x": 4074.0667572021484,
+    "y": 1366.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cac46a50.7c9a2"
+        "964976f5.819d98"
       ]
     ]
   },
   {
-    "id": "652a3cad.15b09c",
+    "id": "c5dd830a.81bd98",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4011.5001220703125,
-    "y": 1261,
-    "z": "211aaefb.d906ea",
+    "x": 4066.0667572021484,
+    "y": 1421.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7a559df8.2fbb14"
+        "bf5b62.bbb734a"
       ]
     ]
   },
   {
-    "id": "70700ce3.d1704c",
+    "id": "f762b67a.3d2c8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4016.5001220703125,
-    "y": 1318,
-    "z": "211aaefb.d906ea",
+    "x": 4071.0667572021484,
+    "y": 1478.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "74d49b92.9fc25c"
+        "bc48235e.ca1af8"
       ]
     ]
   },
   {
-    "id": "74d49b92.9fc25c",
+    "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": 4168.5001220703125,
-    "y": 1319,
-    "z": "211aaefb.d906ea",
+    "x": 4223.066757202148,
+    "y": 1479.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7a559df8.2fbb14",
+    "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": 4179.5001220703125,
-    "y": 1264,
-    "z": "211aaefb.d906ea",
+    "x": 4234.066757202148,
+    "y": 1424.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cac46a50.7c9a2",
+    "id": "964976f5.819d98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4163.8824462890625,
-    "y": 1203.6556701660156,
-    "z": "211aaefb.d906ea",
+    "x": 4218.449081420898,
+    "y": 1364.2223052978516,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "66f1613b.919fb"
+        "242018b6.f49c88"
       ]
     ]
   },
   {
-    "id": "66f1613b.919fb",
+    "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": 4348,
-    "y": 1218,
-    "z": "211aaefb.d906ea",
+    "x": 4402.566635131836,
+    "y": 1378.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c85b648c.95d8c8"
+        "fc08eb6a.2320e"
       ]
     ]
   },
   {
-    "id": "c34e936c.c687c",
+    "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": 4515,
-    "y": 1404,
-    "z": "211aaefb.d906ea",
+    "x": 4571.566665649414,
+    "y": 1497.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "bdb7c671.344b18",
+    "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": 4516,
-    "y": 1512,
-    "z": "211aaefb.d906ea",
+    "x": 4572.566665649414,
+    "y": 1605.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c2c86af0.87457",
+    "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": 4517,
-    "y": 1461,
-    "z": "211aaefb.d906ea",
+    "x": 4573.566665649414,
+    "y": 1554.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4a081ef3.a11e7",
+    "id": "d1f5e6bd.d6c388",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4539.1171875,
-    "y": 1778.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 4590.683822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "feabfc8a.6835d8",
-        "3ad150ae.9686d8",
-        "7f60aea1.758cf8"
+        "333e33dc.560624",
+        "7db36be0.62778c",
+        "5d7040fa.99ac2"
       ]
     ]
   },
   {
-    "id": "feabfc8a.6835d8",
+    "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": 4754.1171875,
-    "y": 1740.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 4805.683822631836,
+    "y": 1659.906967163086,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3ad150ae.9686d8",
+    "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": 4751.1171875,
-    "y": 1779.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 4802.683822631836,
+    "y": 1698.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ee0e6ba7.1ab528"
+        "2d9a4fac.ae36b8"
       ]
     ]
   },
   {
-    "id": "7f60aea1.758cf8",
+    "id": "5d7040fa.99ac2",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4706.6171875,
-    "y": 1821.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 4758.183822631836,
+    "y": 1740.906967163086,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ee0e6ba7.1ab528",
+    "id": "2d9a4fac.ae36b8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4931.6171875,
-    "y": 1778.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 4983.183822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f1c6f75a.7a676"
+        "a4ece740.b4105"
       ]
     ]
   },
   {
-    "id": "3cd8e203.e194b6",
+    "id": "52e1d551.a483dc",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4746,
-    "y": 1222,
-    "z": "211aaefb.d906ea",
+    "x": 4802.566665649414,
+    "y": 1315.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "17b6f38.a7a3d8d"
+        "7de9311.18a165"
       ]
     ]
   },
   {
-    "id": "17b6f38.a7a3d8d",
+    "id": "7de9311.18a165",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4923,
-    "y": 1214,
-    "z": "211aaefb.d906ea",
+    "x": 4979.566665649414,
+    "y": 1307.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "676933bd.3d8274",
-        "263106c3.f9fd42"
+        "fff1a40e.199ba",
+        "7abb7683.fa5358"
       ]
     ]
   },
   {
-    "id": "c85b648c.95d8c8",
+    "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": 4543,
-    "y": 1218,
-    "z": "211aaefb.d906ea",
+    "x": 4597.566635131836,
+    "y": 1378.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3cd8e203.e194b6",
-        "a370dab4.6f2d18"
+        "52e1d551.a483dc",
+        "6d2d083c.e53ec8"
       ]
     ]
   },
   {
-    "id": "a370dab4.6f2d18",
+    "id": "6d2d083c.e53ec8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4749,
-    "y": 1296,
-    "z": "211aaefb.d906ea",
+    "x": 4805.566665649414,
+    "y": 1389.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9dd5a5f0.afd2"
+        "b42cfcde.f4ebc8"
       ]
     ]
   },
   {
-    "id": "9dd5a5f0.afd2",
+    "id": "b42cfcde.f4ebc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4926,
-    "y": 1288,
-    "z": "211aaefb.d906ea",
+    "x": 4982.566665649414,
+    "y": 1381.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fbf0fc4a.17b5c8"
+        "e8e280e3.a65e5"
       ]
     ]
   },
   {
-    "id": "f1c6f75a.7a676",
+    "id": "a4ece740.b4105",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5089.6171875,
-    "y": 1778.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 5141.183822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3b33bb0c.f032cc"
+        "425d708e.783968"
       ]
     ]
   },
   {
-    "id": "3b33bb0c.f032cc",
+    "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": 5296.6171875,
-    "y": 1778.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 5348.183822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "263106c3.f9fd42",
+    "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": 5131,
-    "y": 1221,
-    "z": "211aaefb.d906ea",
+    "x": 5187.566665649414,
+    "y": 1314.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ddcc8888.29b548",
-        "db7fdb45.821a78",
-        "ff56d5.bfda3928"
+        "45403a46.69b7f4",
+        "ab6bed09.5e53d",
+        "1ce7c845.052f38"
       ]
     ]
   },
   {
-    "id": "676933bd.3d8274",
+    "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": 5161,
-    "y": 1169,
-    "z": "211aaefb.d906ea",
+    "x": 5217.566665649414,
+    "y": 1262.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ddcc8888.29b548",
+    "id": "45403a46.69b7f4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5341,
-    "y": 1212,
-    "z": "211aaefb.d906ea",
+    "x": 5397.566665649414,
+    "y": 1305.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e7e5466f.7658a"
+        "f2e23e54.aa63c8"
       ]
     ]
   },
   {
-    "id": "db7fdb45.821a78",
+    "id": "ab6bed09.5e53d",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5333,
-    "y": 1267,
-    "z": "211aaefb.d906ea",
+    "x": 5389.566665649414,
+    "y": 1360.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1793a855.2047c"
+        "29b1e9b9.e1584e"
       ]
     ]
   },
   {
-    "id": "ff56d5.bfda3928",
+    "id": "1ce7c845.052f38",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5338,
-    "y": 1324,
-    "z": "211aaefb.d906ea",
+    "x": 5394.566665649414,
+    "y": 1417.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "81dadd48.c741d8"
+        "26b11425.c22444"
       ]
     ]
   },
   {
-    "id": "81dadd48.c741d8",
+    "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": 5490,
-    "y": 1325,
-    "z": "211aaefb.d906ea",
+    "x": 5546.566665649414,
+    "y": 1418.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1793a855.2047c",
+    "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": 5501,
-    "y": 1270,
-    "z": "211aaefb.d906ea",
+    "x": 5557.566665649414,
+    "y": 1363.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e7e5466f.7658a",
+    "id": "f2e23e54.aa63c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5485.38232421875,
-    "y": 1209.6556701660156,
-    "z": "211aaefb.d906ea",
+    "x": 5541.948989868164,
+    "y": 1303.2223358154297,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dde9f23c.0ef22"
+        "a969095b.c118"
       ]
     ]
   },
   {
-    "id": "fbf0fc4a.17b5c8",
+    "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": 5161,
-    "y": 1412,
-    "z": "211aaefb.d906ea",
+    "x": 5217.566665649414,
+    "y": 1505.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "dde9f23c.0ef22",
+    "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": 5700,
-    "y": 1206,
-    "z": "211aaefb.d906ea",
+    "x": 5756.566665649414,
+    "y": 1299.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f4910610.e101b8",
+    "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": 4284,
-    "y": 860,
-    "z": "211aaefb.d906ea",
+    "x": 4406.566635131836,
+    "y": 584.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f3cd87cd.165138",
+    "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": 4275,
-    "y": 958,
-    "z": "211aaefb.d906ea",
+    "x": 4397.566635131836,
+    "y": 682.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e77feac5.4ef39",
+    "id": "b34792b6.2f84b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4109,
-    "y": 866,
-    "z": "211aaefb.d906ea",
+    "x": 4231.566635131836,
+    "y": 590.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "985f8e8b.05bee8",
-        "f4910610.e101b8"
+        "9e47fb61.f661c8",
+        "3c38a36b.8cf1d4"
       ]
     ]
   },
   {
-    "id": "dc5de667.94277",
+    "id": "8791b1f2.9fddd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4115,
-    "y": 930,
-    "z": "211aaefb.d906ea",
+    "x": 4237.566635131836,
+    "y": 654.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f70bc04c.4e53a8",
-        "f3cd87cd.165138"
+        "21b58670.3a1192",
+        "66912289.29f5fc"
       ]
     ]
   },
   {
-    "id": "79d85b32.4dba8c",
+    "id": "2e043645.b8ff02",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4115,
-    "y": 1036,
-    "z": "211aaefb.d906ea",
+    "x": 4255.566665649414,
+    "y": 866.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "279fdf30.7efb5",
-        "746b1d51.0e2bec"
+        "d0dd5f40.4b5f38",
+        "fac3c269.3e8818"
       ]
     ]
   },
   {
-    "id": "5799e4b6.bb5c84",
+    "id": "8eeda316.6df7",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4118,
-    "y": 1089,
-    "z": "211aaefb.d906ea",
+    "x": 4258.566665649414,
+    "y": 919.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "59ab7a89.d7cd04",
-        "b63e0082.68a46"
+        "d70d7c37.e21f5",
+        "d978bf81.a682c8"
       ]
     ]
   },
   {
-    "id": "746b1d51.0e2bec",
+    "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": 4275,
-    "y": 1049,
-    "z": "211aaefb.d906ea",
+    "x": 4415.566665649414,
+    "y": 879.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b63e0082.68a46",
+    "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": 4278,
-    "y": 1140,
-    "z": "211aaefb.d906ea",
+    "x": 4418.566665649414,
+    "y": 970.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "87a4f79d.f1b41",
+    "id": "98a290a7.380a3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3650,
-    "y": 2350,
-    "z": "211aaefb.d906ea",
+    "x": 3710.566635131836,
+    "y": 2097.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8613884a.623e8",
-        "df0137f0.20c7a8"
+        "e497858e.0123a",
+        "498e60f5.55f178"
       ]
     ]
   },
   {
-    "id": "af9ecc7.c2e763",
+    "id": "7f085da3.5b6764",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3477.33349609375,
-    "y": 2351,
-    "z": "211aaefb.d906ea",
+    "x": 3537.900131225586,
+    "y": 2098.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "87a4f79d.f1b41"
+        "98a290a7.380a3"
       ]
     ]
   },
   {
-    "id": "53f2a3cf.4dd8a4",
+    "id": "92e1b5b8.c9d748",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3486.824462890625,
-    "y": 2393.5740356445312,
-    "z": "211aaefb.d906ea",
+    "x": 3547.391098022461,
+    "y": 2141.140670776367,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "50bbbd16.7373fc"
+        "b56c748b.ef0b98"
       ]
     ]
   },
   {
-    "id": "aba66972.a33e38",
+    "id": "67d077ec.f8e2b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3475.33349609375,
-    "y": 2440,
-    "z": "211aaefb.d906ea",
+    "x": 3535.900131225586,
+    "y": 2187.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6c045770.56d3d"
+        "531aab62.3c8d74"
       ]
     ]
   },
   {
-    "id": "50bbbd16.7373fc",
+    "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": 3640.3958740234375,
-    "y": 2396.8597717285156,
-    "z": "211aaefb.d906ea",
+    "x": 3700.9625091552734,
+    "y": 2144.4264068603516,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6c045770.56d3d",
+    "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": 3644.33349609375,
-    "y": 2441,
-    "z": "211aaefb.d906ea",
+    "x": 3704.900131225586,
+    "y": 2188.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8613884a.623e8",
+    "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": 3936.33349609375,
-    "y": 2354.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 3996.900131225586,
+    "y": 2101.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d23083de.2cf1e",
-        "7516fca6.f7fc04"
+        "f5003287.c43b28",
+        "e21b6e0c.643e48"
       ]
     ]
   },
   {
-    "id": "7516fca6.f7fc04",
+    "id": "e21b6e0c.643e48",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4159.33349609375,
-    "y": 2309.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4219.900131225586,
+    "y": 2056.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c66357b4.73185"
+        "1c25bfa5.0e84a8"
       ]
     ]
   },
   {
-    "id": "d23083de.2cf1e",
+    "id": "f5003287.c43b28",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4161.33349609375,
-    "y": 2373.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4221.900131225586,
+    "y": 2120.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a82df7d1.ae6a"
+        "9df0e8d3.70e7b"
       ]
     ]
   },
   {
-    "id": "a82df7d1.ae6a",
+    "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": 4320.33349609375,
-    "y": 2392.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4380.900131225586,
+    "y": 2139.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c66357b4.73185",
+    "id": "1c25bfa5.0e84a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4324.33349609375,
-    "y": 2306.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4384.900131225586,
+    "y": 2053.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dffb0ed6.823ba",
-        "1dd3dd1b.7300fb"
+        "15645f19.451cd9",
+        "5b635208.85addc"
       ]
     ]
   },
   {
-    "id": "634f24c.033d45c",
-    "type": "save",
-    "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3938.33349609375,
-    "y": 2513.0001220703125,
-    "z": "211aaefb.d906ea",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "165310c1.3dcf57",
-    "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": 3983.33349609375,
-    "y": 2423.0001220703125,
-    "z": "211aaefb.d906ea",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "1c4663ba.666f24",
-    "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": 4065.33349609375,
-    "y": 2578.0001220703125,
-    "z": "211aaefb.d906ea",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "6481b806.b26798",
+    "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": 3249.33349609375,
-    "y": 2386,
-    "z": "211aaefb.d906ea",
+    "x": 3309.900131225586,
+    "y": 2133.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "af9ecc7.c2e763",
-        "53f2a3cf.4dd8a4",
-        "aba66972.a33e38"
+        "7f085da3.5b6764",
+        "92e1b5b8.c9d748",
+        "67d077ec.f8e2b8"
       ]
     ]
   },
   {
-    "id": "357b021d.ccef76",
+    "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": 3210.33349609375,
-    "y": 2330,
-    "z": "211aaefb.d906ea",
+    "x": 3270.900131225586,
+    "y": 2077.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d2628754.9207b8",
+    "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": 3267.33349609375,
-    "y": 2048.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3329.900131225586,
+    "y": 1873.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f940533a.3599b",
-        "b0b7c077.9433c"
+        "7f4e16fd.13b25",
+        "9c29704e.b9eca8"
       ]
     ]
   },
   {
-    "id": "b0b7c077.9433c",
+    "id": "9c29704e.b9eca8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3490.33349609375,
-    "y": 2034.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3552.900131225586,
+    "y": 1859.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c06f7f13.a06918"
+        "bb1e4e57.280888"
       ]
     ]
   },
   {
-    "id": "f940533a.3599b",
+    "id": "7f4e16fd.13b25",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3492.33349609375,
-    "y": 2067.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3554.900131225586,
+    "y": 1892.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1b16d50a.3ac5a3"
+        "b75dfd73.636e48"
       ]
     ]
   },
   {
-    "id": "1b16d50a.3ac5a3",
+    "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": 3635.33349609375,
-    "y": 2064.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3697.900131225586,
+    "y": 1889.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c06f7f13.a06918",
+    "id": "bb1e4e57.280888",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3638.33349609375,
-    "y": 2027.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3700.900131225586,
+    "y": 1852.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f576457.60ef6b8",
-        "57336dca.385a1c"
+        "bda8773a.f12a1",
+        "d5e4b6e4.115dd8"
       ]
     ]
   },
   {
-    "id": "f576457.60ef6b8",
+    "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": 3832.33349609375,
-    "y": 2031,
-    "z": "211aaefb.d906ea",
+    "x": 3894.900131225586,
+    "y": 1855.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "df0137f0.20c7a8",
+    "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": 3895.33349609375,
-    "y": 2663,
-    "z": "211aaefb.d906ea",
+    "x": 3947.900100708008,
+    "y": 2224.566604614258,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e2836384.c2ccb8"
+        "f195472b.83ff2"
       ]
     ]
   },
   {
-    "id": "e2836384.c2ccb8",
+    "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": 4101.33349609375,
-    "y": 2663,
-    "z": "211aaefb.d906ea",
+    "x": 4153.900100708008,
+    "y": 2224.566604614258,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fca69a38.03a91"
+        "2e029795.f674f8"
       ]
     ]
   },
   {
-    "id": "fca69a38.03a91",
+    "id": "2e029795.f674f8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4318.619140625,
-    "y": 2661.82177734375,
-    "z": "211aaefb.d906ea",
+    "x": 4371.185745239258,
+    "y": 2223.388381958008,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7ea58eaa.2fe4c8"
+        "9d2261f5.b9fa08"
       ]
     ]
   },
   {
-    "id": "57336dca.385a1c",
+    "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": 3854.33349609375,
-    "y": 2099,
-    "z": "211aaefb.d906ea",
+    "x": 3916.900131225586,
+    "y": 1923.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4f2611a4.8dfaa",
-        "d01e89f4.899b8",
-        "4dbe2024.2418c8"
+        "6730b25.e0c5f4c",
+        "c5d11aca.de4aa8",
+        "359fd71e.08e5b"
       ]
     ]
   },
   {
-    "id": "4f2611a4.8dfaa",
+    "id": "6730b25.e0c5f4c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4049.8336181640625,
-    "y": 2051,
-    "z": "211aaefb.d906ea",
+    "x": 4112.400253295898,
+    "y": 1875.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c7fe21e9.219fb"
+        "11cc1f31.73aba1"
       ]
     ]
   },
   {
-    "id": "d01e89f4.899b8",
+    "id": "c5d11aca.de4aa8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4041.8336181640625,
-    "y": 2106,
-    "z": "211aaefb.d906ea",
+    "x": 4104.400253295898,
+    "y": 1930.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "711f5b9.04549a4"
+        "5b1bf93a.85704"
       ]
     ]
   },
   {
-    "id": "4dbe2024.2418c8",
+    "id": "359fd71e.08e5b",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4046.8336181640625,
-    "y": 2163,
-    "z": "211aaefb.d906ea",
+    "x": 4109.400253295898,
+    "y": 1987.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7a110b6a.211174"
+        "150deb8f.b69cd4"
       ]
     ]
   },
   {
-    "id": "7a110b6a.211174",
+    "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": 4198.8336181640625,
-    "y": 2164,
-    "z": "211aaefb.d906ea",
+    "x": 4261.400253295898,
+    "y": 1988.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "711f5b9.04549a4",
+    "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": 4209.8336181640625,
-    "y": 2109,
-    "z": "211aaefb.d906ea",
+    "x": 4272.400253295898,
+    "y": 1933.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c7fe21e9.219fb",
+    "id": "11cc1f31.73aba1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4194.2159423828125,
-    "y": 2048.6556701660156,
-    "z": "211aaefb.d906ea",
+    "x": 4256.782577514648,
+    "y": 1873.222427368164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5f7a4387.8903dc"
+        "cff6dd9b.8cbec"
       ]
     ]
   },
   {
-    "id": "dffb0ed6.823ba",
+    "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": 4494.33349609375,
-    "y": 2267.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4554.900131225586,
+    "y": 2014.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1dd3dd1b.7300fb",
+    "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": 4495.33349609375,
-    "y": 2372.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4555.900131225586,
+    "y": 2119.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "132cb9b4.8d2256",
+    "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": 4490.33349609375,
-    "y": 2321.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4550.900131225586,
+    "y": 2068.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7ea58eaa.2fe4c8",
+    "id": "9d2261f5.b9fa08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4525.45068359375,
-    "y": 2651.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 4578.017288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9217eff0.7fa96",
-        "965ae906.eae45",
-        "1b19b6f0.8ece39"
+        "84d8ab80.c7c5d8",
+        "e6773f2f.211b88",
+        "2391fc90.5865f4"
       ]
     ]
   },
   {
-    "id": "9217eff0.7fa96",
+    "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": 4740.45068359375,
-    "y": 2613.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 4793.017288208008,
+    "y": 2174.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "965ae906.eae45",
+    "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": 4737.45068359375,
-    "y": 2652.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 4790.017288208008,
+    "y": 2213.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "87f8942.95038e8"
+        "e6f8fe6a.d80188"
       ]
     ]
   },
   {
-    "id": "1b19b6f0.8ece39",
+    "id": "2391fc90.5865f4",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4692.95068359375,
-    "y": 2694.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 4745.517288208008,
+    "y": 2255.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "87f8942.95038e8",
+    "id": "e6f8fe6a.d80188",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4917.95068359375,
-    "y": 2651.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 4970.517288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "65d1ff2e.3f2e18"
+        "fdc72134.67c23"
       ]
     ]
   },
   {
-    "id": "65d1ff2e.3f2e18",
+    "id": "fdc72134.67c23",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5075.95068359375,
-    "y": 2651.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 5128.517288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fedf1a96.f1456"
+        "be11f8e.1056f08"
       ]
     ]
   },
   {
-    "id": "fedf1a96.f1456",
+    "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": 5282.95068359375,
-    "y": 2651.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 5335.517288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "115bab50.32a055",
+    "id": "8905f8e1.68af1",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4776.33349609375,
-    "y": 2067,
-    "z": "211aaefb.d906ea",
+    "x": 4838.900131225586,
+    "y": 1891.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e64c3553.0ae97"
+        "ca38006f.4cfdd"
       ]
     ]
   },
   {
-    "id": "e64c3553.0ae97",
+    "id": "ca38006f.4cfdd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4953.33349609375,
-    "y": 2059,
-    "z": "211aaefb.d906ea",
+    "x": 5015.900131225586,
+    "y": 1883.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a2d6f837.6f757",
-        "eeac3b28.315368"
+        "9fddc1a7.528c8",
+        "516ef3bb.d53aec"
       ]
     ]
   },
   {
-    "id": "5f7a4387.8903dc",
+    "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": 4378.33349609375,
-    "y": 2063,
-    "z": "211aaefb.d906ea",
+    "x": 4440.900131225586,
+    "y": 1887.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bd77f52.650d108"
+        "4e481827.26cf7"
       ]
     ]
   },
   {
-    "id": "bd77f52.650d108",
+    "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": 4573.33349609375,
-    "y": 2063,
-    "z": "211aaefb.d906ea",
+    "x": 4635.900131225586,
+    "y": 1887.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "115bab50.32a055",
-        "c1dba387.605d3"
+        "8905f8e1.68af1",
+        "eb2add71.4c5b38"
       ]
     ]
   },
   {
-    "id": "eeac3b28.315368",
+    "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": 5161.33349609375,
-    "y": 2066,
-    "z": "211aaefb.d906ea",
+    "x": 5223.900131225586,
+    "y": 1890.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fa5ccc46.c0c8e8",
-        "7f544ab3.a923ac",
-        "629c31b0.bf54b"
+        "8f1e6966.2ed9b",
+        "eb0b97a0.d2554",
+        "8b053235.7e7848"
       ]
     ]
   },
   {
-    "id": "3e060ac3.b125d6",
+    "id": "13674b50.1cc875",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4955.33349609375,
-    "y": 2132,
-    "z": "211aaefb.d906ea",
+    "x": 5017.900131225586,
+    "y": 1956.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a8b3b7de.4e882"
+        "fd136ece.b5724"
       ]
     ]
   },
   {
-    "id": "c1dba387.605d3",
+    "id": "eb2add71.4c5b38",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4778.33349609375,
-    "y": 2140,
-    "z": "211aaefb.d906ea",
+    "x": 4840.900131225586,
+    "y": 1964.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3e060ac3.b125d6"
+        "13674b50.1cc875"
       ]
     ]
   },
   {
-    "id": "a2d6f837.6f757",
+    "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": 5191.33349609375,
-    "y": 2014,
-    "z": "211aaefb.d906ea",
+    "x": 5253.900131225586,
+    "y": 1838.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a8b3b7de.4e882",
+    "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": 5190.33349609375,
-    "y": 2256,
-    "z": "211aaefb.d906ea",
+    "x": 5252.900131225586,
+    "y": 2080.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fa5ccc46.c0c8e8",
+    "id": "8f1e6966.2ed9b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5371.33349609375,
-    "y": 2057,
-    "z": "211aaefb.d906ea",
+    "x": 5433.900131225586,
+    "y": 1881.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "58f99424.7527f4"
+        "9db69d63.dc9d08"
       ]
     ]
   },
   {
-    "id": "7f544ab3.a923ac",
+    "id": "eb0b97a0.d2554",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5363.33349609375,
-    "y": 2112,
-    "z": "211aaefb.d906ea",
+    "x": 5425.900131225586,
+    "y": 1936.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ffe0cce7.8e8ca"
+        "c57fd560.6db4a"
       ]
     ]
   },
   {
-    "id": "629c31b0.bf54b",
+    "id": "8b053235.7e7848",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5368.33349609375,
-    "y": 2169,
-    "z": "211aaefb.d906ea",
+    "x": 5430.900131225586,
+    "y": 1993.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cc8477b8.611dc8"
+        "6e911852.3a5e28"
       ]
     ]
   },
   {
-    "id": "cc8477b8.611dc8",
+    "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": 5520.33349609375,
-    "y": 2170,
-    "z": "211aaefb.d906ea",
+    "x": 5582.900131225586,
+    "y": 1994.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ffe0cce7.8e8ca",
+    "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": 5531.33349609375,
-    "y": 2115,
-    "z": "211aaefb.d906ea",
+    "x": 5593.900131225586,
+    "y": 1939.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "58f99424.7527f4",
+    "id": "9db69d63.dc9d08",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5515.7158203125,
-    "y": 2054.6556701660156,
-    "z": "211aaefb.d906ea",
+    "x": 5578.282455444336,
+    "y": 1879.222427368164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f5242e64.71f82"
+        "e6169acb.b321e8"
       ]
     ]
   },
   {
-    "id": "f5242e64.71f82",
+    "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": 5730.33349609375,
-    "y": 2051,
-    "z": "211aaefb.d906ea",
+    "x": 5792.900131225586,
+    "y": 1875.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "20bb7eae.be3a32",
+    "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`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
+    "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
     "comments": "",
-    "x": 3229,
-    "y": 1661,
-    "z": "211aaefb.d906ea",
+    "x": 3277.566635131836,
+    "y": 1694.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7762f3ae.52a254",
+    "id": "758e6e49.b62098",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4451,
-    "y": 944,
-    "z": "211aaefb.d906ea",
+    "x": 4573.566635131836,
+    "y": 668.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "edff520.fc6aeb",
+    "id": "ebf6202d.cf95a8",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4443,
-    "y": 1034,
-    "z": "211aaefb.d906ea",
+    "x": 4583.566665649414,
+    "y": 864.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9fcb0922.e08ed",
+    "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`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
+    "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
     "comments": "",
-    "x": 3210,
-    "y": 2517,
-    "z": "211aaefb.d906ea",
+    "x": 3280.566604614258,
+    "y": 2202.566604614258,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3db2acf8.6fe83c",
+    "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": 3361,
-    "y": 2765,
-    "z": "211aaefb.d906ea",
+    "x": 3417.566665649414,
+    "y": 2858.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "d8a34ec.a6346b",
+    "id": "b5b402c1.c35e88",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3238,
-    "y": 2875,
-    "z": "211aaefb.d906ea",
+    "x": 3294.566665649414,
+    "y": 2968.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "52347f79.8db4f",
-        "cd09ff82.d8b0a8"
+        "1932a37.6a327dd",
+        "e9120928.0c2298"
       ]
     ]
   },
   {
-    "id": "52347f79.8db4f",
+    "id": "1932a37.6a327dd",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3422,
-    "y": 2854,
-    "z": "211aaefb.d906ea",
+    "x": 3478.566665649414,
+    "y": 2947.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2a86c6f9.428e32"
+        "82607164.646368"
       ]
     ]
   },
   {
-    "id": "cd09ff82.d8b0a8",
+    "id": "e9120928.0c2298",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3314,
-    "y": 5032,
-    "z": "211aaefb.d906ea",
+    "x": 3370.566665649414,
+    "y": 5125.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "36762610.1073d2"
+        "ff313408.b74908"
       ]
     ]
   },
   {
-    "id": "36762610.1073d2",
+    "id": "ff313408.b74908",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3469,
-    "y": 5025,
-    "z": "211aaefb.d906ea",
+    "x": 3525.566665649414,
+    "y": 5118.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ae52f9b0.eb7378",
-        "6bdb71eb.cd7da",
-        "5ba113f8.d2a564",
-        "536ae5e9.b25a04",
-        "5c19cae5.23f224"
+        "172df7ad.1d8918",
+        "e9491637.d51c9",
+        "ed589f33.dee34",
+        "8bbbb496.3df16",
+        "581d9366.e6ee44",
+        "f0668881.7d6d6"
       ]
     ]
   },
   {
-    "id": "2a86c6f9.428e32",
+    "id": "82607164.646368",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3565,
-    "y": 2854,
-    "z": "211aaefb.d906ea",
+    "x": 3621.566665649414,
+    "y": 2947.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "60b7b56f.adea4c",
-        "bdc41b3b.e9f9e8",
-        "9a7dac44.d03ca8",
-        "bedde447.35d04",
-        "7fc21231.2a386c",
-        "541e3cf1.3cdc4c",
-        "8e19f306.cd166",
-        "7aa2001.036a58",
-        "fd1584d2.77bd18",
-        "4d65e0ad.f66548",
-        "799454e3.25827c",
-        "ca44c46f.688fa8",
-        "3e5313a9.d78034",
-        "3f9a9e6f.0fc392",
-        "f035278d.c09ef",
-        "c934426f.9b2fb",
-        "a387df7d.b7b76",
-        "944ed400.3d2108",
-        "e04ee2dc.c84258"
+        "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": "fd1584d2.77bd18",
+    "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": 3876,
-    "y": 3209,
-    "z": "211aaefb.d906ea",
+    "x": 3931.566665649414,
+    "y": 3262.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "60b7b56f.adea4c",
+    "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3830,
-    "y": 3307,
-    "z": "211aaefb.d906ea",
+    "x": 3879.566665649414,
+    "y": 3304.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "bdc41b3b.e9f9e8",
+    "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": 3966,
-    "y": 3354,
-    "z": "211aaefb.d906ea",
+    "x": 4008.566665649414,
+    "y": 3346.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "335c026d.7b6e86",
+    "id": "568e89f6.76041",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 3797,
-    "y": 3158,
-    "z": "211aaefb.d906ea",
+    "x": 3854.566665649414,
+    "y": 3221.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "15801117.33a03f",
+    "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": 4323,
-    "y": 3649,
-    "z": "211aaefb.d906ea",
+    "x": 4379.566665649414,
+    "y": 3742.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9a7dac44.d03ca8",
+    "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": 3887,
-    "y": 3688,
-    "z": "211aaefb.d906ea",
+    "x": 3943.566665649414,
+    "y": 3781.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "bedde447.35d04",
+    "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3835,
-    "y": 3739,
-    "z": "211aaefb.d906ea",
+    "x": 3891.566665649414,
+    "y": 3832.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "7fc21231.2a386c",
+    "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": 3971,
-    "y": 3786,
-    "z": "211aaefb.d906ea",
+    "x": 4027.566665649414,
+    "y": 3879.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "9c57f099.e1906",
+    "id": "b73302ea.6b3c9",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 3828,
-    "y": 3648,
-    "z": "211aaefb.d906ea",
+    "x": 3884.566665649414,
+    "y": 3741.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c4862f6c.a2a29",
+    "id": "f06d4892.086d48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4258,
-    "y": 3845,
-    "z": "211aaefb.d906ea",
+    "x": 4314.566665649414,
+    "y": 3938.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "541e3cf1.3cdc4c",
+    "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": 3849,
-    "y": 3892,
-    "z": "211aaefb.d906ea",
+    "x": 3905.566665649414,
+    "y": 3985.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "42cf0b77.2dec84",
-        "81ea64e.302c518",
-        "1a138015.57b74"
+        "7c79fc80.066eb4",
+        "c371f5b2.5890b8",
+        "8674a08a.891028"
       ]
     ]
   },
   {
-    "id": "42cf0b77.2dec84",
+    "id": "7c79fc80.066eb4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4096,
-    "y": 3846,
-    "z": "211aaefb.d906ea",
+    "x": 4152.566665649414,
+    "y": 3939.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c4862f6c.a2a29"
+        "f06d4892.086d48"
       ]
     ]
   },
   {
-    "id": "81ea64e.302c518",
+    "id": "c371f5b2.5890b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4096.490966796875,
-    "y": 3891.5740356445312,
-    "z": "211aaefb.d906ea",
+    "x": 4153.057632446289,
+    "y": 3985.1407012939453,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "396ed743.e6ca6"
+        "f874dece.70a19"
       ]
     ]
   },
   {
-    "id": "1a138015.57b74",
+    "id": "8674a08a.891028",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4094,
-    "y": 3935,
-    "z": "211aaefb.d906ea",
+    "x": 4150.566665649414,
+    "y": 4028.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f5385619.47f03"
+        "395b0fd4.a6a4c"
       ]
     ]
   },
   {
-    "id": "396ed743.e6ca6",
+    "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": 4259.0623779296875,
-    "y": 3891.8597717285156,
-    "z": "211aaefb.d906ea",
+    "x": 4315.629043579102,
+    "y": 3985.4264373779297,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f5385619.47f03",
+    "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": 4263,
-    "y": 3936,
-    "z": "211aaefb.d906ea",
+    "x": 4319.566665649414,
+    "y": 4029.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f035278d.c09ef",
+    "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": 3906,
-    "y": 4171,
-    "z": "211aaefb.d906ea",
+    "x": 3959.566665649414,
+    "y": 4327.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c934426f.9b2fb",
+    "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": 3909,
-    "y": 4216,
-    "z": "211aaefb.d906ea",
+    "x": 3962.566665649414,
+    "y": 4372.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "944ed400.3d2108",
+    "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": 3898,
-    "y": 4007,
-    "z": "211aaefb.d906ea",
+    "x": 3954.566665649414,
+    "y": 4100.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e04ee2dc.c84258",
+    "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": 3900,
-    "y": 4054,
-    "z": "211aaefb.d906ea",
+    "x": 3956.566665649414,
+    "y": 4147.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "49a17204.cabfec",
+    "id": "de9883f2.40e1e",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 3822,
-    "y": 4124,
-    "z": "211aaefb.d906ea",
+    "x": 3875.566665649414,
+    "y": 4280.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f9147a44.abd5d",
+    "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": 4429,
-    "y": 4853,
-    "z": "211aaefb.d906ea",
+    "x": 4485.566665649414,
+    "y": 4946.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ae52f9b0.eb7378",
+    "id": "172df7ad.1d8918",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3684,
-    "y": 5006,
-    "z": "211aaefb.d906ea",
+    "x": 3740.566665649414,
+    "y": 5099.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2031568b.5c466a",
-        "d5c3bda4.9d44d"
+        "42ddce9e.8ae7c",
+        "527e3f0b.1dc1d"
       ]
     ]
   },
   {
-    "id": "d5c3bda4.9d44d",
+    "id": "527e3f0b.1dc1d",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3856,
-    "y": 5003,
-    "z": "211aaefb.d906ea",
+    "x": 3912.566665649414,
+    "y": 5096.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3fb1d79b.8d6fb8"
+        "7bd89115.7af5d"
       ]
     ]
   },
   {
-    "id": "2031568b.5c466a",
+    "id": "42ddce9e.8ae7c",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3808,
-    "y": 5850,
-    "z": "211aaefb.d906ea",
+    "x": 3864.566665649414,
+    "y": 5943.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ff5eb6bb.d3898"
+        "ba444b0.6d090b8"
       ]
     ]
   },
   {
-    "id": "35005760.153d9",
+    "id": "678feee9.54f5e",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3869,
-    "y": 4973,
-    "z": "211aaefb.d906ea",
+    "x": 3925.566665649414,
+    "y": 5066.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "53b6adea.273794",
+    "id": "f4c6dae7.f846f8",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3879,
-    "y": 5808,
-    "z": "211aaefb.d906ea",
+    "x": 3935.566665649414,
+    "y": 5901.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8e19f306.cd166",
+    "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": 3906,
-    "y": 4280,
-    "z": "211aaefb.d906ea",
+    "x": 3958.566665649414,
+    "y": 4475.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "3fb1d79b.8d6fb8",
+    "id": "7bd89115.7af5d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4032,
-    "y": 5005,
-    "z": "211aaefb.d906ea",
+    "x": 4088.566665649414,
+    "y": 5098.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a4f5d754.33c548",
-        "77d0a120.a8d4c8",
-        "ea3dea31.55403",
-        "faf54698.eda79",
-        "e80f8be5.03c42",
-        "3b266df3.e7977a",
-        "f9147a44.abd5d"
+        "a830956d.47074",
+        "1755eaf4.354305",
+        "bc42d413.82595",
+        "e6e246b3.ed891",
+        "ea96eb7.ae6d798",
+        "64dc9cdb.f55c8c",
+        "8e94a286.9bf3d",
+        "f715ac9f.9b32b8",
+        "79d51ab0.5a125c"
       ]
     ]
   },
   {
-    "id": "30197835.1bf978",
+    "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": 5477,
-    "y": 4478,
-    "z": "211aaefb.d906ea",
+    "x": 5533.566665649414,
+    "y": 4571.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a4f5d754.33c548",
+    "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": 4424,
-    "y": 5156,
-    "z": "211aaefb.d906ea",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "cce2d7d9.b9218",
-    "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": 3916,
-    "y": 4335,
-    "z": "211aaefb.d906ea",
+    "x": 4466.566665649414,
+    "y": 5601.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "7aa2001.036a58",
+    "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": 3882,
-    "y": 3548,
-    "z": "211aaefb.d906ea",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "2d8b9b70.b52efc",
-    "type": "save",
-    "name": "save connectivityA relationship to UNI-LEAF, in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 3342,
-    "y": 1767,
-    "z": "211aaefb.d906ea",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "26382876.b9a68",
-    "type": "save",
-    "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-p-interface-short`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3249,
-    "y": 1714,
-    "z": "211aaefb.d906ea",
+    "x": 3937.566665649414,
+    "y": 3475.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "31c62db7.5b8522",
-    "type": "set",
-    "name": "set prop.connectivity-domainB-uuid=tmp.ROOT.uni-p-interface-long",
-    "xml": "<set>\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />\n",
-    "comments": "",
-    "x": 3932,
-    "y": 3251,
-    "z": "211aaefb.d906ea",
-    "wires": []
-  },
-  {
-    "id": "4d65e0ad.f66548",
+    "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": 3879,
-    "y": 2839,
-    "z": "211aaefb.d906ea",
+    "x": 3935.566665649414,
+    "y": 2932.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "799454e3.25827c",
+    "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3827,
-    "y": 2887,
-    "z": "211aaefb.d906ea",
+    "x": 3883.566665649414,
+    "y": 2980.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ca44c46f.688fa8",
+    "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": 3955,
-    "y": 2934,
-    "z": "211aaefb.d906ea",
+    "x": 4011.566665649414,
+    "y": 3027.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c038b97c.5e298",
+    "id": "49213484.6d2684",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 3792,
-    "y": 2797,
-    "z": "211aaefb.d906ea",
+    "x": 3848.566665649414,
+    "y": 2890.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3e5313a9.d78034",
+    "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='data-source' value='`$gfp`' />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />",
     "comments": "",
     "outputs": 1,
-    "x": 3789,
-    "y": 3025,
-    "z": "211aaefb.d906ea",
+    "x": 3845.566665649414,
+    "y": 3118.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "3f9a9e6f.0fc392",
+    "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": 3882,
-    "y": 3078,
-    "z": "211aaefb.d906ea",
+    "x": 3938.566665649414,
+    "y": 3171.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "281fc4fa.e1a84c",
+    "id": "8a16772c.f0d08",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 3773,
-    "y": 2981,
-    "z": "211aaefb.d906ea",
+    "x": 3829.566665649414,
+    "y": 3074.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9dc1c6e1.2dba4",
+    "id": "d8aa6375.55f12",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3779,
-    "y": 3431,
-    "z": "211aaefb.d906ea",
+    "x": 3833.566665649414,
+    "y": 3390.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "faf54698.eda79",
+    "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='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4346,
-    "y": 4486,
-    "z": "211aaefb.d906ea",
+    "x": 4402.566665649414,
+    "y": 4579.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "eb955021.5749d",
+    "id": "546f5300.a4bc44",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4330,
-    "y": 4442,
-    "z": "211aaefb.d906ea",
+    "x": 4386.566665649414,
+    "y": 4535.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b9a6d392.b28d6",
+    "id": "b36d849f.6b142",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5077,
-    "y": 4473,
-    "z": "211aaefb.d906ea",
+    "x": 5133.566665649414,
+    "y": 4566.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "bed8a2a5.609b9",
+    "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": 5164,
-    "y": 4515,
-    "z": "211aaefb.d906ea",
+    "x": 5220.566665649414,
+    "y": 4608.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "bbe5119a.b6b9a",
+    "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5112,
-    "y": 4563,
-    "z": "211aaefb.d906ea",
+    "x": 5168.566665649414,
+    "y": 4656.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "2aa44f99.3f02c8",
+    "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": 5240,
-    "y": 4610,
-    "z": "211aaefb.d906ea",
+    "x": 5296.566665649414,
+    "y": 4703.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "3b266df3.e7977a",
+    "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": 4417,
-    "y": 4895,
-    "z": "211aaefb.d906ea",
+    "x": 4473.566665649414,
+    "y": 4988.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "bd185a34.34e6a8",
+    "id": "f767aa90.80364",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4400,
-    "y": 4957,
-    "z": "211aaefb.d906ea",
+    "x": 4456.566665649414,
+    "y": 5050.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "77d0a120.a8d4c8",
+    "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": 4511,
-    "y": 4999,
-    "z": "211aaefb.d906ea",
+    "x": 4567.566665649414,
+    "y": 5092.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "915b754b.45601",
+    "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": 4959,
-    "y": 5052,
-    "z": "211aaefb.d906ea",
+    "x": 5015.566665649414,
+    "y": 5145.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8cb093f8.38739",
+    "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": 4269,
-    "y": 5750,
-    "z": "211aaefb.d906ea",
+    "x": 4325.566665649414,
+    "y": 5843.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "90b420e2.468d1",
+    "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='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4167,
-    "y": 5699,
-    "z": "211aaefb.d906ea",
+    "x": 4223.566665649414,
+    "y": 5792.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e890a410.6577f8",
+    "id": "5114dbce.799f0c",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4151,
-    "y": 5655,
-    "z": "211aaefb.d906ea",
+    "x": 4207.566665649414,
+    "y": 5748.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ca407fe0.a74b58",
+    "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.999755859375,
-    "y": 5853,
-    "z": "211aaefb.d906ea",
+    "x": 4993.566665649414,
+    "y": 6005.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea3dea31.55403",
+    "id": "bc42d413.82595",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4338,
-    "y": 5056,
-    "z": "211aaefb.d906ea",
+    "x": 4394.566665649414,
+    "y": 5149.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "130129c6.4e6896",
-        "c2790bbb.b39ef"
+        "5a8de4b.cef309c",
+        "99b44375.9d0098"
       ]
     ]
   },
   {
-    "id": "130129c6.4e6896",
+    "id": "5a8de4b.cef309c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4549,
-    "y": 5056,
-    "z": "211aaefb.d906ea",
+    "x": 4605.566665649414,
+    "y": 5149.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b2be4205.132768"
+        "41a866cb.6d5e88"
       ]
     ]
   },
   {
-    "id": "b2be4205.132768",
+    "id": "41a866cb.6d5e88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4705,
-    "y": 5052,
-    "z": "211aaefb.d906ea",
+    "x": 4761.566665649414,
+    "y": 5145.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "915b754b.45601",
-        "3264661d.b6671a",
-        "cf1a8f36.08af8"
+        "4953b8d7.b454c8",
+        "5f4b3cc4.eb62f4",
+        "76c11af1.9e9b94"
       ]
     ]
   },
   {
-    "id": "c2790bbb.b39ef",
+    "id": "99b44375.9d0098",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4545,
-    "y": 5104,
-    "z": "211aaefb.d906ea",
+    "x": 4601.566665649414,
+    "y": 5197.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1090c9ed.cf8dde"
+        "c40ddff0.38613"
       ]
     ]
   },
   {
-    "id": "1090c9ed.cf8dde",
+    "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": 4693,
-    "y": 5099,
-    "z": "211aaefb.d906ea",
+    "x": 4749.566665649414,
+    "y": 5192.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "53ad7751.2dcd08",
+    "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": 5201,
-    "y": 4681,
-    "z": "211aaefb.d906ea",
+    "x": 5257.566665649414,
+    "y": 4774.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "59db3330.69645c",
+    "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": 2367,
-    "y": 92,
-    "z": "211aaefb.d906ea",
+    "x": 2423.566665649414,
+    "y": 185.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "4ebbcee7.69b52",
+    "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": 2301,
-    "y": 128,
-    "z": "211aaefb.d906ea",
+    "x": 2357.566665649414,
+    "y": 221.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4ea5390e.a52cc",
+    "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": 2486,
-    "y": 55,
-    "z": "211aaefb.d906ea",
+    "x": 2542.566665649414,
+    "y": 148.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "37299dd0.22785a",
+    "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": 4236,
-    "y": 5816,
-    "z": "211aaefb.d906ea",
+    "x": 4292.566665649414,
+    "y": 5909.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "606aa5ab.2206bc",
+    "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": 4369,
-    "y": 5864,
-    "z": "211aaefb.d906ea",
+    "x": 4425.566665649414,
+    "y": 5957.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "17ac1f1.6d565e1",
+    "id": "64250c00.f41444",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4188,
-    "y": 5922,
-    "z": "211aaefb.d906ea",
+    "x": 4244.566665649414,
+    "y": 6015.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7b13241a.22fd54",
-        "f9b4895b.fbea48"
+        "24759095.ee144",
+        "cef50f43.3e9f48"
       ]
     ]
   },
   {
-    "id": "7b13241a.22fd54",
+    "id": "24759095.ee144",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4381,
-    "y": 5923,
-    "z": "211aaefb.d906ea",
+    "x": 4437.566665649414,
+    "y": 6016.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "827a3a72.ba4bd8"
+        "c0599a44.570328"
       ]
     ]
   },
   {
-    "id": "827a3a72.ba4bd8",
+    "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": 4537,
-    "y": 5920,
-    "z": "211aaefb.d906ea",
+    "x": 4593.566665649414,
+    "y": 6013.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f9b4895b.fbea48",
+    "id": "cef50f43.3e9f48",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4385,
-    "y": 5967,
-    "z": "211aaefb.d906ea",
+    "x": 4441.566665649414,
+    "y": 6060.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4c414c23.1dfa5c"
+        "2c2e6801.1f5998"
       ]
     ]
   },
   {
-    "id": "4c414c23.1dfa5c",
+    "id": "2c2e6801.1f5998",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4524,
-    "y": 5962,
-    "z": "211aaefb.d906ea",
+    "x": 4580.566665649414,
+    "y": 6055.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ca407fe0.a74b58",
-        "87b885a5.5cf0c8",
-        "7c94a6cd.50e738",
-        "9f0fa012.5d1bf",
-        "fafaba2.e8268c8",
-        "25a2525f.49399e",
-        "593dba4.344bf44",
-        "90f4ba85.137fb",
-        "52c2d3cf.976804",
-        "274ef282.e256ee",
-        "eba4a386.8ade58",
-        "91ff8ca0.2410d8"
+        "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": "593dba4.344bf44",
+    "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": 4721,
-    "y": 6641,
-    "z": "211aaefb.d906ea",
+    "x": 4777.566665649414,
+    "y": 6734.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a83c7fc2.c5da78",
-        "914d2791.9def8",
-        "a0fd345.ac08f48"
+        "f71173d.2556e9",
+        "36d425a2.cca582",
+        "63e9e58.35d851c"
       ]
     ]
   },
   {
-    "id": "a83c7fc2.c5da78",
+    "id": "f71173d.2556e9",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4926,
-    "y": 6638,
-    "z": "211aaefb.d906ea",
+    "x": 4982.566665649414,
+    "y": 6731.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c1df45ea.8ba52"
+        "211a75a9.b19e7a"
       ]
     ]
   },
   {
-    "id": "914d2791.9def8",
+    "id": "36d425a2.cca582",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4909.490966796875,
-    "y": 6699.574035644531,
-    "z": "211aaefb.d906ea",
+    "x": 4966.057632446289,
+    "y": 6793.140701293945,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "119f1b5d.4e6f5d"
+        "2ef14bb4.55e2cc"
       ]
     ]
   },
   {
-    "id": "a0fd345.ac08f48",
+    "id": "63e9e58.35d851c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4907,
-    "y": 6743,
-    "z": "211aaefb.d906ea",
+    "x": 4963.566665649414,
+    "y": 6836.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3791525f.f4d3fe"
+        "61cb6aef.0faa54"
       ]
     ]
   },
   {
-    "id": "c1df45ea.8ba52",
+    "id": "211a75a9.b19e7a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5082,
-    "y": 6652,
-    "z": "211aaefb.d906ea",
+    "x": 5138.566665649414,
+    "y": 6745.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "78ac2a8d.cd0874"
+        "1dafef09.17b7d9"
       ]
     ]
   },
   {
-    "id": "119f1b5d.4e6f5d",
+    "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": 5072.0623779296875,
-    "y": 6699.859771728516,
-    "z": "211aaefb.d906ea",
+    "x": 5128.629043579102,
+    "y": 6793.42643737793,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3791525f.f4d3fe",
+    "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": 5074,
-    "y": 6742,
-    "z": "211aaefb.d906ea",
+    "x": 5130.566665649414,
+    "y": 6835.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "78ac2a8d.cd0874",
+    "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": 5329,
-    "y": 6649,
-    "z": "211aaefb.d906ea",
+    "x": 5385.566665649414,
+    "y": 6742.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "110b3f91.4725e8"
+        "33d48bc3.4a3004"
       ]
     ]
   },
   {
-    "id": "110b3f91.4725e8",
+    "id": "33d48bc3.4a3004",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5566,
-    "y": 6645,
-    "z": "211aaefb.d906ea",
+    "x": 5622.566665649414,
+    "y": 6738.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e53605cc.b83c3"
+        "509c6355.839cf4"
       ]
     ]
   },
   {
-    "id": "cf79f711.acd51",
+    "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": 5809,
-    "y": 6617,
-    "z": "211aaefb.d906ea",
+    "x": 5865.566665649414,
+    "y": 6710.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f8a0a965.9fe23",
-        "b32c6358.b77858"
+        "4704615c.3c69f",
+        "3a6fe540.e42ee2"
       ]
     ]
   },
   {
-    "id": "f8a0a965.9fe23",
+    "id": "4704615c.3c69f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6014,
-    "y": 6637,
-    "z": "211aaefb.d906ea",
+    "x": 6070.566665649414,
+    "y": 6730.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e53605cc.b83c3"
+        "509c6355.839cf4"
       ]
     ]
   },
   {
-    "id": "b32c6358.b77858",
+    "id": "3a6fe540.e42ee2",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6013,
-    "y": 6590,
-    "z": "211aaefb.d906ea",
+    "x": 6069.566665649414,
+    "y": 6683.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e53605cc.b83c3",
+    "id": "509c6355.839cf4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4757,
-    "y": 6912,
-    "z": "211aaefb.d906ea",
+    "x": 4813.566665649414,
+    "y": 7005.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d173aa3d.6dc13"
+        "867fbf45.6b76e8"
       ]
     ]
   },
   {
-    "id": "fdc415c8.6a0598",
+    "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": 5606,
-    "y": 6817,
-    "z": "211aaefb.d906ea",
+    "x": 6275.566635131836,
+    "y": 6943.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "37d800ad.83215",
+    "id": "125d4567.492113",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4819,
-    "y": 6588,
-    "z": "211aaefb.d906ea",
+    "x": 4875.566665649414,
+    "y": 6681.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "25a2525f.49399e",
+    "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": 4703,
-    "y": 6437,
-    "z": "211aaefb.d906ea",
+    "x": 4757.566665649414,
+    "y": 6569.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5323ec48.960894",
+    "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": 5048,
-    "y": 6268,
-    "z": "211aaefb.d906ea",
+    "x": 5102.566665649414,
+    "y": 6400.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "de0031e3.730958"
+        "e8f56973.27478"
       ]
     ]
   },
   {
-    "id": "de0031e3.730958",
+    "id": "e8f56973.27478",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5268,
-    "y": 6274,
-    "z": "211aaefb.d906ea",
+    "x": 5322.566665649414,
+    "y": 6406.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2707e8d8.7ec9d"
+        "fde5a354.539f28"
       ]
     ]
   },
   {
-    "id": "2707e8d8.7ec9d",
+    "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": 5453,
-    "y": 6273,
-    "z": "211aaefb.d906ea",
+    "x": 5509.566665649414,
+    "y": 6366.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "37890125.bbe60e"
+        "575e4bf2.eff614"
       ]
     ]
   },
   {
-    "id": "37890125.bbe60e",
+    "id": "575e4bf2.eff614",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5645,
-    "y": 6276,
-    "z": "211aaefb.d906ea",
+    "x": 5701.566665649414,
+    "y": 6369.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "95332efd.102e7"
+        "d993f92.1703888"
       ]
     ]
   },
   {
-    "id": "95332efd.102e7",
+    "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": 5854,
-    "y": 6274,
-    "z": "211aaefb.d906ea",
+    "x": 5910.566665649414,
+    "y": 6367.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "90f4ba85.137fb",
+    "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": 4755,
-    "y": 6262,
-    "z": "211aaefb.d906ea",
+    "x": 4809.566665649414,
+    "y": 6394.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5323ec48.960894"
+        "cf763643.011b"
       ]
     ]
   },
   {
-    "id": "7c94a6cd.50e738",
+    "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": 4763,
-    "y": 6155,
-    "z": "211aaefb.d906ea",
+    "x": 4817.566665649414,
+    "y": 6287.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b0864a09.98f318",
-        "a95b7f6b.2686a",
-        "109466fa.601861"
+        "bc620ade.df0f58",
+        "6623a49b.f6c65c",
+        "19b34b3d.8c8655"
       ]
     ]
   },
   {
-    "id": "b0864a09.98f318",
+    "id": "bc620ade.df0f58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4999,
-    "y": 6138,
-    "z": "211aaefb.d906ea",
+    "x": 5053.566665649414,
+    "y": 6270.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "a95b7f6b.2686a",
+    "id": "6623a49b.f6c65c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4996,
-    "y": 6179,
-    "z": "211aaefb.d906ea",
+    "x": 5050.566665649414,
+    "y": 6311.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "109466fa.601861",
+    "id": "19b34b3d.8c8655",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5010,
-    "y": 6219,
-    "z": "211aaefb.d906ea",
+    "x": 5064.566665649414,
+    "y": 6351.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "9f0fa012.5d1bf",
+    "id": "9acad1b0.c8f3c8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4699,
-    "y": 6314,
-    "z": "211aaefb.d906ea",
+    "x": 4753.566665649414,
+    "y": 6446.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fafaba2.e8268c8",
+    "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": 4707,
-    "y": 6372,
-    "z": "211aaefb.d906ea",
+    "x": 4761.566665649414,
+    "y": 6504.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "87b885a5.5cf0c8",
+    "id": "d341cf2c.6ddc78",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4712,
-    "y": 6112,
-    "z": "211aaefb.d906ea",
+    "x": 4766.566665649414,
+    "y": 6244.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "aa72fa33.6435d",
+    "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": 4827,
-    "y": 6064,
-    "z": "211aaefb.d906ea",
+    "x": 4881.566665649414,
+    "y": 6196.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d173aa3d.6dc13",
+    "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": 5000,
-    "y": 6909,
-    "z": "211aaefb.d906ea",
+    "x": 5056.566665649414,
+    "y": 7002.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cecd58a1.5c073",
-        "a1afbc37.0664b8"
+        "ca20f18b.d4eba8",
+        "a546871e.5bfa7"
       ]
     ]
   },
   {
-    "id": "cecd58a1.5c073",
+    "id": "ca20f18b.d4eba8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5229,
-    "y": 6886,
-    "z": "211aaefb.d906ea",
+    "x": 5285.566665649414,
+    "y": 6979.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "217cc28.e6a45be"
+        "4274d693.44e7"
       ]
     ]
   },
   {
-    "id": "a1afbc37.0664b8",
+    "id": "a546871e.5bfa7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5229,
-    "y": 6935,
-    "z": "211aaefb.d906ea",
+    "x": 5285.566665649414,
+    "y": 7028.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "217cc28.e6a45be",
+    "id": "9d07c8b0.2ee89",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5390,
-    "y": 6891,
-    "z": "211aaefb.d906ea",
+    "x": 6018.566635131836,
+    "y": 7034.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "efcdc93a.a5e52",
-        "fdc415c8.6a0598",
-        "1d0e63ee.415bac"
+        "90c25785.3a5d5",
+        "b664359c.e37a3",
+        "9e3c844f.310898"
       ]
     ]
   },
   {
-    "id": "3c8e9462.ad4a14",
+    "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": 5734,
-    "y": 6871,
-    "z": "211aaefb.d906ea",
+    "x": 6403.566635131836,
+    "y": 6997.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1d0e63ee.415bac",
+    "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": 5704,
-    "y": 6931,
-    "z": "211aaefb.d906ea",
+    "x": 6373.566635131836,
+    "y": 7057.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "efcdc93a.a5e52",
+    "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": 5611,
-    "y": 6759,
-    "z": "211aaefb.d906ea",
+    "x": 6280.566635131836,
+    "y": 6885.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ff5eb6bb.d3898",
+    "id": "ba444b0.6d090b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3960,
-    "y": 5849,
-    "z": "211aaefb.d906ea",
+    "x": 4016.566665649414,
+    "y": 5942.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "90b420e2.468d1",
-        "37299dd0.22785a",
-        "606aa5ab.2206bc",
-        "17ac1f1.6d565e1",
-        "8cb093f8.38739"
+        "d715f85a.00ec7",
+        "8228476b.dfc93",
+        "394125b3.b0b57a",
+        "64250c00.f41444",
+        "b4d97863.c15da"
       ]
     ]
   },
   {
-    "id": "754638fa.2f5ed",
+    "id": "c0768f56.37d61",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4704,
-    "y": 6212,
-    "z": "211aaefb.d906ea",
+    "x": 4758.566665649414,
+    "y": 6344.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "52c2d3cf.976804",
+    "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.999755859375,
-    "y": 5934,
-    "z": "211aaefb.d906ea",
+    "x": 4886.566665649414,
+    "y": 6086.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "6227c2aa.a1e1a4",
+    "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.999755859375,
-    "y": 5884,
-    "z": "211aaefb.d906ea",
+    "x": 5023.566665649414,
+    "y": 6036.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a387df7d.b7b76",
+    "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='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3795,
-    "y": 3490,
-    "z": "211aaefb.d906ea",
+    "x": 3850.566665649414,
+    "y": 3429.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "a7eb3fa1.887168",
+    "id": "371edf0a.6e17f",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3977,
-    "y": 1745,
-    "z": "211aaefb.d906ea",
+    "x": 4028.566635131836,
+    "y": 1664.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c5a9fcf9.09d1b",
+    "id": "de567305.4a43d8",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3955,
-    "y": 2615,
-    "z": "211aaefb.d906ea",
+    "x": 4007.566604614258,
+    "y": 2176.566604614258,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7010bc9b.4157a4",
+    "id": "25146472.eb3624",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 3786,
-    "y": 3957,
-    "z": "211aaefb.d906ea",
+    "x": 3842.566665649414,
+    "y": 4050.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "2c9dde75.d2cff2",
+    "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": 3467,
-    "y": 5989,
-    "z": "211aaefb.d906ea",
+    "x": 3932.566665649414,
+    "y": 6430.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "6bdb71eb.cd7da",
+    "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": 3678,
-    "y": 4866,
-    "z": "211aaefb.d906ea",
+    "x": 3734.566665649414,
+    "y": 4959.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5ba113f8.d2a564",
+    "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": 3811,
-    "y": 4914,
-    "z": "211aaefb.d906ea",
+    "x": 3867.566665649414,
+    "y": 5007.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e80f8be5.03c42",
+    "id": "ea96eb7.ae6d798",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4357,
-    "y": 4542,
-    "z": "211aaefb.d906ea",
+    "x": 4413.566665649414,
+    "y": 4635.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8d6edd02.689f",
-        "977606e5.20b248"
+        "a8f10916.be28b",
+        "f59d19a8.d9c4d8"
       ]
     ]
   },
   {
-    "id": "8d6edd02.689f",
+    "id": "a8f10916.be28b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4550,
-    "y": 4543,
-    "z": "211aaefb.d906ea",
+    "x": 4606.566665649414,
+    "y": 4636.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5ee87f24.28a388"
+        "f728dec2.62b3a"
       ]
     ]
   },
   {
-    "id": "977606e5.20b248",
+    "id": "f59d19a8.d9c4d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4554,
-    "y": 4587,
-    "z": "211aaefb.d906ea",
+    "x": 4610.566665649414,
+    "y": 4680.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "89bf54cd.2d4a38"
+        "c09bd16a.0b32d"
       ]
     ]
   },
   {
-    "id": "89bf54cd.2d4a38",
+    "id": "c09bd16a.0b32d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4693,
-    "y": 4582,
-    "z": "211aaefb.d906ea",
+    "x": 4749.566665649414,
+    "y": 4675.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "32dd4db5.fb786a",
-        "c09e6974.d8d248",
-        "47355e53.0b694"
+        "d9114bfc.f7bce",
+        "6c2541da.5d16b8",
+        "b22f3c73.35c508"
       ]
     ]
   },
   {
-    "id": "5ee87f24.28a388",
+    "id": "f728dec2.62b3a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4693,
-    "y": 4539,
-    "z": "211aaefb.d906ea",
+    "x": 4749.566665649414,
+    "y": 4632.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bed8a2a5.609b9",
-        "bbe5119a.b6b9a",
-        "2aa44f99.3f02c8",
-        "53ad7751.2dcd08"
+        "df003672.bddd2",
+        "dbb46179.c47f78",
+        "837adbb2.1c01e8",
+        "e8bdf848.077f2"
       ]
     ]
   },
   {
-    "id": "32dd4db5.fb786a",
+    "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": 5095.000244140625,
-    "y": 4804,
-    "z": "211aaefb.d906ea",
+    "x": 5151.566909790039,
+    "y": 4897.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "62f002ed.2a5444",
+    "id": "430a9d16.e4affc",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5102.000244140625,
-    "y": 4758,
-    "z": "211aaefb.d906ea",
+    "x": 5158.566909790039,
+    "y": 4851.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "274ef282.e256ee",
+    "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": 4892,
-    "y": 6537,
-    "z": "211aaefb.d906ea",
+    "x": 4948.566665649414,
+    "y": 6630.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c09e6974.d8d248",
+    "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": 5213.000244140625,
-    "y": 4846,
-    "z": "211aaefb.d906ea",
+    "x": 5269.566909790039,
+    "y": 4939.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "3264661d.b6671a",
+    "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": 5088,
-    "y": 5104,
-    "z": "211aaefb.d906ea",
+    "x": 5144.566665649414,
+    "y": 5197.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "7ec54c4d.3b77ec",
+    "id": "c7484b6a.1b27e8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3642,
-    "y": 4464,
-    "z": "211aaefb.d906ea",
+    "x": 3489.566665649414,
+    "y": 4530.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f9f5a12a.cd0cc",
+    "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": 3976,
-    "y": 4647,
-    "z": "211aaefb.d906ea",
+    "x": 4011.566665649414,
+    "y": 4631.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "536ae5e9.b25a04",
+    "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": 3588,
-    "y": 4514,
-    "z": "211aaefb.d906ea",
+    "x": 3468.566665649414,
+    "y": 4574.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d61393d.72bde7",
-        "afea424c.c72b88",
-        "48da2e94.b0d678"
+        "a18c125a.02e14",
+        "7f2705d6.db1694",
+        "a9eb2c91.698e38"
       ]
     ]
   },
   {
-    "id": "afea424c.c72b88",
+    "id": "7f2705d6.db1694",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3815.490966796875,
-    "y": 4486.573974609375,
-    "z": "211aaefb.d906ea",
+    "x": 3657.057632446289,
+    "y": 4543.140884399414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "74d191cb.7bdf48"
+        "2e3353bd.ee574c"
       ]
     ]
   },
   {
-    "id": "48da2e94.b0d678",
+    "id": "a9eb2c91.698e38",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3811,
-    "y": 4530.999938964844,
-    "z": "211aaefb.d906ea",
+    "x": 3645.566665649414,
+    "y": 4582.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d340d8ff.74286"
+        "5c8fdc07.865394"
       ]
     ]
   },
   {
-    "id": "74d191cb.7bdf48",
+    "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": 3978.0625,
-    "y": 4485.859680175781,
-    "z": "211aaefb.d906ea",
+    "x": 3816.629165649414,
+    "y": 4541.426528930664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d340d8ff.74286",
+    "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": 3979,
-    "y": 4530.999938964844,
-    "z": "211aaefb.d906ea",
+    "x": 3806.566665649414,
+    "y": 4583.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "60eac93d.331ca",
+    "id": "9ccbfbe.3763808",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3764,
-    "y": 4604,
-    "z": "211aaefb.d906ea",
+    "x": 3808.566665649414,
+    "y": 4627.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a693b00.ef5e95",
-        "f9f5a12a.cd0cc"
+        "b718fb4d.1d2eb",
+        "8eb23d5.90166c"
       ]
     ]
   },
   {
-    "id": "d61393d.72bde7",
+    "id": "a18c125a.02e14",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3595,
-    "y": 4604,
-    "z": "211aaefb.d906ea",
+    "x": 3650.566665649414,
+    "y": 4619.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "60eac93d.331ca"
+        "9ccbfbe.3763808"
       ]
     ]
   },
   {
-    "id": "a693b00.ef5e95",
+    "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": 3953,
-    "y": 4596,
-    "z": "211aaefb.d906ea",
+    "x": 3969.566665649414,
+    "y": 4559.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5c19cae5.23f224",
+    "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": 3786,
-    "y": 4742,
-    "z": "211aaefb.d906ea",
+    "x": 3834.566665649414,
+    "y": 4898.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "a02818b5.44468",
+    "id": "3bda63fd.be934c",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5892.88330078125,
-    "y": 6554.88330078125,
-    "z": "211aaefb.d906ea",
+    "x": 5949.449966430664,
+    "y": 6648.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "47355e53.0b694",
+    "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": 5092.667236328125,
-    "y": 4942.08349609375,
-    "z": "211aaefb.d906ea",
+    "x": 5149.233901977539,
+    "y": 5035.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "be1641a6.50b31",
+    "id": "72bb0449.7c6c4c",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5094.884033203125,
-    "y": 4901.88330078125,
-    "z": "211aaefb.d906ea",
+    "x": 5151.450698852539,
+    "y": 4995.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cf1a8f36.08af8",
+    "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": 4968.6669921875,
-    "y": 5192.08349609375,
-    "z": "211aaefb.d906ea",
+    "x": 5025.233657836914,
+    "y": 5285.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "19ccdaa7.ec1b4d",
+    "id": "9cb7b649.72fc8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4970.8837890625,
-    "y": 5151.88330078125,
-    "z": "211aaefb.d906ea",
+    "x": 5027.450454711914,
+    "y": 5245.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "66b615d7.25ca4c",
+    "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": 5063.466796875,
-    "y": 5647.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5115.033462524414,
+    "y": 5648.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea12eeb9.12b1f",
+    "id": "9aeab5a.07483c8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4890.466796875,
-    "y": 5704.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 4942.033462524414,
+    "y": 5705.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7690697f.9ce41",
-        "27f9c6d9.503242"
+        "7adad055.f81858",
+        "1c623aa1.b56e9d"
       ]
     ]
   },
   {
-    "id": "7690697f.9ce41",
+    "id": "7adad055.f81858",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5101.466796875,
-    "y": 5704.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5153.033462524414,
+    "y": 5705.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "714a5cc9.4d7a1c"
+        "8b4d22b1.51563"
       ]
     ]
   },
   {
-    "id": "27f9c6d9.503242",
+    "id": "1c623aa1.b56e9d",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5097.466796875,
-    "y": 5752.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5149.033462524414,
+    "y": 5753.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b6a962d8.a724e8"
+        "1d139b8d.b9ffb4"
       ]
     ]
   },
   {
-    "id": "714a5cc9.4d7a1c",
+    "id": "8b4d22b1.51563",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5257.466796875,
-    "y": 5700.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5309.033462524414,
+    "y": 5701.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1ac18bef.6e71e4",
-        "b2d3bd46.bdd318",
-        "7d68f1ff.1c9d18"
+        "f5948089.056778",
+        "eda1ec63.f88a8",
+        "116803c1.b8c5c4"
       ]
     ]
   },
   {
-    "id": "b6a962d8.a724e8",
+    "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": 5245.466796875,
-    "y": 5747.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5297.033462524414,
+    "y": 5748.083267211914,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a02cbc6f.9fe0b8",
+    "id": "fa3077ab.1dba8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5523.3505859375,
-    "y": 5800.39990234375,
-    "z": "211aaefb.d906ea",
+    "x": 5618.917251586914,
+    "y": 5801.966567993164,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7d68f1ff.1c9d18",
+    "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": 5521.1337890625,
-    "y": 5840.60009765625,
-    "z": "211aaefb.d906ea",
+    "x": 5622.700454711914,
+    "y": 5840.166763305664,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b2d3bd46.bdd318",
+    "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": 5640.466796875,
-    "y": 5752.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5729.033462524414,
+    "y": 5753.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "1ac18bef.6e71e4",
+    "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": 5511.466796875,
-    "y": 5700.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5613.033462524414,
+    "y": 5701.083267211914,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a899461.9a784b8",
+    "id": "d30afa49.07b758",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4952.466796875,
-    "y": 5605.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5004.033462524414,
+    "y": 5606.083267211914,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "eba4a386.8ade58",
+    "id": "221756d1.77b252",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4659.7998046875,
-    "y": 5687.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 4716.366470336914,
+    "y": 5781.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "66b615d7.25ca4c",
-        "ea12eeb9.12b1f"
+        "ac700fc2.3e2c98",
+        "9aeab5a.07483c8",
+        "986cd5c9.02e9d",
+        "cfe4284f.245dc"
       ]
     ]
   },
   {
-    "id": "91ff8ca0.2410d8",
+    "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.832763671875,
-    "y": 5989.2001953125,
-    "z": "211aaefb.d906ea",
+    "x": 5016.399673461914,
+    "y": 6141.766860961914,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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": 5822.683334350586,
+    "y": 6978.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "4274d693.44e7",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5441.683334350586,
+    "y": 6981.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "9356e875.de45c8",
+        "f4fb32f5.290118",
+        "fc73441.6e16238"
+      ]
+    ]
+  },
+  {
+    "id": "f4fb32f5.290118",
+    "type": "switchNode",
+    "name": "switch $foundVpnName",
+    "xml": "<switch test=\"`$foundVpnName`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5667.683334350586,
+    "y": 7033.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "7d48e95d.36571"
+      ]
+    ]
+  },
+  {
+    "id": "7d48e95d.36571",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5846.683334350586,
+    "y": 7032.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "9d07c8b0.2ee89"
+      ]
+    ]
+  },
+  {
+    "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": 5668.683334350586,
+    "y": 6926.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "c7583bfe.6dbd",
+    "type": "notify",
+    "name": "notify",
+    "xml": "<notify plugin='' resource='' action='' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2662.683334350586,
+    "y": 975.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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": 3340.683334350586,
+    "y": 751.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "4ef95e12.fd687",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3556.683334350586,
+    "y": 1079.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "76cbe80c.f4e188",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3552.192398071289,
+    "y": 1122.109390258789,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "2e93ec7e.d04c6c",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3556.192367553711,
+    "y": 1170.109359741211,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "b4c3abcb.bb0aa8"
+      ]
+    ]
+  },
+  {
+    "id": "b4c3abcb.bb0aa8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3713.683334350586,
+    "y": 1169.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "c59d6859.c80d1"
+      ]
+    ]
+  },
+  {
+    "id": "c59d6859.c80d1",
+    "type": "switchNode",
+    "name": "switch nr type",
+    "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3883.683364868164,
+    "y": 1172.6834869384766,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "b806c285.3c1eb",
+        "1890bb58.2d4ee5",
+        "614f0a7f.a53cf4"
+      ]
+    ]
+  },
+  {
+    "id": "b806c285.3c1eb",
+    "type": "outcome",
+    "name": "ROOT",
+    "xml": "<outcome value='ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4057.683334350586,
+    "y": 1110.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "224fa1be.62b94e"
+      ]
+    ]
+  },
+  {
+    "id": "1890bb58.2d4ee5",
+    "type": "outcome",
+    "name": "LEAF",
+    "xml": "<outcome value='LEAF'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4059.683334350586,
+    "y": 1164.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "5ec2cf4e.ba2b2"
+      ]
+    ]
+  },
+  {
+    "id": "224fa1be.62b94e",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4185.683334350586,
+    "y": 1110.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "a900cf11.02bcd",
+        "1c2b8eb2.2e6009"
+      ]
+    ]
+  },
+  {
+    "id": "5ec2cf4e.ba2b2",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4188.683334350586,
+    "y": 1163.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "459af4e0.72f56c",
+        "8371ef21.19884"
+      ]
+    ]
+  },
+  {
+    "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": 4346.683334350586,
+    "y": 1134.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4363.683334350586,
+    "y": 1176.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4348.683334350586,
+    "y": 1214.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4360.683334350586,
+    "y": 1094.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "f4867be8.a3739",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4525.683334350586,
+    "y": 1110.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 3316.683334350586,
+    "y": 1096.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "4ef95e12.fd687",
+        "76cbe80c.f4e188",
+        "2e93ec7e.d04c6c"
+      ]
+    ]
+  },
+  {
+    "id": "614f0a7f.a53cf4",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4002.683334350586,
+    "y": 1228.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "7f1b4232.b1cfb4"
+      ]
+    ]
+  },
+  {
+    "id": "7f1b4232.b1cfb4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4176.683334350586,
+    "y": 1223.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "838abc45.59f7a",
+        "db00c52c.5ed268"
+      ]
+    ]
+  },
+  {
+    "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": 4346.683334350586,
+    "y": 1296.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4400.683334350586,
+    "y": 1256.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "ff2b32b5.5b2a08",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4514.683334350586,
+    "y": 1281.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "56529717.d57cf",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4073.683334350586,
+    "y": 984.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "ee2de2c6.4f08d8"
+      ]
+    ]
+  },
+  {
+    "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": 4417.683334350586,
+    "y": 1052.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4471.683334350586,
+    "y": 1012.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "494ac499.527a64",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4615.683334350586,
+    "y": 1041.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "ee2de2c6.4f08d8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4247.683334350586,
+    "y": 979.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "f04a072d.a1bc78",
+        "ca426e77.b8a868"
+      ]
+    ]
+  },
+  {
+    "id": "fbdccf10.5fabc",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4133.683334350586,
+    "y": 722.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "b0420846.4df49"
+      ]
+    ]
+  },
+  {
+    "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": 4477.683334350586,
+    "y": 790.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4531.683334350586,
+    "y": 750.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "fd3136c3.1f9f9",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4645.683334350586,
+    "y": 775.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "b0420846.4df49",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4307.683334350586,
+    "y": 717.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "bf3e885.5679178",
+        "6f89ab47.26e854"
+      ]
+    ]
+  },
+  {
+    "id": "d5e167ce.f19998",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3714.683334350586,
+    "y": 2599.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "eb74e655.05ff7",
+        "e886ebc1.1661e8"
+      ]
+    ]
+  },
+  {
+    "id": "47201997.7cc3c",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3542.016830444336,
+    "y": 2600.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "d5e167ce.f19998"
+      ]
+    ]
+  },
+  {
+    "id": "164be473.b70384",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3551.507797241211,
+    "y": 2643.257369995117,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "784aa04.7c1dfe",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3540.016830444336,
+    "y": 2689.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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": 4001.016830444336,
+    "y": 2603.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "3f64df6c.c641f8",
+        "e65de275.42f878"
+      ]
+    ]
+  },
+  {
+    "id": "e65de275.42f878",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4224.016830444336,
+    "y": 2558.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "34b4944b.960704"
+      ]
+    ]
+  },
+  {
+    "id": "3f64df6c.c641f8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4226.016830444336,
+    "y": 2622.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "699d84d7.6602fc"
+      ]
+    ]
+  },
+  {
+    "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": 3314.016830444336,
+    "y": 2635.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "47201997.7cc3c",
+        "164be473.b70384",
+        "784aa04.7c1dfe"
+      ]
+    ]
+  },
+  {
+    "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": 3275.016830444336,
+    "y": 2579.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 3334.016830444336,
+    "y": 2375.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "5e42c344.eae60c",
+        "af9299b9.b3a958"
+      ]
+    ]
+  },
+  {
+    "id": "af9299b9.b3a958",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3557.016830444336,
+    "y": 2361.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "9102a653.17d73"
+      ]
+    ]
+  },
+  {
+    "id": "5e42c344.eae60c",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3559.016830444336,
+    "y": 2394.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9102a653.17d73",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3705.016830444336,
+    "y": 2354.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "9818833d.58ad9",
+        "288d55d1.6f744a"
+      ]
+    ]
+  },
+  {
+    "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": 3899.016830444336,
+    "y": 2357.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 3952.016799926758,
+    "y": 2726.683303833008,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "f013a1b2.101138"
+      ]
+    ]
+  },
+  {
+    "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": 4158.016799926758,
+    "y": 2726.683303833008,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "386bba62.16259e"
+      ]
+    ]
+  },
+  {
+    "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": 3921.016830444336,
+    "y": 2425.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "50cea31f.42d1c4",
+        "35a7b03.f8d85d",
+        "21702f57.67315"
+      ]
+    ]
+  },
+  {
+    "id": "50cea31f.42d1c4",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4116.516952514648,
+    "y": 2377.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "295cc726.ea872"
+      ]
+    ]
+  },
+  {
+    "id": "35a7b03.f8d85d",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4108.516952514648,
+    "y": 2432.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "2c7fef61.a7451"
+      ]
+    ]
+  },
+  {
+    "id": "21702f57.67315",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4113.516952514648,
+    "y": 2489.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "9bbdca0e.a0cf58"
+      ]
+    ]
+  },
+  {
+    "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": 4265.516952514648,
+    "y": 2490.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "295cc726.ea872",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4260.899276733398,
+    "y": 2375.339126586914,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "723c9a0.e71c268"
+      ]
+    ]
+  },
+  {
+    "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": 3336.683334350586,
+    "y": 2714.683334350586,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "c2ddeb07.7a6948",
+    "type": "comment",
+    "name": "NOT NEEDED ANYMORE?",
+    "info": "",
+    "comments": "",
+    "x": 4011.683303833008,
+    "y": 2678.683303833008,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4385.016830444336,
+    "y": 2641.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "34b4944b.960704",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4389.016830444336,
+    "y": 2555.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "276189b1.3ed3ce",
+        "a978fa30.e2e848"
+      ]
+    ]
+  },
+  {
+    "id": "386bba62.16259e",
+    "type": "outcome",
+    "name": "tunnel-termination-point",
+    "xml": "<outcome value='tunnel-termination-point'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4375.302444458008,
+    "y": 2725.505081176758,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "89559da6.e6cb3"
+      ]
+    ]
+  },
+  {
+    "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": 4276.516952514648,
+    "y": 2435.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4559.016830444336,
+    "y": 2516.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4560.016830444336,
+    "y": 2621.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4555.016830444336,
+    "y": 2570.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "89559da6.e6cb3",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4582.133987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "8f483fd3.15e2b",
+        "5a0d7606.c42ec8",
+        "f5ace162.1d1728"
+      ]
+    ]
+  },
+  {
+    "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": 4797.133987426758,
+    "y": 2677.0237579345703,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4794.133987426758,
+    "y": 2716.0237579345703,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "be061b72.c7b818"
+      ]
+    ]
+  },
+  {
+    "id": "f5ace162.1d1728",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 4749.633987426758,
+    "y": 2758.0237579345703,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "b11d681f.057f4",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4843.016830444336,
+    "y": 2393.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "530fa7ff.bc17d"
+      ]
+    ]
+  },
+  {
+    "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": 4445.016830444336,
+    "y": 2389.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "46b1f311.91a404"
+      ]
+    ]
+  },
+  {
+    "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": 4640.016830444336,
+    "y": 2389.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "b11d681f.057f4",
+        "6f790d02.3c377c"
+      ]
+    ]
+  },
+  {
+    "id": "6f790d02.3c377c",
+    "type": "outcome",
+    "name": "network-resource",
+    "xml": "<outcome value='network-resource'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 4845.016830444336,
+    "y": 2466.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "e6043cfa.36703"
+      ]
+    ]
+  },
+  {
+    "id": "be061b72.c7b818",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4974.633987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "ce777f2e.3171a8"
+      ]
+    ]
+  },
+  {
+    "id": "ce777f2e.3171a8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5132.633987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "b697c93d.c44198"
+      ]
+    ]
+  },
+  {
+    "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": 5339.633987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "530fa7ff.bc17d",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5020.016830444336,
+    "y": 2385.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "5455e2bb.51abf4",
+        "38fcf2b0.31bbc6"
+      ]
+    ]
+  },
+  {
+    "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": 5228.016830444336,
+    "y": 2392.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "46db257f.be5d5c",
+        "10ef5dcf.987c42",
+        "cdb4ea9.23d2198"
+      ]
+    ]
+  },
+  {
+    "id": "e6043cfa.36703",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5022.016830444336,
+    "y": 2458.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "dba257b1.4bfa28"
+      ]
+    ]
+  },
+  {
+    "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": 5258.016830444336,
+    "y": 2340.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 5257.016830444336,
+    "y": 2582.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "46db257f.be5d5c",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5438.016830444336,
+    "y": 2383.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "40633d04.a1b504"
+      ]
+    ]
+  },
+  {
+    "id": "10ef5dcf.987c42",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5430.016830444336,
+    "y": 2438.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "7af2b98b.8d665"
+      ]
+    ]
+  },
+  {
+    "id": "cdb4ea9.23d2198",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5435.016830444336,
+    "y": 2495.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "f683ae7d.1eb048"
+      ]
+    ]
+  },
+  {
+    "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": 5587.016830444336,
+    "y": 2496.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 5598.016830444336,
+    "y": 2441.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "40633d04.a1b504",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5582.399154663086,
+    "y": 2381.339126586914,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "8b20e4dc.c76628"
+      ]
+    ]
+  },
+  {
+    "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": 5797.016830444336,
+    "y": 2377.6834564208984,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "c989c621.8b708",
+    "type": "switchNode",
+    "name": "switch secondary empty?",
+    "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3310.683334350586,
+    "y": 850.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "c25ccae3.59498",
+        "69b0287f.333378"
+      ]
+    ]
+  },
+  {
+    "id": "c25ccae3.59498",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3432.683364868164,
+    "y": 795.6833648681641,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "18001e31.10fe62"
+      ]
+    ]
+  },
+  {
+    "id": "69b0287f.333378",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3419.683364868164,
+    "y": 904.6833648681641,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "643ae015.6b3ff8"
+      ]
+    ]
+  },
+  {
+    "id": "18001e31.10fe62",
+    "type": "set",
+    "name": "set hasSecondary false",
+    "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
+    "comments": "",
+    "x": 3647.683334350586,
+    "y": 632.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "643ae015.6b3ff8",
+    "type": "set",
+    "name": "set hasSecondary true",
+    "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
+    "comments": "",
+    "x": 3643.683334350586,
+    "y": 676.6833343505859,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "25259a32.c04fe6",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3840.683364868164,
+    "y": 3576.683364868164,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "e17fd7c.5d8d2a8"
+      ]
+    ]
+  },
+  {
+    "id": "e17fd7c.5d8d2a8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4031.683364868164,
+    "y": 3580.683364868164,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "6f9d8ee6.40f9a8"
+      ]
+    ]
+  },
+  {
+    "id": "6f9d8ee6.40f9a8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4158.683364868164,
+    "y": 3579.683364868164,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "5d450f44.f186c8",
+        "87679aab.884488"
+      ]
+    ]
+  },
+  {
+    "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": 4380.683364868164,
+    "y": 3468.683364868164,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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": 3385.566665649414,
+    "y": 508.56666564941406,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4376.566665649414,
+    "y": 3527.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "a8e3fac.bdef108",
+        "d683cc3e.7534e8"
+      ]
+    ]
+  },
+  {
+    "id": "a8e3fac.bdef108",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4586.566665649414,
+    "y": 3504.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "d7e8440b.3d707"
+      ]
+    ]
+  },
+  {
+    "id": "d7e8440b.3d707",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4712.566665649414,
+    "y": 3504.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "23eff82f.a0dc88"
+      ]
+    ]
+  },
+  {
+    "id": "a5367218.35d1e",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4717.566665649414,
+    "y": 3553.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "67e71008.eb1898",
+        "df5e72dc.bc108",
+        "728f0d90.8753cc",
+        "8686c784.f837e"
+      ]
+    ]
+  },
+  {
+    "id": "d683cc3e.7534e8",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4591.566665649414,
+    "y": 3553.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "a5367218.35d1e"
+      ]
+    ]
+  },
+  {
+    "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": 5040.566665649414,
+    "y": 3501.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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": 4993.566665649414,
+    "y": 3592.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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",
+    "comments": "",
+    "outputs": 1,
+    "x": 4941.566665649414,
+    "y": 3634.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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": 5070.566665649414,
+    "y": 3676.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "41be2f96.b765f8",
+    "type": "comment",
+    "name": "Create SECONDARY-ROOT connectivity",
+    "info": "",
+    "comments": "",
+    "x": 4956.566665649414,
+    "y": 3549.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 5048.566665649414,
+    "y": 3724.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "561c7038.198b5",
+    "type": "comment",
+    "name": "Create SECONDARY-ROOT UNI",
+    "info": "",
+    "comments": "",
+    "x": 3868.566665649414,
+    "y": 3527.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "b87e18c5.0db5e8",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3843.566665649414,
+    "y": 4198.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "be1f4e62.15aa38"
+      ]
+    ]
+  },
+  {
+    "id": "be1f4e62.15aa38",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4035.566665649414,
+    "y": 4193.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "a0659afe.abed3"
+      ]
+    ]
+  },
+  {
+    "id": "a0659afe.abed3",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4164.566665649414,
+    "y": 4193.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "aacb47f4.be072"
+      ]
+    ]
+  },
+  {
+    "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": 4496.566665649414,
+    "y": 4191.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "88b90ca8.e250c",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3831.566665649414,
+    "y": 4422.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "d69507e0.d93c6"
+      ]
+    ]
+  },
+  {
+    "id": "d69507e0.d93c6",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4011.566665649414,
+    "y": 4421.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "280736a4.7aa0f2"
+      ]
+    ]
+  },
+  {
+    "id": "280736a4.7aa0f2",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4140.566665649414,
+    "y": 4421.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "ff5dea73.98b998"
+      ]
+    ]
+  },
+  {
+    "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": 4358.449966430664,
+    "y": 4420.449966430664,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "860e2e4b.61a0d8"
+      ]
+    ]
+  },
+  {
+    "id": "860e2e4b.61a0d8",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4573.449966430664,
+    "y": 4420.449966430664,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "3ff2617b.840e76"
+      ]
+    ]
+  },
+  {
+    "id": "3ff2617b.840e76",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4705.449966430664,
+    "y": 4420.449966430664,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "96149cb2.d633c"
+      ]
+    ]
+  },
+  {
+    "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": 5069.566665649414,
+    "y": 4419.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f0668881.7d6d6",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3506.566665649414,
+    "y": 4677.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "2492336a.68b20c"
+      ]
+    ]
+  },
+  {
+    "id": "2492336a.68b20c",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3686.566665649414,
+    "y": 4676.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "f54b8794.2acdd"
+      ]
+    ]
+  },
+  {
+    "id": "f54b8794.2acdd",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3815.566665649414,
+    "y": 4676.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "c3a4f53e.304d78"
+      ]
+    ]
+  },
+  {
+    "id": "84f57def.b063a",
+    "type": "comment",
+    "name": "Update SECONDARY-ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 3551.566665649414,
+    "y": 4735.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4117.566665649414,
+    "y": 4834.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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": 3581.566665649414,
+    "y": 4768.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "9d76d7ba.037948",
+        "c6779daf.7d7a8",
+        "62f3b274.175fb4"
+      ]
+    ]
+  },
+  {
+    "id": "c6779daf.7d7a8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3763.057632446289,
+    "y": 4746.140884399414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "168b9f85.394368"
+      ]
+    ]
+  },
+  {
+    "id": "62f3b274.175fb4",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3751.566665649414,
+    "y": 4785.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "6d9d5aec.85fd34"
+      ]
+    ]
+  },
+  {
+    "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": 3922.629165649414,
+    "y": 4744.426528930664,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 3912.566665649414,
+    "y": 4786.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "1514bf18.105d59",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3914.566665649414,
+    "y": 4830.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "16719b54.ca935d",
+        "cebbd661.72d4b8"
+      ]
+    ]
+  },
+  {
+    "id": "9d76d7ba.037948",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3756.566665649414,
+    "y": 4822.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "1514bf18.105d59"
+      ]
+    ]
+  },
+  {
+    "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": 4075.566665649414,
+    "y": 4762.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "993866bb.1b2058",
+    "type": "comment",
+    "name": "populate connectivity-C variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4441.566665649414,
+    "y": 5330.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4596.566665649414,
+    "y": 5371.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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": 5039.566665649414,
+    "y": 5419.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4412.566665649414,
+    "y": 5429.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "fbb7e2aa.d5f0a8",
+        "7443db3b.00f94c"
+      ]
+    ]
+  },
+  {
+    "id": "fbb7e2aa.d5f0a8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4648.566665649414,
+    "y": 5413.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "2a6159e8.abaf0e"
+      ]
+    ]
+  },
+  {
+    "id": "2a6159e8.abaf0e",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4792.566665649414,
+    "y": 5415.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "c2d27f90.576768",
+        "5c6afd36.faf1f4",
+        "86183466.e0956"
+      ]
+    ]
+  },
+  {
+    "id": "7443db3b.00f94c",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4647.566665649414,
+    "y": 5461.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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": 5160.566665649414,
+    "y": 5466.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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": 5042.233657836914,
+    "y": 5551.650161743164,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "85909b06.96d1d8",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 5043.450454711914,
+    "y": 5510.449966430664,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 5574.566665649414,
+    "y": 5898.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 4947.566665649414,
+    "y": 5908.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "67276eef.04fd3",
+        "9ce9471a.def67"
+      ]
+    ]
+  },
+  {
+    "id": "67276eef.04fd3",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5180.566665649414,
+    "y": 5902.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "7fd061d3.3dea5"
+      ]
+    ]
+  },
+  {
+    "id": "7fd061d3.3dea5",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5327.566665649414,
+    "y": 5910.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "d5d61aed.e9642",
+        "f7e19ea0.d5ede",
+        "ccb01b06.92e6a8"
+      ]
+    ]
+  },
+  {
+    "id": "9ce9471a.def67",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5181.566665649414,
+    "y": 5952.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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": 5695.566665649414,
+    "y": 5945.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "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": 5577.233657836914,
+    "y": 6030.650161743164,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e15ccbfd.b5904",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 5578.450454711914,
+    "y": 5989.449966430664,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "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": 5108.566665649414,
+    "y": 5858.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b4899b08.51e5b",
+    "type": "comment",
+    "name": "populate connectivity-C variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4942.566665649414,
+    "y": 5819.566665649414,
+    "z": "294b5e8a.041612",
+    "wires": []
+  },
+  {
+    "id": "c617e6ee.8b983",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3269.816665649414,
+    "y": 6428.816665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "9cb4bafc.51db",
+        "31675b48.f480a4"
+      ]
+    ]
+  },
+  {
+    "id": "9cb4bafc.51db",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3460.816665649414,
+    "y": 6432.816665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "4d6a56c7.6a325"
+      ]
+    ]
+  },
+  {
+    "id": "4d6a56c7.6a325",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3587.816665649414,
+    "y": 6431.816665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "c5539a8b.106aa"
+      ]
+    ]
+  },
+  {
+    "id": "31675b48.f480a4",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3456.816665649414,
+    "y": 6502.816665649414,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "8a9f9d03.ba9c7"
+      ]
+    ]
+  },
+  {
+    "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": 4006.316665649414,
+    "y": 6501.900161743164,
+    "z": "294b5e8a.041612",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "8a9f9d03.ba9c7",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3590.316665649414,
+    "y": 6504.900161743164,
+    "z": "294b5e8a.041612",
+    "wires": [
+      [
+        "9f506842.a5d348"
+      ]
+    ]
   }
 ]
\ No newline at end of file