Making sure not to use the same CLL instance name for all endpoints' description...
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / cloud_leased_line / GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
index 5989c10..f834a97 100644 (file)
@@ -1,20 +1,20 @@
 [\r
   {\r
-    "id": "77a1d01c.aa0f88",\r
+    "id": "760c3032.024ec8",\r
     "type": "dgstart",\r
     "name": "DGSTART",\r
     "outputs": 1,\r
-    "x": 168.56666564941406,\r
-    "y": 174.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 176.56666564941406,\r
+    "y": 129.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1e3c1648.671ee2"\r
+        "5c65c97e.4fcce"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1e3c1648.671ee2",\r
+    "id": "5c65c97e.4fcce",\r
     "type": "service-logic",\r
     "name": "GENERIC-RESOURCE-API ${project.version}",\r
     "module": "GENERIC-RESOURCE-API",\r
     "comments": "",\r
     "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}'>",\r
     "outputs": 1,\r
-    "x": 452.85235595703125,\r
-    "y": 235.8047742843628,\r
-    "z": "294b5e8a.041612",\r
+    "x": 460.85235595703125,\r
+    "y": 190.8047742843628,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "cf91a24a.cfe63"\r
+        "f52e4a2.8e9b7b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cf91a24a.cfe63",\r
+    "id": "f52e4a2.8e9b7b8",\r
     "type": "method",\r
     "name": "method cll-vnf-topology-operation-cll-create-clean",\r
     "xml": "<method rpc='cll-vnf-topology-operation-cll-create-clean' mode='sync'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 458.9952697753906,\r
-    "y": 320.5666961669922,\r
-    "z": "294b5e8a.041612",\r
+    "x": 466.9952697753906,\r
+    "y": 275.5666961669922,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8dc5a038.179a08"\r
+        "f52145b6.00f26"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8dc5a038.179a08",\r
+    "id": "f52145b6.00f26",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 808.5666656494141,\r
-    "y": 379.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 816.5666656494141,\r
+    "y": 334.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9b12be39.ac6768",\r
-        "27bb57a4.5f987",\r
-        "2a2da752.b59748"\r
+        "b781570d.1bdc6",\r
+        "a3b9d436.7cd37",\r
+        "916ad2e4.da3bd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9b12be39.ac6768",\r
+    "id": "b781570d.1bdc6",\r
     "type": "returnSuccess",\r
     "name": "return success",\r
     "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",\r
     "comments": "",\r
-    "x": 1109.900161743164,\r
-    "y": 650.4969635009766,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1117.900161743164,\r
+    "y": 605.4969635009766,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "27bb57a4.5f987",\r
+    "id": "a3b9d436.7cd37",\r
     "type": "save",\r
     "name": "get service-instance from aai",\r
     "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\">-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1131.328628540039,\r
-    "y": 352.8999786376953,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1139.328628540039,\r
+    "y": 307.8999786376953,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "6a4d10dc.68d4a",\r
-        "5691a128.aafbf8",\r
-        "5af1bedf.a7a338"\r
+        "a44b76d8.232f78",\r
+        "2fc87770.5a98b8",\r
+        "d48f40d3.37656"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6a4d10dc.68d4a",\r
+    "id": "a44b76d8.232f78",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1356.328628540039,\r
-    "y": 210.8999786376953,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1364.328628540039,\r
+    "y": 165.8999786376953,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "80bca2fd.976568"\r
+        "a9f7ac5b.dc2e28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5691a128.aafbf8",\r
+    "id": "2fc87770.5a98b8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1351.819595336914,\r
-    "y": 280.47401428222656,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1359.819595336914,\r
+    "y": 235.47401428222656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7f99fec5.4581e"\r
+        "87351fcb.5849e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5af1bedf.a7a338",\r
+    "id": "d48f40d3.37656",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1340.328628540039,\r
-    "y": 326.8999786376953,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1348.328628540039,\r
+    "y": 281.8999786376953,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "811c97ff.d24ba8"\r
+        "81b461.b8b3eba"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1663aedd.7a50f9",\r
+    "id": "ed4dfd16.f55a8",\r
     "type": "comment",\r
     "name": "new for TransportSlicing",\r
     "info": "",\r
     "comments": "",\r
-    "x": 1110.328628540039,\r
-    "y": 240.8999786376953,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1118.328628540039,\r
+    "y": 195.8999786376953,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2a2da752.b59748",\r
+    "id": "916ad2e4.da3bd",\r
     "type": "execute",\r
     "name": "execute properties",\r
     "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' />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1098.328628540039,\r
-    "y": 292.8999786376953,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1106.328628540039,\r
+    "y": 247.8999786376953,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "80bca2fd.976568",\r
+    "id": "a9f7ac5b.dc2e28",\r
     "type": "switchNode",\r
     "name": "switch allotted-resources_length != 0",\r
     "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1596.566665649414,\r
-    "y": 207.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1604.566665649414,\r
+    "y": 162.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9eedb337.58df9",\r
-        "1db64f77.692391"\r
+        "9413aaeb.d092f",\r
+        "4243f2e3.377954"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f99fec5.4581e",\r
+    "id": "87351fcb.5849e",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 1506.6290435791016,\r
-    "y": 283.4264373779297,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1514.6290435791016,\r
+    "y": 238.4264373779297,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "811c97ff.d24ba8",\r
+    "id": "81b461.b8b3eba",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 1510.566665649414,\r
-    "y": 327.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1518.566665649414,\r
+    "y": 282.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9eedb337.58df9",\r
+    "id": "9413aaeb.d092f",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1801.566665649414,\r
-    "y": 244.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1809.566665649414,\r
+    "y": 199.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e3d32c54.b9a328"\r
+        "41ee935e.7af694"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1db64f77.692391",\r
+    "id": "4243f2e3.377954",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1811.566665649414,\r
-    "y": 171.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1819.566665649414,\r
+    "y": 126.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e3d32c54.b9a328",\r
+    "id": "41ee935e.7af694",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1794.566665649414,\r
-    "y": 319.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1802.566665649414,\r
+    "y": 274.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "bb266e42.d64ce8",\r
-        "33816966.623666",\r
-        "6367b887.741ef",\r
-        "a5dc6d6.f390b9",\r
-        "c617e6ee.8b983"\r
+        "48c9f8b7.accfc",\r
+        "4b70868c.ca77",\r
+        "33568fb6.bac76",\r
+        "ed1c5832.299138",\r
+        "629500a0.f350c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "410f1f1c.a0bc8",\r
+    "id": "911385ff.dcfb6",\r
     "type": "save",\r
     "name": "get allotted-resource from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2280.566665649414,\r
-    "y": 370.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2288.566665649414,\r
+    "y": 325.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b15d3419.e56af8",\r
-        "8179030d.1dc9b8",\r
-        "c175e9c7.17a5f8"\r
+        "7bf84f8a.19dac",\r
+        "e93a24fd.89bb98",\r
+        "b3019feb.2307b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b15d3419.e56af8",\r
+    "id": "7bf84f8a.19dac",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2496.566665649414,\r
-    "y": 437.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2504.566665649414,\r
+    "y": 392.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e4dfd7bc.ebf1f8"\r
+        "28ff285d.675018"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8179030d.1dc9b8",\r
+    "id": "e93a24fd.89bb98",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2497.057632446289,\r
-    "y": 337.14064025878906,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2505.057632446289,\r
+    "y": 292.14064025878906,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a4be790d.e1feb"\r
+        "4ef0e01e.f3cdf"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c175e9c7.17a5f8",\r
+    "id": "b3019feb.2307b",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2492.566665649414,\r
-    "y": 386.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2500.566665649414,\r
+    "y": 341.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7226e4d.271f21c"\r
+        "2913a1dc.ae6786"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bb266e42.d64ce8",\r
+    "id": "48c9f8b7.accfc",\r
     "type": "for",\r
     "name": "for each allotted-resource",\r
     "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1997.566665649414,\r
-    "y": 351.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2005.566665649414,\r
+    "y": 306.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a610825f.3baab8",\r
-        "410f1f1c.a0bc8",\r
-        "5b668059.1f482",\r
-        "989a0e11.127538"\r
+        "8b66b4b0.d208d8",\r
+        "911385ff.dcfb6",\r
+        "79257077.5f1ff8",\r
+        "8a55fb57.dfc438"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a610825f.3baab8",\r
+    "id": "8b66b4b0.d208d8",\r
     "type": "set",\r
     "name": "set the current allotted-resource-id",\r
     "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 2277.566665649414,\r
-    "y": 289.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2285.566665649414,\r
+    "y": 244.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a5dc6d6.f390b9",\r
+    "id": "ed1c5832.299138",\r
     "type": "set",\r
     "name": "set tmp.arr",\r
     "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",\r
     "comments": "",\r
-    "x": 1971.566665649414,\r
-    "y": 301.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1979.566665649414,\r
+    "y": 256.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "33816966.623666",\r
+    "id": "4b70868c.ca77",\r
     "type": "get-resource",\r
     "name": "get-resource pnfs-list",\r
     "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\" >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2014.566665649414,\r
-    "y": 160.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2022.566665649414,\r
+    "y": 115.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6367b887.741ef",\r
+    "id": "33568fb6.bac76",\r
     "type": "get-resource",\r
     "name": "get-resource logical-links",\r
     "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\" >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2026.566665649414,\r
-    "y": 201.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2034.566665649414,\r
+    "y": 156.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bc72be6f.8dc5b",\r
+    "id": "2a477cee.98364c",\r
     "type": "comment",\r
     "name": "The following two nodes are for PCE",\r
     "info": "",\r
     "comments": "",\r
-    "x": 2051.566665649414,\r
-    "y": 113.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2059.566665649414,\r
+    "y": 68.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "999645ff.8d79f8",\r
+    "id": "11e969ea.04e966",\r
     "type": "set",\r
     "name": "set tmp.arr",\r
     "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",\r
     "comments": "",\r
-    "x": 1971.566665649414,\r
-    "y": 247.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 1979.566665649414,\r
+    "y": 202.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a4be790d.e1feb",\r
+    "id": "4ef0e01e.f3cdf",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 2675.566665649414,\r
-    "y": 339.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2683.566665649414,\r
+    "y": 294.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7226e4d.271f21c",\r
+    "id": "2913a1dc.ae6786",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 2675.504165649414,\r
-    "y": 388.70692443847656,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2683.504165649414,\r
+    "y": 343.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e4dfd7bc.ebf1f8",\r
+    "id": "28ff285d.675018",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2677.504165649414,\r
-    "y": 439.70692443847656,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2685.504165649414,\r
+    "y": 394.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4971434.1d7e03c"\r
+        "ef99d74f.4057d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4971434.1d7e03c",\r
+    "id": "ef99d74f.4057d",\r
     "type": "save",\r
     "name": "get allotted-resource relationship from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2970.504165649414,\r
-    "y": 386.70692443847656,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2978.504165649414,\r
+    "y": 341.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "24e6d7c1.5d2048",\r
-        "3ed3e5cb.f1266a",\r
-        "c01f466a.2c59b8"\r
+        "e456d5f.a155828",\r
+        "7848fc63.19f06c",\r
+        "64a94fba.40e7a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3ed3e5cb.f1266a",\r
+    "id": "7848fc63.19f06c",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3273.995101928711,\r
-    "y": 119.28089904785156,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3281.995101928711,\r
+    "y": 74.28089904785156,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "23469507.c7cb02"\r
+        "afcd1c40.b768f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "23469507.c7cb02",\r
+    "id": "afcd1c40.b768f",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 3451.566635131836,\r
-    "y": 119.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3459.566635131836,\r
+    "y": 74.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c01f466a.2c59b8",\r
+    "id": "64a94fba.40e7a",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3269.504135131836,\r
-    "y": 168.70692443847656,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3277.504135131836,\r
+    "y": 123.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "196361cf.857fbe"\r
+        "9649b9cd.238c78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "196361cf.857fbe",\r
+    "id": "9649b9cd.238c78",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3451.504135131836,\r
-    "y": 168.70692443847656,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3459.504135131836,\r
+    "y": 123.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "24e6d7c1.5d2048",\r
+    "id": "e456d5f.a155828",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3273.504135131836,\r
-    "y": 219.70692443847656,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3281.504135131836,\r
+    "y": 174.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "51b732b0.20c4ec"\r
+        "8fd753ef.f9f648"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "51b732b0.20c4ec",\r
+    "id": "8fd753ef.f9f648",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3453.504135131836,\r
-    "y": 219.70692443847656,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3461.504135131836,\r
+    "y": 174.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b7af5f8.780582"\r
+        "f37cd8dc.622f28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b7af5f8.780582",\r
+    "id": "f37cd8dc.622f28",\r
     "type": "switchNode",\r
     "name": "switch allotted-resource.relationship-list not empty",\r
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2989.566665649414,\r
-    "y": 514.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2997.566665649414,\r
+    "y": 469.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "73dd535b.21de04",\r
-        "941bba5e.9658d"\r
+        "d8de60b.2b55ea",\r
+        "6b2e15a0.33589c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "941bba5e.9658d",\r
+    "id": "6b2e15a0.33589c",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3329.566635131836,\r
-    "y": 361.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3337.566635131836,\r
+    "y": 316.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "73dd535b.21de04",\r
+    "id": "d8de60b.2b55ea",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3328.566635131836,\r
-    "y": 415.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3336.566635131836,\r
+    "y": 370.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "33242734.b6ef48"\r
+        "41425976.6167f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8e081bd8.979208",\r
+    "id": "d54e5594.aff43",\r
     "type": "outcome",\r
     "name": "network-policy",\r
     "xml": "<outcome value='network-policy'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4073.566635131836,\r
-    "y": 369.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4081.566635131836,\r
+    "y": 324.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ce0fbf14.8d016"\r
+        "20569ac4.3ebdd6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ce0fbf14.8d016",\r
+    "id": "20569ac4.3ebdd6",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4250.566513061523,\r
-    "y": 362.56654357910156,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4258.566513061523,\r
+    "y": 317.56654357910156,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1a44842.2180c7c",\r
-        "958a84e8.9fbc48"\r
+        "f7578f2.98aaff",\r
+        "fec27249.f43818"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "33242734.b6ef48",\r
+    "id": "41425976.6167f8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3492.566635131836,\r
-    "y": 341.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3500.566635131836,\r
+    "y": 296.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "afaee3e0.e6df98",\r
-        "db5b85f.aeb77f8"\r
+        "bf1caed6.dba4d",\r
+        "7892547.06584ac"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "afaee3e0.e6df98",\r
+    "id": "bf1caed6.dba4d",\r
     "type": "for",\r
     "name": "for each allotted-resource relationship",\r
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3773.566635131836,\r
-    "y": 297.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3781.566635131836,\r
+    "y": 252.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c2880ab0.c73eb"\r
+        "37857fb8.f82a48"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c2880ab0.c73eb",\r
+    "id": "37857fb8.f82a48",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4035.566635131836,\r
-    "y": 297.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4043.566635131836,\r
+    "y": 252.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8e081bd8.979208"\r
+        "d54e5594.aff43"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1a44842.2180c7c",\r
+    "id": "f7578f2.98aaff",\r
     "type": "set",\r
     "name": "set the 1st network-policy-id",\r
     "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",\r
     "comments": "",\r
-    "x": 4493.566513061523,\r
-    "y": 319.56654357910156,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4501.566513061523,\r
+    "y": 274.56654357910156,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "958a84e8.9fbc48",\r
+    "id": "fec27249.f43818",\r
     "type": "save",\r
     "name": "get network-policy from aai",\r
     "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\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4482.566513061523,\r
-    "y": 374.56654357910156,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4490.566513061523,\r
+    "y": 329.56654357910156,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4710cc76.36ad1c",\r
-        "efa019b.ed98a68",\r
-        "b08c41e4.127bd8"\r
+        "7d11439b.9c402c",\r
+        "1159889c.e4b977",\r
+        "672fe755.7cac68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b08c41e4.127bd8",\r
+    "id": "672fe755.7cac68",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4733.566879272461,\r
-    "y": 315.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4741.566879272461,\r
+    "y": 270.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7eb7952c.f46d84"\r
+        "8e6a85a9.42bd58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7eb7952c.f46d84",\r
+    "id": "8e6a85a9.42bd58",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4882.138412475586,\r
-    "y": 315.85243225097656,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4890.138412475586,\r
+    "y": 270.85243225097656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "dd0313dc.1a2988",\r
+    "id": "d22f2789.6a3cb",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 4881.075912475586,\r
-    "y": 359.99269104003906,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4889.075912475586,\r
+    "y": 314.99269104003906,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "efa019b.ed98a68",\r
+    "id": "1159889c.e4b977",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4722.075912475586,\r
-    "y": 359.99269104003906,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4730.075912475586,\r
+    "y": 314.99269104003906,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "dd0313dc.1a2988"\r
+        "d22f2789.6a3cb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4710cc76.36ad1c",\r
+    "id": "7d11439b.9c402c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4729.075912475586,\r
-    "y": 438.99269104003906,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4737.075912475586,\r
+    "y": 393.99269104003906,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fbbb1a1a.e2c5b8"\r
+        "1927fc16.6351c4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fbbb1a1a.e2c5b8",\r
+    "id": "1927fc16.6351c4",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4868.075912475586,\r
-    "y": 438.99269104003906,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4876.075912475586,\r
+    "y": 393.99269104003906,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7a803641.fde268",\r
-        "6a2b20cd.32701"\r
+        "4ec1a8d7.67b3c8",\r
+        "4af48fa4.c20fa"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7a803641.fde268",\r
+    "id": "4ec1a8d7.67b3c8",\r
     "type": "set",\r
     "name": "set the max bandwidth",\r
     "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",\r
     "comments": "",\r
-    "x": 5073.566879272461,\r
-    "y": 436.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5081.566879272461,\r
+    "y": 391.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6a2b20cd.32701",\r
+    "id": "4af48fa4.c20fa",\r
     "type": "set",\r
     "name": "set the max bandwidth",\r
     "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
     "comments": "",\r
-    "x": 5072.566879272461,\r
-    "y": 482.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5080.566879272461,\r
+    "y": 437.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "db5b85f.aeb77f8",\r
+    "id": "7892547.06584ac",\r
     "type": "for",\r
     "name": "for each allotted-resource relationship",\r
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3590.566635131836,\r
-    "y": 413.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3598.566635131836,\r
+    "y": 368.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3d651743.57b188"\r
+        "ea9b4d5b.2a42f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3d651743.57b188",\r
+    "id": "ea9b4d5b.2a42f8",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3870.566635131836,\r
-    "y": 413.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3878.566635131836,\r
+    "y": 368.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "823d6ddb.3083e8"\r
+        "476ea684.13443"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "823d6ddb.3083e8",\r
+    "id": "476ea684.13443",\r
     "type": "outcome",\r
     "name": "logical-link",\r
     "xml": "<outcome value='logical-link'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2253.5667877197266,\r
-    "y": 826.5667877197266,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2261.5667877197266,\r
+    "y": 781.5667877197266,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a4f7cdf6.5208e8"\r
+        "c7ca0b2.bde93f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a4f7cdf6.5208e8",\r
+    "id": "c7ca0b2.bde93f8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2430.566665649414,\r
-    "y": 819.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2438.566665649414,\r
+    "y": 774.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "eb8d4808.206a1",\r
-        "4f79166b.81752"\r
+        "86b11ccc.07eb1",\r
+        "5c684ea4.22866"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eb8d4808.206a1",\r
+    "id": "86b11ccc.07eb1",\r
     "type": "set",\r
     "name": "set the current logical-link-name",\r
     "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",\r
     "comments": "",\r
-    "x": 2673.566665649414,\r
-    "y": 776.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2681.566665649414,\r
+    "y": 731.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4f79166b.81752",\r
+    "id": "5c684ea4.22866",\r
     "type": "save",\r
     "name": "get logical-link from aai",\r
     "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\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2662.566665649414,\r
-    "y": 831.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2670.566665649414,\r
+    "y": 786.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "62989b79.9cfe9c",\r
-        "1988a7a4.ff123",\r
-        "85413e7a.b1b628"\r
+        "2c2754a5.0b7c2c",\r
+        "9ab044d8.9332",\r
+        "6aa476a7.c1db08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "62989b79.9cfe9c",\r
+    "id": "2c2754a5.0b7c2c",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2954.057632446289,\r
-    "y": 810.1406402587891,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2962.057632446289,\r
+    "y": 765.1406402587891,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f822b8e9.269d"\r
+        "606104a3.7d17dc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1988a7a4.ff123",\r
+    "id": "9ab044d8.9332",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2942.566665649414,\r
-    "y": 854.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2950.566665649414,\r
+    "y": 809.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b1dab01.deaad5"\r
+        "187a718c.4bcdf6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f822b8e9.269d",\r
+    "id": "606104a3.7d17dc",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 3102.629165649414,\r
-    "y": 810.4264068603516,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3110.629165649414,\r
+    "y": 765.4264068603516,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b1dab01.deaad5",\r
+    "id": "187a718c.4bcdf6",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3101.566665649414,\r
-    "y": 854.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3109.566665649414,\r
+    "y": 809.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "85413e7a.b1b628",\r
+    "id": "6aa476a7.c1db08",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2949.566665649414,\r
-    "y": 933.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2957.566665649414,\r
+    "y": 888.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fb178b5b.3c4ae8"\r
+        "9fd32ca0.d84048"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fb178b5b.3c4ae8",\r
+    "id": "9fd32ca0.d84048",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3088.566665649414,\r
-    "y": 933.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3096.566665649414,\r
+    "y": 888.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e94ce0e6.cdcf4",\r
-        "2a0a2d05.627212",\r
-        "2d29cc30.4d633c",\r
-        "8255fb50.a7b88",\r
-        "ea28bb0a.303ea8",\r
-        "4b5b0bf9.d92b04",\r
-        "42798389.0acfb4",\r
-        "29a6af57.132c2",\r
-        "18652387.ef4d1c",\r
-        "c49ed897.0159e8",\r
-        "9d2ec307.fb07b8",\r
-        "c81a19d9.9b256",\r
-        "b5b402c1.c35e88",\r
-        "84774758.102ed8",\r
-        "17e6527f.ea49de",\r
-        "c22e8ab9.0a6b88",\r
-        "647f2e19.e50158",\r
-        "9c75cfb6.9dae68",\r
-        "9a8ce081.e6446",\r
-        "c989c621.8b708",\r
-        "88b89d66.20648"\r
+        "7a7db7d4.95d8d",\r
+        "95e88e5b.59dc68",\r
+        "ccbad682.f9f6e",\r
+        "51c5f691.62046",\r
+        "c524ae07.05ca4",\r
+        "573995f0.c3e824",\r
+        "40c97410.34efdc",\r
+        "3ceacdf9.dad772",\r
+        "37ff3aef.9a54ee",\r
+        "a62852b2.29136",\r
+        "e4c9b14e.e493e",\r
+        "a5e91f89.51e28",\r
+        "6a1545ce.c6f074",\r
+        "fcc163b9.6d6e2",\r
+        "c9e93381.966988",\r
+        "5fc9799.82ba788",\r
+        "7ebd6769.0b5428",\r
+        "9fbb56ee.c43378",\r
+        "387e5bde.fd50e4",\r
+        "a78822a6.5321b",\r
+        "a4c94b0b.1b4718"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "31581a8c.76364e",\r
+    "id": "8a5fb9f9.eee92",\r
     "type": "execute",\r
     "name": "execute UUID generator for ethernet-service-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3437.566665649414,\r
-    "y": 467.56663513183594,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3445.566665649414,\r
+    "y": 422.56663513183594,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e94ce0e6.cdcf4",\r
+    "id": "7a7db7d4.95d8d",\r
     "type": "execute",\r
     "name": "execute UUID generator for otn-tunnel-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3418.566604614258,\r
-    "y": 546.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3426.566604614258,\r
+    "y": 501.56663513183594,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "84774758.102ed8",\r
+    "id": "fcc163b9.6d6e2",\r
     "type": "set",\r
     "name": "set new ethernet-service-name",\r
     "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",\r
     "comments": "",\r
-    "x": 3375.566604614258,\r
-    "y": 591.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3383.566604614258,\r
+    "y": 546.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2a0a2d05.627212",\r
+    "id": "95e88e5b.59dc68",\r
     "type": "set",\r
     "name": "set network-route-one",\r
     "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3340.566635131836,\r
-    "y": 645.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3348.566635131836,\r
+    "y": 600.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2d29cc30.4d633c",\r
+    "id": "ccbad682.f9f6e",\r
     "type": "set",\r
     "name": "set network-route-two",\r
     "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3341.566635131836,\r
-    "y": 700.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3349.566635131836,\r
+    "y": 655.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8255fb50.a7b88",\r
+    "id": "51c5f691.62046",\r
     "type": "save",\r
     "name": "get network-route-one from aai",\r
     "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\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3339.566635131836,\r
-    "y": 964.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3347.566635131836,\r
+    "y": 919.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "bc9dba3e.42915",\r
-        "4ccb40e3.75eb",\r
-        "6e77d52e.d49a5c"\r
+        "ab7d525c.39024",\r
+        "e9514e17.b4663",\r
+        "e95aa54a.0cb1c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ea28bb0a.303ea8",\r
+    "id": "c524ae07.05ca4",\r
     "type": "save",\r
     "name": "get network-route-two from aai",\r
     "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\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3334.566635131836,\r
-    "y": 1025.5665130615234,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3342.566635131836,\r
+    "y": 980.5665130615234,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ddf0ef9b.af495",\r
-        "d012a2e6.7e886",\r
-        "c732ba74.e6ac38"\r
+        "ba38cd77.3ddd8",\r
+        "3fe85825.5036d",\r
+        "4b77c928.b0503"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bc9dba3e.42915",\r
+    "id": "ab7d525c.39024",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3650.566635131836,\r
-    "y": 735.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3658.566635131836,\r
+    "y": 690.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d26a86c.70f36f8"\r
+        "a41dfa2.144c608"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4ccb40e3.75eb",\r
+    "id": "e9514e17.b4663",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3646.075668334961,\r
-    "y": 784.9926605224609,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3654.075668334961,\r
+    "y": 739.9926605224609,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3592fdd4.1e4502"\r
+        "88fea61b.80803"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6e77d52e.d49a5c",\r
+    "id": "e95aa54a.0cb1c8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3650.075668334961,\r
-    "y": 837.9926605224609,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3658.075668334961,\r
+    "y": 792.9926605224609,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f6681e1c.b1626"\r
+        "5f495b77.8e475c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d26a86c.70f36f8",\r
+    "id": "a41dfa2.144c608",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 3799.138168334961,\r
-    "y": 734.8524017333984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3807.138168334961,\r
+    "y": 689.8524017333984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3592fdd4.1e4502",\r
+    "id": "88fea61b.80803",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3789.075668334961,\r
-    "y": 784.9926605224609,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3797.075668334961,\r
+    "y": 739.9926605224609,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ddf0ef9b.af495",\r
+    "id": "ba38cd77.3ddd8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3612.566604614258,\r
-    "y": 925.5664825439453,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3620.566604614258,\r
+    "y": 880.5664825439453,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "275632fb.e09a86"\r
+        "5d8c160b.0c4ea8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d012a2e6.7e886",\r
+    "id": "3fe85825.5036d",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3608.075668334961,\r
-    "y": 967.9925384521484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3616.075668334961,\r
+    "y": 922.9925384521484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "984e984a.f448c8"\r
+        "b6433621.de36a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c732ba74.e6ac38",\r
+    "id": "4b77c928.b0503",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3609.075668334961,\r
-    "y": 1020.9925384521484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3617.075668334961,\r
+    "y": 975.9925384521484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2eeb8181.d4367e"\r
+        "999aafa8.043a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "275632fb.e09a86",\r
+    "id": "5d8c160b.0c4ea8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 3761.138137817383,\r
-    "y": 924.8522491455078,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3769.138137817383,\r
+    "y": 879.8522491455078,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "984e984a.f448c8",\r
+    "id": "b6433621.de36a",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3751.075668334961,\r
-    "y": 967.9925384521484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3759.075668334961,\r
+    "y": 922.9925384521484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f6681e1c.b1626",\r
+    "id": "5f495b77.8e475c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3811.566635131836,\r
-    "y": 837.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3819.566635131836,\r
+    "y": 792.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "caab91f.12177f"\r
+        "f4d50ce3.687d98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2eeb8181.d4367e",\r
+    "id": "999aafa8.043a8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3762.566635131836,\r
-    "y": 1020.5665130615234,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3770.566635131836,\r
+    "y": 975.5665130615234,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9eb76f3a.cfcbd8"\r
+        "6c0d4a32.4f3524"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "caab91f.12177f",\r
+    "id": "f4d50ce3.687d98",\r
     "type": "switchNode",\r
     "name": "switch nr type",\r
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3986.566635131836,\r
-    "y": 811.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3994.566635131836,\r
+    "y": 766.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2172bcb.4fd5b44",\r
-        "c6b4aa53.9764a8",\r
-        "fbdccf10.5fabc"\r
+        "e8eddbb7.6cfbd",\r
+        "54846c0d.33a74c",\r
+        "b03ebc69.8e68d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9eb76f3a.cfcbd8",\r
+    "id": "6c0d4a32.4f3524",\r
     "type": "switchNode",\r
     "name": "switch nr type",\r
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3946.566635131836,\r
-    "y": 928.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3954.566635131836,\r
+    "y": 883.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "572a469b.71d458",\r
-        "b8b0db7f.0d0b98",\r
-        "56529717.d57cf"\r
+        "4f37a3d1.2e362c",\r
+        "efd815b8.8e6db8",\r
+        "65095290.735c7c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2172bcb.4fd5b44",\r
+    "id": "e8eddbb7.6cfbd",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4108.566635131836,\r
-    "y": 596.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4116.566635131836,\r
+    "y": 551.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b34792b6.2f84b"\r
+        "c7edad0e.b216"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c6b4aa53.9764a8",\r
+    "id": "54846c0d.33a74c",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4110.566635131836,\r
-    "y": 650.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4118.566635131836,\r
+    "y": 605.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8791b1f2.9fddd"\r
+        "d5f61daa.4b4388"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "572a469b.71d458",\r
+    "id": "4f37a3d1.2e362c",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4127.566665649414,\r
-    "y": 866.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4135.566665649414,\r
+    "y": 821.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2e043645.b8ff02"\r
+        "81e90993.f1d9a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b8b0db7f.0d0b98",\r
+    "id": "efd815b8.8e6db8",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4129.566665649414,\r
-    "y": 920.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4137.566665649414,\r
+    "y": 875.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8eeda316.6df7"\r
+        "da2103e1.15169"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9e47fb61.f661c8",\r
+    "id": "f5d37541.2d47c8",\r
     "type": "set",\r
     "name": "set network-route-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4418.566635131836,\r
-    "y": 548.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4426.566635131836,\r
+    "y": 503.56663513183594,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "21b58670.3a1192",\r
+    "id": "2bfe954c.51473a",\r
     "type": "set",\r
     "name": "set network-route-LEAF",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4411.566635131836,\r
-    "y": 646.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4419.566635131836,\r
+    "y": 601.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d0dd5f40.4b5f38",\r
+    "id": "9391f162.46d07",\r
     "type": "set",\r
     "name": "set network-route-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4429.566665649414,\r
-    "y": 839.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4437.566665649414,\r
+    "y": 794.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d70d7c37.e21f5",\r
+    "id": "8da0410.b4be6c",\r
     "type": "set",\r
     "name": "set network-route-LEAF",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4433.566665649414,\r
-    "y": 932.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4441.566665649414,\r
+    "y": 887.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a539fdfb.953e38",\r
+    "id": "c685a00a.7f3668",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3576.566665649414,\r
-    "y": 1604.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3584.566665649414,\r
+    "y": 1559.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7f7f51c3.cfe0e"\r
+        "3e8c64de.c5d6ac"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a32c9d1e.59f95",\r
+    "id": "c307eb50.c4efc",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3586.057632446289,\r
-    "y": 1647.1407012939453,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3594.057632446289,\r
+    "y": 1602.1407012939453,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ea2bacf1.80819"\r
+        "a457c21e.dc24c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fb2990eb.3d37b8",\r
+    "id": "fe413554.38fd68",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3574.566665649414,\r
-    "y": 1693.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3582.566665649414,\r
+    "y": 1648.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "495659dd.a8b668"\r
+        "f7393df4.54a488"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c88f575a.f847c",\r
+    "id": "940c17a9.af2df",\r
     "type": "comment",\r
     "name": "Question?",\r
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
     "comments": "",\r
-    "x": 3276.566665649414,\r
-    "y": 1566.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3284.566665649414,\r
+    "y": 1521.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "42798389.0acfb4",\r
+    "id": "40c97410.34efdc",\r
     "type": "save",\r
     "name": "get p-interface-src from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3319.566665649414,\r
-    "y": 1631.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3327.566665649414,\r
+    "y": 1586.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a539fdfb.953e38",\r
-        "a32c9d1e.59f95",\r
-        "fb2990eb.3d37b8"\r
+        "c685a00a.7f3668",\r
+        "c307eb50.c4efc",\r
+        "fe413554.38fd68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4b5b0bf9.d92b04",\r
+    "id": "573995f0.c3e824",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3320.566665649414,\r
-    "y": 1301.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3328.566665649414,\r
+    "y": 1256.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7927223e.403f8c",\r
-        "cb61ec61.ad89d"\r
+        "ce053797.967e5",\r
+        "1d8318a4.118f1f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cb61ec61.ad89d",\r
+    "id": "1d8318a4.118f1f",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3541.566635131836,\r
-    "y": 1354.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3549.566635131836,\r
+    "y": 1309.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b9b2d4da.80c098"\r
+        "d7acba72.b8d088"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7927223e.403f8c",\r
+    "id": "ce053797.967e5",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3543.566635131836,\r
-    "y": 1387.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3551.566635131836,\r
+    "y": 1342.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3bca8d9d.c75392"\r
+        "b936608f.415c9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f7f51c3.cfe0e",\r
+    "id": "3e8c64de.c5d6ac",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3749.233169555664,\r
-    "y": 1603.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3757.233169555664,\r
+    "y": 1558.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f7adce7b.f663c8",\r
-        "aab5a13f.7b9228"\r
+        "61a62886.979d9",\r
+        "69747a1f.4d36a4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ea2bacf1.80819",\r
+    "id": "a457c21e.dc24c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 3739.6290435791016,\r
-    "y": 1650.4264373779297,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3747.6290435791016,\r
+    "y": 1605.4264373779297,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "495659dd.a8b668",\r
+    "id": "f7393df4.54a488",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3743.566665649414,\r
-    "y": 1694.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3751.566665649414,\r
+    "y": 1649.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f7adce7b.f663c8",\r
+    "id": "61a62886.979d9",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4013.566665649414,\r
-    "y": 1587.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4021.566665649414,\r
+    "y": 1542.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "eba55ae6.b47008",\r
-        "a5049a4a.932988"\r
+        "d27c3919.e4f1e8",\r
+        "744ce69a.cd2cd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a5049a4a.932988",\r
+    "id": "744ce69a.cd2cd",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4236.566665649414,\r
-    "y": 1542.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4244.566665649414,\r
+    "y": 1497.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b0af1c9f.1d33f"\r
+        "d24d75df.899958"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eba55ae6.b47008",\r
+    "id": "d27c3919.e4f1e8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4238.566665649414,\r
-    "y": 1606.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4246.566665649414,\r
+    "y": 1561.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3044898a.b774b6"\r
+        "195cae09.6a270a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3044898a.b774b6",\r
+    "id": "195cae09.6a270a",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 4400.566665649414,\r
-    "y": 1602.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4408.566665649414,\r
+    "y": 1557.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b0af1c9f.1d33f",\r
+    "id": "d24d75df.899958",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4401.566665649414,\r
-    "y": 1539.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4409.566665649414,\r
+    "y": 1494.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3cd7ef1e.9f6f38",\r
-        "782ad12.44a143"\r
+        "64761578.742944",\r
+        "545ae19b.2a1238"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3bca8d9d.c75392",\r
+    "id": "b936608f.415c9",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 3686.566635131836,\r
-    "y": 1384.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3694.566635131836,\r
+    "y": 1339.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b9b2d4da.80c098",\r
+    "id": "d7acba72.b8d088",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3689.566635131836,\r
-    "y": 1347.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3697.566635131836,\r
+    "y": 1302.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2e849446.924674",\r
-        "15f06507.bc03a3"\r
+        "66afead4.578fec",\r
+        "d914a00d.43d42"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2e849446.924674",\r
+    "id": "66afead4.578fec",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "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",\r
     "comments": "",\r
-    "x": 3863.566635131836,\r
-    "y": 1303.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3871.566635131836,\r
+    "y": 1258.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "aab5a13f.7b9228",\r
+    "id": "69747a1f.4d36a4",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3962.566635131836,\r
-    "y": 1697.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3970.566635131836,\r
+    "y": 1652.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7f3dbf41.0b7cb"\r
+        "6692ad9d.63a244"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f3dbf41.0b7cb",\r
+    "id": "6692ad9d.63a244",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4168.566635131836,\r
-    "y": 1697.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4176.566635131836,\r
+    "y": 1652.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "33161afe.bf5fb6"\r
+        "efeaf290.376e48"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "33161afe.bf5fb6",\r
+    "id": "efeaf290.376e48",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4383.852279663086,\r
-    "y": 1697.388412475586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4391.852279663086,\r
+    "y": 1652.388412475586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d1f5e6bd.d6c388"\r
+        "9388038d.e5f508"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "15f06507.bc03a3",\r
+    "id": "d914a00d.43d42",\r
     "type": "get-resource",\r
     "name": "get-resource src pnf",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3878.566635131836,\r
-    "y": 1414.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3886.566635131836,\r
+    "y": 1369.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "609f91e1.96d3c",\r
-        "c5dd830a.81bd98",\r
-        "f762b67a.3d2c8"\r
+        "3150a2ed.678f16",\r
+        "5769f8b6.da962",\r
+        "c8b63edf.598bb8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "609f91e1.96d3c",\r
+    "id": "3150a2ed.678f16",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4074.0667572021484,\r
-    "y": 1366.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4082.0667572021484,\r
+    "y": 1321.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "964976f5.819d98"\r
+        "47f6939a.0cca7c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c5dd830a.81bd98",\r
+    "id": "5769f8b6.da962",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4066.0667572021484,\r
-    "y": 1421.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4074.0667572021484,\r
+    "y": 1376.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "bf5b62.bbb734a"\r
+        "dfce5624.4d0e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f762b67a.3d2c8",\r
+    "id": "c8b63edf.598bb8",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4071.0667572021484,\r
-    "y": 1478.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4079.0667572021484,\r
+    "y": 1433.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "bc48235e.ca1af8"\r
+        "16d53904.a69817"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bc48235e.ca1af8",\r
+    "id": "16d53904.a69817",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4223.066757202148,\r
-    "y": 1479.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4231.066757202148,\r
+    "y": 1434.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bf5b62.bbb734a",\r
+    "id": "dfce5624.4d0e8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4234.066757202148,\r
-    "y": 1424.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4242.066757202148,\r
+    "y": 1379.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "964976f5.819d98",\r
+    "id": "47f6939a.0cca7c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4218.449081420898,\r
-    "y": 1364.2223052978516,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4226.449081420898,\r
+    "y": 1319.2223052978516,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "242018b6.f49c88"\r
+        "57719ed2.829e5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "242018b6.f49c88",\r
+    "id": "57719ed2.829e5",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4402.566635131836,\r
-    "y": 1378.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4410.566635131836,\r
+    "y": 1333.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fc08eb6a.2320e"\r
+        "8b55301b.b943a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "782ad12.44a143",\r
+    "id": "545ae19b.2a1238",\r
     "type": "set",\r
     "name": "set ltpId",\r
     "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",\r
     "comments": "",\r
-    "x": 4571.566665649414,\r
-    "y": 1497.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4579.566665649414,\r
+    "y": 1452.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3cd7ef1e.9f6f38",\r
+    "id": "64761578.742944",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",\r
     "comments": "",\r
-    "x": 4572.566665649414,\r
-    "y": 1605.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4580.566665649414,\r
+    "y": 1560.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9dc8c404.7ec36",\r
+    "id": "3bbb3a78.1e825e",\r
     "type": "comment",\r
     "name": "TODO: FIXME",\r
     "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",\r
     "comments": "",\r
-    "x": 4573.566665649414,\r
-    "y": 1554.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4581.566665649414,\r
+    "y": 1509.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d1f5e6bd.d6c388",\r
+    "id": "9388038d.e5f508",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4590.683822631836,\r
-    "y": 1697.906967163086,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4598.683822631836,\r
+    "y": 1652.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "333e33dc.560624",\r
-        "7db36be0.62778c",\r
-        "5d7040fa.99ac2"\r
+        "13805827.ade3d",\r
+        "a9502d93.1e2b78",\r
+        "a1b1941b.f9c738"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "333e33dc.560624",\r
+    "id": "13805827.ade3d",\r
     "type": "set",\r
     "name": "set source ttp-id",\r
     "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",\r
     "comments": "",\r
-    "x": 4805.683822631836,\r
-    "y": 1659.906967163086,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4813.683822631836,\r
+    "y": 1614.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7db36be0.62778c",\r
+    "id": "a9502d93.1e2b78",\r
     "type": "get-resource",\r
     "name": "get-resource src TTP",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4802.683822631836,\r
-    "y": 1698.906967163086,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4810.683822631836,\r
+    "y": 1653.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2d9a4fac.ae36b8"\r
+        "b0dee9b7.4f5918"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5d7040fa.99ac2",\r
+    "id": "a1b1941b.f9c738",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4758.183822631836,\r
-    "y": 1740.906967163086,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4766.183822631836,\r
+    "y": 1695.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2d9a4fac.ae36b8",\r
+    "id": "b0dee9b7.4f5918",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4983.183822631836,\r
-    "y": 1697.906967163086,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4991.183822631836,\r
+    "y": 1652.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a4ece740.b4105"\r
+        "915aa3e1.c4697"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "52e1d551.a483dc",\r
+    "id": "25f4a2bf.12e7a6",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4802.566665649414,\r
-    "y": 1315.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4810.566665649414,\r
+    "y": 1270.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7de9311.18a165"\r
+        "5118de9a.01dd88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7de9311.18a165",\r
+    "id": "5118de9a.01dd88",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4979.566665649414,\r
-    "y": 1307.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4987.566665649414,\r
+    "y": 1262.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fff1a40e.199ba",\r
-        "7abb7683.fa5358"\r
+        "94a9a0f9.c59e58",\r
+        "85408268.2c3368"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fc08eb6a.2320e",\r
+    "id": "8b55301b.b943a8",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4597.566635131836,\r
-    "y": 1378.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4605.566635131836,\r
+    "y": 1333.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "52e1d551.a483dc",\r
-        "6d2d083c.e53ec8"\r
+        "25f4a2bf.12e7a6",\r
+        "95e8d812.cc8ca8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6d2d083c.e53ec8",\r
+    "id": "95e8d812.cc8ca8",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4805.566665649414,\r
-    "y": 1389.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4813.566665649414,\r
+    "y": 1344.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b42cfcde.f4ebc8"\r
+        "f38eef5.12b7d1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b42cfcde.f4ebc8",\r
+    "id": "f38eef5.12b7d1",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4982.566665649414,\r
-    "y": 1381.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4990.566665649414,\r
+    "y": 1336.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e8e280e3.a65e5"\r
+        "c816565f.10d5d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a4ece740.b4105",\r
+    "id": "915aa3e1.c4697",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5141.183822631836,\r
-    "y": 1697.906967163086,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5149.183822631836,\r
+    "y": 1652.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "425d708e.783968"\r
+        "6c003d6.b17f944"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "425d708e.783968",\r
+    "id": "6c003d6.b17f944",\r
     "type": "set",\r
     "name": "set source tunnel tp ip",\r
     "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",\r
     "comments": "",\r
-    "x": 5348.183822631836,\r
-    "y": 1697.906967163086,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5356.183822631836,\r
+    "y": 1652.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7abb7683.fa5358",\r
+    "id": "85408268.2c3368",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "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' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5187.566665649414,\r
-    "y": 1314.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5195.566665649414,\r
+    "y": 1269.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "45403a46.69b7f4",\r
-        "ab6bed09.5e53d",\r
-        "1ce7c845.052f38"\r
+        "53b236d8.1b02c",\r
+        "4083b24b.fff034",\r
+        "39446af.e663d96"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fff1a40e.199ba",\r
+    "id": "94a9a0f9.c59e58",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainA id",\r
     "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",\r
     "comments": "",\r
-    "x": 5217.566665649414,\r
-    "y": 1262.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5225.566665649414,\r
+    "y": 1217.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "45403a46.69b7f4",\r
+    "id": "53b236d8.1b02c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5397.566665649414,\r
-    "y": 1305.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5405.566665649414,\r
+    "y": 1260.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f2e23e54.aa63c8"\r
+        "85a67c1c.71be78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ab6bed09.5e53d",\r
+    "id": "4083b24b.fff034",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5389.566665649414,\r
-    "y": 1360.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5397.566665649414,\r
+    "y": 1315.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "29b1e9b9.e1584e"\r
+        "ef1cd568.ee18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1ce7c845.052f38",\r
+    "id": "39446af.e663d96",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5394.566665649414,\r
-    "y": 1417.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5402.566665649414,\r
+    "y": 1372.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "26b11425.c22444"\r
+        "9b4ff565.a53cd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "26b11425.c22444",\r
+    "id": "9b4ff565.a53cd",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5546.566665649414,\r
-    "y": 1418.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5554.566665649414,\r
+    "y": 1373.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "29b1e9b9.e1584e",\r
+    "id": "ef1cd568.ee18",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5557.566665649414,\r
-    "y": 1363.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5565.566665649414,\r
+    "y": 1318.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f2e23e54.aa63c8",\r
+    "id": "85a67c1c.71be78",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5541.948989868164,\r
-    "y": 1303.2223358154297,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5549.948989868164,\r
+    "y": 1258.2223358154297,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a969095b.c118"\r
+        "53e9aeb2.242928"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e8e280e3.a65e5",\r
+    "id": "c816565f.10d5d",\r
     "type": "set",\r
     "name": "set domainA ethernet layer network-id",\r
     "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",\r
     "comments": "",\r
-    "x": 5217.566665649414,\r
-    "y": 1505.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5225.566665649414,\r
+    "y": 1460.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a969095b.c118",\r
+    "id": "53e9aeb2.242928",\r
     "type": "set",\r
     "name": "set controller domainA data",\r
     "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",\r
     "comments": "",\r
-    "x": 5756.566665649414,\r
-    "y": 1299.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5764.566665649414,\r
+    "y": 1254.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3c38a36b.8cf1d4",\r
+    "id": "bd4af2f9.e804e",\r
     "type": "set",\r
     "name": "set network-route-B",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4406.566635131836,\r
-    "y": 584.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4414.566635131836,\r
+    "y": 539.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "66912289.29f5fc",\r
+    "id": "ff102e0b.75a238",\r
     "type": "set",\r
     "name": "set network-route-A",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4397.566635131836,\r
-    "y": 682.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4405.566635131836,\r
+    "y": 637.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b34792b6.2f84b",\r
+    "id": "c7edad0e.b216",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4231.566635131836,\r
-    "y": 590.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4239.566635131836,\r
+    "y": 545.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9e47fb61.f661c8",\r
-        "3c38a36b.8cf1d4"\r
+        "f5d37541.2d47c8",\r
+        "bd4af2f9.e804e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8791b1f2.9fddd",\r
+    "id": "d5f61daa.4b4388",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4237.566635131836,\r
-    "y": 654.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4245.566635131836,\r
+    "y": 609.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "21b58670.3a1192",\r
-        "66912289.29f5fc"\r
+        "2bfe954c.51473a",\r
+        "ff102e0b.75a238"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2e043645.b8ff02",\r
+    "id": "81e90993.f1d9a8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4255.566665649414,\r
-    "y": 866.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4263.566665649414,\r
+    "y": 821.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d0dd5f40.4b5f38",\r
-        "fac3c269.3e8818"\r
+        "9391f162.46d07",\r
+        "cb81a4f3.d6156"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8eeda316.6df7",\r
+    "id": "da2103e1.15169",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4258.566665649414,\r
-    "y": 919.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4266.566665649414,\r
+    "y": 874.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d70d7c37.e21f5",\r
-        "d978bf81.a682c8"\r
+        "8da0410.b4be6c",\r
+        "e6103926.96cb88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fac3c269.3e8818",\r
+    "id": "cb81a4f3.d6156",\r
     "type": "set",\r
     "name": "set network-route-B",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4415.566665649414,\r
-    "y": 879.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4423.566665649414,\r
+    "y": 834.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d978bf81.a682c8",\r
+    "id": "e6103926.96cb88",\r
     "type": "set",\r
     "name": "set network-route-A",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4418.566665649414,\r
-    "y": 970.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4426.566665649414,\r
+    "y": 925.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "98a290a7.380a3",\r
+    "id": "9fb68dad.7c92d",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3710.566635131836,\r
-    "y": 2097.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3718.566635131836,\r
+    "y": 2052.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e497858e.0123a",\r
-        "498e60f5.55f178"\r
+        "931d0e50.a84728",\r
+        "4385be6.d4f41c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f085da3.5b6764",\r
+    "id": "62a0ff40.3fa718",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3537.900131225586,\r
-    "y": 2098.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3545.900131225586,\r
+    "y": 2053.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "98a290a7.380a3"\r
+        "9fb68dad.7c92d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "92e1b5b8.c9d748",\r
+    "id": "a9db3cf5.8c98a8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3547.391098022461,\r
-    "y": 2141.140670776367,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3555.391098022461,\r
+    "y": 2096.140670776367,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b56c748b.ef0b98"\r
+        "b1d5af05.b8b6a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "67d077ec.f8e2b8",\r
+    "id": "e64b0ffd.d5764",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3535.900131225586,\r
-    "y": 2187.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3543.900131225586,\r
+    "y": 2142.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "531aab62.3c8d74"\r
+        "c5461a06.0ba95"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b56c748b.ef0b98",\r
+    "id": "b1d5af05.b8b6a",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 3700.9625091552734,\r
-    "y": 2144.4264068603516,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3708.9625091552734,\r
+    "y": 2099.4264068603516,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "531aab62.3c8d74",\r
+    "id": "c5461a06.0ba95",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3704.900131225586,\r
-    "y": 2188.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3712.900131225586,\r
+    "y": 2143.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e497858e.0123a",\r
+    "id": "931d0e50.a84728",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3996.900131225586,\r
-    "y": 2101.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4004.900131225586,\r
+    "y": 2056.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f5003287.c43b28",\r
-        "e21b6e0c.643e48"\r
+        "ff2f7e35.94528",\r
+        "ccece71a.073de8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e21b6e0c.643e48",\r
+    "id": "ccece71a.073de8",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4219.900131225586,\r
-    "y": 2056.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4227.900131225586,\r
+    "y": 2011.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1c25bfa5.0e84a8"\r
+        "c18c40eb.b59cb8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f5003287.c43b28",\r
+    "id": "ff2f7e35.94528",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4221.900131225586,\r
-    "y": 2120.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4229.900131225586,\r
+    "y": 2075.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9df0e8d3.70e7b"\r
+        "a47e6ec9.683da"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9df0e8d3.70e7b",\r
+    "id": "a47e6ec9.683da",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 4380.900131225586,\r
-    "y": 2139.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4388.900131225586,\r
+    "y": 2094.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1c25bfa5.0e84a8",\r
+    "id": "c18c40eb.b59cb8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4384.900131225586,\r
-    "y": 2053.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4392.900131225586,\r
+    "y": 2008.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "15645f19.451cd9",\r
-        "5b635208.85addc"\r
+        "50191e6c.286e58",\r
+        "e564295c.7502a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "18652387.ef4d1c",\r
+    "id": "37ff3aef.9a54ee",\r
     "type": "save",\r
     "name": "get p-interface-dst from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3309.900131225586,\r
-    "y": 2133.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3317.900131225586,\r
+    "y": 2088.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7f085da3.5b6764",\r
-        "92e1b5b8.c9d748",\r
-        "67d077ec.f8e2b8"\r
+        "62a0ff40.3fa718",\r
+        "a9db3cf5.8c98a8",\r
+        "e64b0ffd.d5764"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8fa3650.6227a18",\r
+    "id": "e2a5ba2c.d267c",\r
     "type": "comment",\r
     "name": "Question?",\r
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
     "comments": "",\r
-    "x": 3270.900131225586,\r
-    "y": 2077.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3278.900131225586,\r
+    "y": 2032.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "29a6af57.132c2",\r
+    "id": "3ceacdf9.dad772",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3329.900131225586,\r
-    "y": 1873.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3337.900131225586,\r
+    "y": 1828.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7f4e16fd.13b25",\r
-        "9c29704e.b9eca8"\r
+        "fc191473.db2cb8",\r
+        "44d4fd2b.8896cc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9c29704e.b9eca8",\r
+    "id": "44d4fd2b.8896cc",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3552.900131225586,\r
-    "y": 1859.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3560.900131225586,\r
+    "y": 1814.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "bb1e4e57.280888"\r
+        "e4dd083d.cd18f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f4e16fd.13b25",\r
+    "id": "fc191473.db2cb8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3554.900131225586,\r
-    "y": 1892.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3562.900131225586,\r
+    "y": 1847.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b75dfd73.636e48"\r
+        "28eac456.f04cbc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b75dfd73.636e48",\r
+    "id": "28eac456.f04cbc",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 3697.900131225586,\r
-    "y": 1889.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3705.900131225586,\r
+    "y": 1844.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bb1e4e57.280888",\r
+    "id": "e4dd083d.cd18f8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3700.900131225586,\r
-    "y": 1852.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3708.900131225586,\r
+    "y": 1807.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "bda8773a.f12a1",\r
-        "d5e4b6e4.115dd8"\r
+        "c8368cdf.b15f18",\r
+        "26325ab5.37c516"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bda8773a.f12a1",\r
+    "id": "c8368cdf.b15f18",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "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",\r
     "comments": "",\r
-    "x": 3894.900131225586,\r
-    "y": 1855.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3902.900131225586,\r
+    "y": 1810.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "498e60f5.55f178",\r
+    "id": "4385be6.d4f41c",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3947.900100708008,\r
-    "y": 2224.566604614258,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3955.900100708008,\r
+    "y": 2179.566604614258,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f195472b.83ff2"\r
+        "ab5afaa2.b8a2e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f195472b.83ff2",\r
+    "id": "ab5afaa2.b8a2e",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4153.900100708008,\r
-    "y": 2224.566604614258,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4161.900100708008,\r
+    "y": 2179.566604614258,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2e029795.f674f8"\r
+        "8b90a37d.df48a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2e029795.f674f8",\r
+    "id": "8b90a37d.df48a8",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4371.185745239258,\r
-    "y": 2223.388381958008,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4379.185745239258,\r
+    "y": 2178.388381958008,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9d2261f5.b9fa08"\r
+        "9497250f.2d9438"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d5e4b6e4.115dd8",\r
+    "id": "26325ab5.37c516",\r
     "type": "get-resource",\r
     "name": "get-resource src pnf",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3916.900131225586,\r
-    "y": 1923.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3924.900131225586,\r
+    "y": 1878.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "6730b25.e0c5f4c",\r
-        "c5d11aca.de4aa8",\r
-        "359fd71e.08e5b"\r
+        "572475c6.9df474",\r
+        "8a4bcee9.a6e838",\r
+        "52414e68.698aa8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6730b25.e0c5f4c",\r
+    "id": "572475c6.9df474",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4112.400253295898,\r
-    "y": 1875.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4120.400253295898,\r
+    "y": 1830.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "11cc1f31.73aba1"\r
+        "cc04a6ba.577058"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c5d11aca.de4aa8",\r
+    "id": "8a4bcee9.a6e838",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4104.400253295898,\r
-    "y": 1930.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4112.400253295898,\r
+    "y": 1885.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5b1bf93a.85704"\r
+        "5bcad340.b7a94c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "359fd71e.08e5b",\r
+    "id": "52414e68.698aa8",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4109.400253295898,\r
-    "y": 1987.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4117.400253295898,\r
+    "y": 1942.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "150deb8f.b69cd4"\r
+        "78c91f5c.6a81a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "150deb8f.b69cd4",\r
+    "id": "78c91f5c.6a81a",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4261.400253295898,\r
-    "y": 1988.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4269.400253295898,\r
+    "y": 1943.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5b1bf93a.85704",\r
+    "id": "5bcad340.b7a94c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4272.400253295898,\r
-    "y": 1933.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4280.400253295898,\r
+    "y": 1888.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "11cc1f31.73aba1",\r
+    "id": "cc04a6ba.577058",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4256.782577514648,\r
-    "y": 1873.222427368164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4264.782577514648,\r
+    "y": 1828.222427368164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "cff6dd9b.8cbec"\r
+        "b056f70a.5ef0e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "15645f19.451cd9",\r
+    "id": "50191e6c.286e58",\r
     "type": "set",\r
     "name": "set ltpId",\r
     "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",\r
     "comments": "",\r
-    "x": 4554.900131225586,\r
-    "y": 2014.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4562.900131225586,\r
+    "y": 1969.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5b635208.85addc",\r
+    "id": "e564295c.7502a8",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",\r
     "comments": "",\r
-    "x": 4555.900131225586,\r
-    "y": 2119.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4563.900131225586,\r
+    "y": 2074.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f4c1e1b8.e7b4e8",\r
+    "id": "4a5f1f34.b170c",\r
     "type": "comment",\r
     "name": "TODO: FIXME",\r
     "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",\r
     "comments": "",\r
-    "x": 4550.900131225586,\r
-    "y": 2068.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4558.900131225586,\r
+    "y": 2023.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9d2261f5.b9fa08",\r
+    "id": "9497250f.2d9438",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4578.017288208008,\r
-    "y": 2212.9070587158203,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4586.017288208008,\r
+    "y": 2167.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "84d8ab80.c7c5d8",\r
-        "e6773f2f.211b88",\r
-        "2391fc90.5865f4"\r
+        "dc5203d6.63ee88",\r
+        "bfaf928b.d789b",\r
+        "75ef4dfa.4963fc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "84d8ab80.c7c5d8",\r
+    "id": "dc5203d6.63ee88",\r
     "type": "set",\r
     "name": "set destination ttp-id",\r
     "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",\r
     "comments": "",\r
-    "x": 4793.017288208008,\r
-    "y": 2174.9070587158203,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4801.017288208008,\r
+    "y": 2129.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e6773f2f.211b88",\r
+    "id": "bfaf928b.d789b",\r
     "type": "get-resource",\r
     "name": "get-resource src TTP",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4790.017288208008,\r
-    "y": 2213.9070587158203,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4798.017288208008,\r
+    "y": 2168.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e6f8fe6a.d80188"\r
+        "6dd4b7bc.60078"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2391fc90.5865f4",\r
+    "id": "75ef4dfa.4963fc",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4745.517288208008,\r
-    "y": 2255.9070587158203,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4753.517288208008,\r
+    "y": 2210.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e6f8fe6a.d80188",\r
+    "id": "6dd4b7bc.60078",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4970.517288208008,\r
-    "y": 2212.9070587158203,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4978.517288208008,\r
+    "y": 2167.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fdc72134.67c23"\r
+        "f825fb77.fb7bc8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fdc72134.67c23",\r
+    "id": "f825fb77.fb7bc8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5128.517288208008,\r
-    "y": 2212.9070587158203,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5136.517288208008,\r
+    "y": 2167.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "be11f8e.1056f08"\r
+        "aa2ab587.72eca"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "be11f8e.1056f08",\r
+    "id": "aa2ab587.72eca",\r
     "type": "set",\r
     "name": "set destination tunnel tp ip",\r
     "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",\r
     "comments": "",\r
-    "x": 5335.517288208008,\r
-    "y": 2212.9070587158203,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5343.517288208008,\r
+    "y": 2167.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8905f8e1.68af1",\r
+    "id": "5ec77bbd.698654",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4838.900131225586,\r
-    "y": 1891.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4846.900131225586,\r
+    "y": 1846.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ca38006f.4cfdd"\r
+        "ef66532c.d6746"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ca38006f.4cfdd",\r
+    "id": "ef66532c.d6746",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5015.900131225586,\r
-    "y": 1883.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5023.900131225586,\r
+    "y": 1838.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9fddc1a7.528c8",\r
-        "516ef3bb.d53aec"\r
+        "f7a2f11b.7a291",\r
+        "d2b30e12.01e548"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cff6dd9b.8cbec",\r
+    "id": "b056f70a.5ef0e",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4440.900131225586,\r
-    "y": 1887.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4448.900131225586,\r
+    "y": 1842.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4e481827.26cf7"\r
+        "658c9b9.fce64e4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4e481827.26cf7",\r
+    "id": "658c9b9.fce64e4",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4635.900131225586,\r
-    "y": 1887.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4643.900131225586,\r
+    "y": 1842.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8905f8e1.68af1",\r
-        "eb2add71.4c5b38"\r
+        "5ec77bbd.698654",\r
+        "d91be682.fd9ed8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "516ef3bb.d53aec",\r
+    "id": "d2b30e12.01e548",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "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' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5223.900131225586,\r
-    "y": 1890.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5231.900131225586,\r
+    "y": 1845.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8f1e6966.2ed9b",\r
-        "eb0b97a0.d2554",\r
-        "8b053235.7e7848"\r
+        "5cd3941f.991a64",\r
+        "72be6080.49369",\r
+        "27b21fad.3c3a98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "13674b50.1cc875",\r
+    "id": "a895224b.6a3d58",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5017.900131225586,\r
-    "y": 1956.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5025.900131225586,\r
+    "y": 1911.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fd136ece.b5724"\r
+        "de5c0fa7.2ddfe8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eb2add71.4c5b38",\r
+    "id": "d91be682.fd9ed8",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4840.900131225586,\r
-    "y": 1964.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4848.900131225586,\r
+    "y": 1919.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "13674b50.1cc875"\r
+        "a895224b.6a3d58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9fddc1a7.528c8",\r
+    "id": "f7a2f11b.7a291",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainB id",\r
     "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",\r
     "comments": "",\r
-    "x": 5253.900131225586,\r
-    "y": 1838.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5261.900131225586,\r
+    "y": 1793.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fd136ece.b5724",\r
+    "id": "de5c0fa7.2ddfe8",\r
     "type": "set",\r
     "name": "set domainB ethernet layer network-id",\r
     "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",\r
     "comments": "",\r
-    "x": 5252.900131225586,\r
-    "y": 2080.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5260.900131225586,\r
+    "y": 2035.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8f1e6966.2ed9b",\r
+    "id": "5cd3941f.991a64",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5433.900131225586,\r
-    "y": 1881.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5441.900131225586,\r
+    "y": 1836.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9db69d63.dc9d08"\r
+        "2d963acb.7812d6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eb0b97a0.d2554",\r
+    "id": "72be6080.49369",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5425.900131225586,\r
-    "y": 1936.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5433.900131225586,\r
+    "y": 1891.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c57fd560.6db4a"\r
+        "7809e6f0.3ba7a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8b053235.7e7848",\r
+    "id": "27b21fad.3c3a98",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5430.900131225586,\r
-    "y": 1993.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5438.900131225586,\r
+    "y": 1948.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "6e911852.3a5e28"\r
+        "76fc1345.ebf534"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6e911852.3a5e28",\r
+    "id": "76fc1345.ebf534",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5582.900131225586,\r
-    "y": 1994.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5590.900131225586,\r
+    "y": 1949.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c57fd560.6db4a",\r
+    "id": "7809e6f0.3ba7a",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5593.900131225586,\r
-    "y": 1939.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5601.900131225586,\r
+    "y": 1894.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9db69d63.dc9d08",\r
+    "id": "2d963acb.7812d6",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5578.282455444336,\r
-    "y": 1879.222427368164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5586.282455444336,\r
+    "y": 1834.222427368164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e6169acb.b321e8"\r
+        "3e96d581.6be972"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e6169acb.b321e8",\r
+    "id": "3e96d581.6be972",\r
     "type": "set",\r
     "name": "set controller domainB data",\r
     "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",\r
     "comments": "",\r
-    "x": 5792.900131225586,\r
-    "y": 1875.5667572021484,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5800.900131225586,\r
+    "y": 1830.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c49ed897.0159e8",\r
+    "id": "a62852b2.29136",\r
     "type": "set",\r
     "name": "set LEAF stuff",\r
     "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",\r
     "comments": "",\r
-    "x": 3277.566635131836,\r
-    "y": 1694.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3285.566635131836,\r
+    "y": 1649.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "758e6e49.b62098",\r
+    "id": "906a6d5d.cfc198",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4573.566635131836,\r
-    "y": 668.5666351318359,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4581.566635131836,\r
+    "y": 623.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ebf6202d.cf95a8",\r
+    "id": "c5fcfc8e.70af78",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4583.566665649414,\r
-    "y": 864.5666656494141,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4591.566665649414,\r
+    "y": 819.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9d2ec307.fb07b8",\r
+    "id": "e4c9b14e.e493e",\r
     "type": "set",\r
     "name": "set ROOT stuff",\r
     "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",\r
     "comments": "",\r
-    "x": 3280.566604614258,\r
-    "y": 2202.566604614258,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3288.566604614258,\r
+    "y": 2157.566604614258,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c81a19d9.9b256",\r
+    "id": "a5e91f89.51e28",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3417.566665649414,\r
-    "y": 2858.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3425.566665649414,\r
+    "y": 2813.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b5b402c1.c35e88",\r
+    "id": "6a1545ce.c6f074",\r
     "type": "switchNode",\r
     "name": "switch found-middle-man?",\r
     "xml": "<switch test='`$found-middle-man`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3294.566665649414,\r
-    "y": 2968.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3302.566665649414,\r
+    "y": 2923.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1932a37.6a327dd",\r
-        "e9120928.0c2298"\r
+        "2a58524.cf6ab2e",\r
+        "b22f43e3.b228e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1932a37.6a327dd",\r
+    "id": "2a58524.cf6ab2e",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3478.566665649414,\r
-    "y": 2947.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3486.566665649414,\r
+    "y": 2902.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "82607164.646368"\r
+        "1fd47368.eaee3d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e9120928.0c2298",\r
+    "id": "b22f43e3.b228e",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3370.566665649414,\r
-    "y": 5125.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3378.566665649414,\r
+    "y": 5080.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ff313408.b74908"\r
+        "bb1800d1.b22838"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ff313408.b74908",\r
+    "id": "bb1800d1.b22838",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3525.566665649414,\r
-    "y": 5118.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3533.566665649414,\r
+    "y": 5073.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "172df7ad.1d8918",\r
-        "e9491637.d51c9",\r
-        "ed589f33.dee34",\r
-        "8bbbb496.3df16",\r
-        "581d9366.e6ee44",\r
-        "f0668881.7d6d6"\r
+        "eb692208.605d48",\r
+        "fa1a129b.8e1e58",\r
+        "8f8ab353.277fd8",\r
+        "e967635e.d5f898",\r
+        "a7e951fd.34174",\r
+        "147222b6.72d4a5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "82607164.646368",\r
+    "id": "1fd47368.eaee3d",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3621.566665649414,\r
-    "y": 2947.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3629.566665649414,\r
+    "y": 2902.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a3d597a8.021388",\r
-        "2f89ad50.333c2a",\r
-        "7f37398e.ac4788",\r
-        "c4c44808.41f1d8",\r
-        "7f311072.1019e",\r
-        "a4b5361a.3a19d8",\r
-        "22f4d985.fe3c1e",\r
-        "dc9eeea6.2c8698",\r
-        "7a27d008.22f4d",\r
-        "7fc66b60.eeacbc",\r
-        "4cc13ef6.adae78",\r
-        "19fd1bdb.1b78e4",\r
-        "d873f718.81f988",\r
-        "cea863c0.4ccb38",\r
-        "6825a3b9.0c4a74",\r
-        "97368f95.9c3c68",\r
-        "550c2be9.9018d4",\r
-        "540352c5.31c62c",\r
-        "87e2b691.2d12d8",\r
-        "25259a32.c04fe6",\r
-        "b87e18c5.0db5e8",\r
-        "88b90ca8.e250c"\r
+        "13be4810.27374",\r
+        "2088078d.cb1e2",\r
+        "e3bae41.89a4a98",\r
+        "ed9405a6.bcc818",\r
+        "fe194fc5.986bf",\r
+        "c94ba2a6.6d9dc",\r
+        "49793ec.cd6ce4",\r
+        "5e8a3143.8db73",\r
+        "faf103f5.4614f8",\r
+        "88431892.8e89b8",\r
+        "cac051ff.1079b",\r
+        "8ab931f2.10742",\r
+        "38387e07.eee06a",\r
+        "c16c558d.bd7fa8",\r
+        "773efcf1.a16054",\r
+        "4610b0f7.2e9108",\r
+        "9860b974.593a3",\r
+        "e82d41b7.567df",\r
+        "763bc2b5.d71f9c",\r
+        "3cc87f7.3864a",\r
+        "5fefabc6.f62f5c",\r
+        "dbd95dbb.cf097"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7a27d008.22f4d",\r
+    "id": "faf103f5.4614f8",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity domainB",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3931.566665649414,\r
-    "y": 3262.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3939.566665649414,\r
+    "y": 3217.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a3d597a8.021388",\r
+    "id": "13be4810.27374",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3879.566665649414,\r
-    "y": 3304.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3887.566665649414,\r
+    "y": 3259.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2f89ad50.333c2a",\r
+    "id": "2088078d.cb1e2",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4008.566665649414,\r
-    "y": 3346.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4016.566665649414,\r
+    "y": 3301.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "568e89f6.76041",\r
+    "id": "c56513f7.9839c8",\r
     "type": "comment",\r
     "name": "Create ROOT connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3854.566665649414,\r
-    "y": 3221.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3862.566665649414,\r
+    "y": 3176.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cfc92e2e.d4332",\r
+    "id": "cb0612e7.fab918",\r
     "type": "comment",\r
     "name": "create middle man connectivity and ...",\r
     "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",\r
     "comments": "",\r
-    "x": 4379.566665649414,\r
-    "y": 3742.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4387.566665649414,\r
+    "y": 3697.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7f37398e.ac4788",\r
+    "id": "e3bae41.89a4a98",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity middle-man",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3943.566665649414,\r
-    "y": 3781.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3951.566665649414,\r
+    "y": 3736.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c4c44808.41f1d8",\r
+    "id": "ed9405a6.bcc818",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3891.566665649414,\r
-    "y": 3832.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3899.566665649414,\r
+    "y": 3787.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7f311072.1019e",\r
+    "id": "fe194fc5.986bf",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4027.566665649414,\r
-    "y": 3879.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4035.566665649414,\r
+    "y": 3834.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b73302ea.6b3c9",\r
+    "id": "3a844032.bf9ac",\r
     "type": "comment",\r
     "name": "Create MIDDLE-MAN connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3884.566665649414,\r
-    "y": 3741.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3892.566665649414,\r
+    "y": 3696.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f06d4892.086d48",\r
+    "id": "debaf07d.db6d5",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4314.566665649414,\r
-    "y": 3938.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4322.566665649414,\r
+    "y": 3893.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a4b5361a.3a19d8",\r
+    "id": "c94ba2a6.6d9dc",\r
     "type": "save",\r
     "name": "get middle-man connectivity from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3905.566665649414,\r
-    "y": 3985.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3913.566665649414,\r
+    "y": 3940.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7c79fc80.066eb4",\r
-        "c371f5b2.5890b8",\r
-        "8674a08a.891028"\r
+        "34b4bb6d.84f2ec",\r
+        "39b05e8d.991162",\r
+        "b7823394.4e1968"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7c79fc80.066eb4",\r
+    "id": "34b4bb6d.84f2ec",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4152.566665649414,\r
-    "y": 3939.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4160.566665649414,\r
+    "y": 3894.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f06d4892.086d48"\r
+        "debaf07d.db6d5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c371f5b2.5890b8",\r
+    "id": "39b05e8d.991162",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4153.057632446289,\r
-    "y": 3985.1407012939453,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4161.057632446289,\r
+    "y": 3940.1407012939453,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f874dece.70a19"\r
+        "483dd1d6.aa392"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8674a08a.891028",\r
+    "id": "b7823394.4e1968",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4150.566665649414,\r
-    "y": 4028.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4158.566665649414,\r
+    "y": 3983.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "395b0fd4.a6a4c"\r
+        "59b157ce.93edc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f874dece.70a19",\r
+    "id": "483dd1d6.aa392",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4315.629043579102,\r
-    "y": 3985.4264373779297,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4323.629043579102,\r
+    "y": 3940.4264373779297,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "395b0fd4.a6a4c",\r
+    "id": "59b157ce.93edc",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 4319.566665649414,\r
-    "y": 4029.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4327.566665649414,\r
+    "y": 3984.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6825a3b9.0c4a74",\r
+    "id": "773efcf1.a16054",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3959.566665649414,\r
-    "y": 4327.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3967.566665649414,\r
+    "y": 4282.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "97368f95.9c3c68",\r
+    "id": "4610b0f7.2e9108",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3962.566665649414,\r
-    "y": 4372.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3970.566665649414,\r
+    "y": 4327.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "540352c5.31c62c",\r
+    "id": "e82d41b7.567df",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3954.566665649414,\r
-    "y": 4100.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3962.566665649414,\r
+    "y": 4055.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "87e2b691.2d12d8",\r
+    "id": "763bc2b5.d71f9c",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3956.566665649414,\r
-    "y": 4147.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3964.566665649414,\r
+    "y": 4102.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "de9883f2.40e1e",\r
+    "id": "e3efee4c.cbd228",\r
     "type": "comment",\r
     "name": "The following two will be done in F1",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3875.566665649414,\r
-    "y": 4280.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3883.566665649414,\r
+    "y": 4235.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8e94a286.9bf3d",\r
+    "id": "a86d756f.b96748",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4485.566665649414,\r
-    "y": 4946.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4493.566665649414,\r
+    "y": 4901.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "172df7ad.1d8918",\r
+    "id": "eb692208.605d48",\r
     "type": "switchNode",\r
     "name": "switch no-pce-call",\r
     "xml": "<switch test='`$no-pce-call`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3740.566665649414,\r
-    "y": 5099.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3748.566665649414,\r
+    "y": 5054.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "42ddce9e.8ae7c",\r
-        "527e3f0b.1dc1d"\r
+        "35961804.034dd",\r
+        "1c6960fb.af77c7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "527e3f0b.1dc1d",\r
+    "id": "1c6960fb.af77c7",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3912.566665649414,\r
-    "y": 5096.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3920.566665649414,\r
+    "y": 5051.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7bd89115.7af5d"\r
+        "44ac8602.f7b438"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "42ddce9e.8ae7c",\r
+    "id": "35961804.034dd",\r
     "type": "outcomeFalse",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3864.566665649414,\r
-    "y": 5943.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3872.566665649414,\r
+    "y": 5898.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ba444b0.6d090b8"\r
+        "e66ef561.f9598"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "678feee9.54f5e",\r
+    "id": "a7546f8d.e642f8",\r
     "type": "comment",\r
     "name": "1 --> PCE is needed",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3925.566665649414,\r
-    "y": 5066.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3933.566665649414,\r
+    "y": 5021.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f4c6dae7.f846f8",\r
+    "id": "7377305c.6344e",\r
     "type": "comment",\r
     "name": "2 --> no need to call PCE",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3935.566665649414,\r
-    "y": 5901.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3943.566665649414,\r
+    "y": 5856.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "22f4d985.fe3c1e",\r
+    "id": "49793ec.cd6ce4",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3958.566665649414,\r
-    "y": 4475.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3966.566665649414,\r
+    "y": 4430.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7bd89115.7af5d",\r
+    "id": "44ac8602.f7b438",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4088.566665649414,\r
-    "y": 5098.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4096.566665649414,\r
+    "y": 5053.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a830956d.47074",\r
-        "1755eaf4.354305",\r
-        "bc42d413.82595",\r
-        "e6e246b3.ed891",\r
-        "ea96eb7.ae6d798",\r
-        "64dc9cdb.f55c8c",\r
-        "8e94a286.9bf3d",\r
-        "f715ac9f.9b32b8",\r
-        "79d51ab0.5a125c"\r
+        "f2639d5b.9b3268",\r
+        "eb43383.cb911c8",\r
+        "b431bc46.f09eb8",\r
+        "3f007800.f3335",\r
+        "6651db46.728784",\r
+        "ec10a332.513d58",\r
+        "a86d756f.b96748",\r
+        "128b476.c3c24b9",\r
+        "b1e27ce1.629f7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "979e33e8.311e38",\r
+    "id": "3a4a9e77.4fc502",\r
     "type": "comment",\r
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5533.566665649414,\r
-    "y": 4571.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5541.566665649414,\r
+    "y": 4526.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a830956d.47074",\r
+    "id": "f2639d5b.9b3268",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4466.566665649414,\r
-    "y": 5601.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4474.566665649414,\r
+    "y": 5556.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "dc9eeea6.2c8698",\r
+    "id": "5e8a3143.8db73",\r
     "type": "save",\r
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3937.566665649414,\r
-    "y": 3475.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3945.566665649414,\r
+    "y": 3430.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7fc66b60.eeacbc",\r
+    "id": "88431892.8e89b8",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity domainA",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3935.566665649414,\r
-    "y": 2932.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3943.566665649414,\r
+    "y": 2887.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4cc13ef6.adae78",\r
+    "id": "cac051ff.1079b",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3883.566665649414,\r
-    "y": 2980.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3891.566665649414,\r
+    "y": 2935.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "19fd1bdb.1b78e4",\r
+    "id": "8ab931f2.10742",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4011.566665649414,\r
-    "y": 3027.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4019.566665649414,\r
+    "y": 2982.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "49213484.6d2684",\r
+    "id": "be22c48f.b88288",\r
     "type": "comment",\r
     "name": "Create LEAF connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3848.566665649414,\r
-    "y": 2890.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3856.566665649414,\r
+    "y": 2845.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d873f718.81f988",\r
+    "id": "38387e07.eee06a",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
-    "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`' />",\r
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3845.566665649414,\r
-    "y": 3118.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3853.566665649414,\r
+    "y": 3073.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "cea863c0.4ccb38",\r
+    "id": "c16c558d.bd7fa8",\r
     "type": "save",\r
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3938.566665649414,\r
-    "y": 3171.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3946.566665649414,\r
+    "y": 3126.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8a16772c.f0d08",\r
+    "id": "8249248d.fd861",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3829.566665649414,\r
-    "y": 3074.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3837.566665649414,\r
+    "y": 3029.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d8aa6375.55f12",\r
+    "id": "8a8f5ba9.d4da6",\r
     "type": "comment",\r
     "name": "Create ROOT UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3833.566665649414,\r
-    "y": 3390.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3841.566665649414,\r
+    "y": 3345.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e6e246b3.ed891",\r
+    "id": "3f007800.f3335",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
-    "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",\r
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4402.566665649414,\r
-    "y": 4579.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4410.566665649414,\r
+    "y": 4534.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "546f5300.a4bc44",\r
+    "id": "5bce380a.32d878",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4386.566665649414,\r
-    "y": 4535.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4394.566665649414,\r
+    "y": 4490.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b36d849f.6b142",\r
+    "id": "1b090d31.1314e3",\r
     "type": "comment",\r
     "name": "Create LEAF connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5133.566665649414,\r
-    "y": 4566.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5141.566665649414,\r
+    "y": 4521.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "df003672.bddd2",\r
+    "id": "c30363c7.dd0dc",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity domainA",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5220.566665649414,\r
-    "y": 4608.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5228.566665649414,\r
+    "y": 4563.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "dbb46179.c47f78",\r
+    "id": "10271018.94b4f8",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5168.566665649414,\r
-    "y": 4656.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5176.566665649414,\r
+    "y": 4611.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "837adbb2.1c01e8",\r
+    "id": "285754a8.44159c",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5296.566665649414,\r
-    "y": 4703.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5304.566665649414,\r
+    "y": 4658.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "64dc9cdb.f55c8c",\r
+    "id": "ec10a332.513d58",\r
     "type": "save",\r
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4473.566665649414,\r
-    "y": 4988.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4481.566665649414,\r
+    "y": 4943.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f767aa90.80364",\r
+    "id": "572f6814.fa386",\r
     "type": "comment",\r
     "name": "populate connectivity-B variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4456.566665649414,\r
-    "y": 5050.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4464.566665649414,\r
+    "y": 5005.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1755eaf4.354305",\r
+    "id": "eb43383.cb911c8",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4567.566665649414,\r
-    "y": 5092.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4575.566665649414,\r
+    "y": 5047.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4953b8d7.b454c8",\r
+    "id": "8c58cbc3.7f4b88",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid",\r
     "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",\r
     "comments": "",\r
-    "x": 5015.566665649414,\r
-    "y": 5145.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5023.566665649414,\r
+    "y": 5100.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b4d97863.c15da",\r
+    "id": "be5aff94.f7d12",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4325.566665649414,\r
-    "y": 5843.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4333.566665649414,\r
+    "y": 5798.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d715f85a.00ec7",\r
+    "id": "526f34d0.18befc",\r
     "type": "save",\r
     "name": "save LEAF UNI in AAI",\r
-    "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",\r
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4223.566665649414,\r
-    "y": 5792.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4231.566665649414,\r
+    "y": 5747.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5114dbce.799f0c",\r
+    "id": "6826024b.ca723c",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4207.566665649414,\r
-    "y": 5748.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4215.566665649414,\r
+    "y": 5703.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a495cbe2.05f3",\r
+    "id": "be0ba193.2dd698",\r
     "type": "save",\r
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4993.566665649414,\r
-    "y": 6005.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5001.566665649414,\r
+    "y": 5960.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bc42d413.82595",\r
+    "id": "b431bc46.f09eb8",\r
     "type": "switchNode",\r
     "name": "switch found-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4394.566665649414,\r
-    "y": 5149.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4402.566665649414,\r
+    "y": 5104.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5a8de4b.cef309c",\r
-        "99b44375.9d0098"\r
+        "baf822c4.3f205",\r
+        "32a48883.ef2b98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5a8de4b.cef309c",\r
+    "id": "baf822c4.3f205",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4605.566665649414,\r
-    "y": 5149.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4613.566665649414,\r
+    "y": 5104.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "41a866cb.6d5e88"\r
+        "58c9a296.a42094"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "41a866cb.6d5e88",\r
+    "id": "58c9a296.a42094",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4761.566665649414,\r
-    "y": 5145.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4769.566665649414,\r
+    "y": 5100.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4953b8d7.b454c8",\r
-        "5f4b3cc4.eb62f4",\r
-        "76c11af1.9e9b94"\r
+        "8c58cbc3.7f4b88",\r
+        "3aab431e.930194",\r
+        "c5e59db3.c67ea"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "99b44375.9d0098",\r
+    "id": "32a48883.ef2b98",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4601.566665649414,\r
-    "y": 5197.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4609.566665649414,\r
+    "y": 5152.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c40ddff0.38613"\r
+        "255e5d4d.31482a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c40ddff0.38613",\r
+    "id": "255e5d4d.31482a",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
     "comments": "",\r
-    "x": 4749.566665649414,\r
-    "y": 5192.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4757.566665649414,\r
+    "y": 5147.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e8bdf848.077f2",\r
+    "id": "3647078f.866d7",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5257.566665649414,\r
-    "y": 4774.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5265.566665649414,\r
+    "y": 4729.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5b668059.1f482",\r
+    "id": "79257077.5f1ff8",\r
     "type": "execute",\r
     "name": "execute UUID generator for ethernet-service-name",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2423.566665649414,\r
-    "y": 185.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2431.566665649414,\r
+    "y": 140.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "989a0e11.127538",\r
+    "id": "8a55fb57.dfc438",\r
     "type": "set",\r
     "name": "set new ethernet-service-name",\r
     "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",\r
     "comments": "",\r
-    "x": 2357.566665649414,\r
-    "y": 221.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2365.566665649414,\r
+    "y": 176.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e2d9aece.1465f",\r
+    "id": "d0423030.a4fb7",\r
     "type": "comment",\r
     "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",\r
     "info": "",\r
     "comments": "",\r
-    "x": 2542.566665649414,\r
-    "y": 148.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2550.566665649414,\r
+    "y": 103.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8228476b.dfc93",\r
+    "id": "fad64a40.999cd8",\r
     "type": "set",\r
     "name": "set current-provider-id and current-cvlan-id",\r
     "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`' />-->",\r
     "comments": "",\r
-    "x": 4292.566665649414,\r
-    "y": 5909.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4300.566665649414,\r
+    "y": 5864.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "394125b3.b0b57a",\r
+    "id": "1f999717.41db99",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4425.566665649414,\r
-    "y": 5957.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4433.566665649414,\r
+    "y": 5912.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "64250c00.f41444",\r
+    "id": "c52167d8.94938",\r
     "type": "switchNode",\r
     "name": "switch found-connectivity?",\r
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4244.566665649414,\r
-    "y": 6015.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4252.566665649414,\r
+    "y": 5970.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "24759095.ee144",\r
-        "cef50f43.3e9f48"\r
+        "19e438e0.03d147",\r
+        "34d88bae.811d0c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "24759095.ee144",\r
+    "id": "19e438e0.03d147",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4437.566665649414,\r
-    "y": 6016.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4445.566665649414,\r
+    "y": 5971.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c0599a44.570328"\r
+        "41319fcd.d8b348"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c0599a44.570328",\r
+    "id": "41319fcd.d8b348",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",\r
     "comments": "",\r
-    "x": 4593.566665649414,\r
-    "y": 6013.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4601.566665649414,\r
+    "y": 5968.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cef50f43.3e9f48",\r
+    "id": "34d88bae.811d0c",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4441.566665649414,\r
-    "y": 6060.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4449.566665649414,\r
+    "y": 6015.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2c2e6801.1f5998"\r
+        "9cc4dc7d.174798"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2c2e6801.1f5998",\r
+    "id": "9cc4dc7d.174798",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4580.566665649414,\r
-    "y": 6055.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4588.566665649414,\r
+    "y": 6010.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a495cbe2.05f3",\r
-        "d341cf2c.6ddc78",\r
-        "882a079d.0537c8",\r
-        "9acad1b0.c8f3c8",\r
-        "1591d847.9e7b3",\r
-        "2e348bab.75e0fc",\r
-        "3c4d6cf1.e2588c",\r
-        "cf206ffb.cf7668",\r
-        "5a9ba33a.7d1a8c",\r
-        "68c1a73b.58dcd8",\r
-        "221756d1.77b252",\r
-        "6b274a0f.281994"\r
+        "be0ba193.2dd698",\r
+        "9b687ead.d5262",\r
+        "bb8d3610.613d68",\r
+        "89f249f3.3e5608",\r
+        "1d656b5f.37186d",\r
+        "90bf2cc6.ca2d58",\r
+        "517a964c.5fa06",\r
+        "c8b3b99a.24ee1",\r
+        "2487bbac.e2018c",\r
+        "203e33ee.d272e4",\r
+        "3c1017d1.449bb",\r
+        "21e17170.9d1c4e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3c4d6cf1.e2588c",\r
+    "id": "517a964c.5fa06",\r
     "type": "save",\r
     "name": "get all-vpn-bindings from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4777.566665649414,\r
-    "y": 6734.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4785.566665649414,\r
+    "y": 6689.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f71173d.2556e9",\r
-        "36d425a2.cca582",\r
-        "63e9e58.35d851c"\r
+        "f455e87a.bb05c8",\r
+        "dc467c76.6e0b1",\r
+        "26412110.73f856"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f71173d.2556e9",\r
+    "id": "f455e87a.bb05c8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4982.566665649414,\r
-    "y": 6731.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4990.566665649414,\r
+    "y": 6686.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "211a75a9.b19e7a"\r
+        "8ff8217a.525ad8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "36d425a2.cca582",\r
+    "id": "dc467c76.6e0b1",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4966.057632446289,\r
-    "y": 6793.140701293945,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4974.057632446289,\r
+    "y": 6748.140701293945,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2ef14bb4.55e2cc"\r
+        "2b587a1.cfe3f86"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "63e9e58.35d851c",\r
+    "id": "26412110.73f856",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4963.566665649414,\r
-    "y": 6836.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4971.566665649414,\r
+    "y": 6791.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "61cb6aef.0faa54"\r
+        "b747b55e.88ecf8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "211a75a9.b19e7a",\r
+    "id": "8ff8217a.525ad8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5138.566665649414,\r
-    "y": 6745.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5146.566665649414,\r
+    "y": 6700.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1dafef09.17b7d9"\r
+        "8429b279.d4cdf"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2ef14bb4.55e2cc",\r
+    "id": "2b587a1.cfe3f86",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5128.629043579102,\r
-    "y": 6793.42643737793,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5136.629043579102,\r
+    "y": 6748.42643737793,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "61cb6aef.0faa54",\r
+    "id": "b747b55e.88ecf8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 5130.566665649414,\r
-    "y": 6835.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5138.566665649414,\r
+    "y": 6790.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1dafef09.17b7d9",\r
+    "id": "8429b279.d4cdf",\r
     "type": "for",\r
     "name": "for vpnidx in all-vpn-bindings",\r
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5385.566665649414,\r
-    "y": 6742.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5393.566665649414,\r
+    "y": 6697.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "33d48bc3.4a3004"\r
+        "1ddbd038.9357b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "33d48bc3.4a3004",\r
+    "id": "1ddbd038.9357b",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5622.566665649414,\r
-    "y": 6738.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5630.566665649414,\r
+    "y": 6693.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "509c6355.839cf4"\r
+        "7922b60b.c6e31"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9a8b6da5.4a6238",\r
+    "id": "e0649c96.67ff88",\r
     "type": "switchNode",\r
     "name": "switch vpnuuid is for this slice",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5865.566665649414,\r
-    "y": 6710.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5873.566665649414,\r
+    "y": 6665.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4704615c.3c69f",\r
-        "3a6fe540.e42ee2"\r
+        "6697bde5.6a73ec",\r
+        "f1cd44ef.865458"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4704615c.3c69f",\r
+    "id": "6697bde5.6a73ec",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6070.566665649414,\r
-    "y": 6730.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 6078.566665649414,\r
+    "y": 6685.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "509c6355.839cf4"\r
+        "7922b60b.c6e31"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3a6fe540.e42ee2",\r
+    "id": "f1cd44ef.865458",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6069.566665649414,\r
-    "y": 6683.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 6077.566665649414,\r
+    "y": 6638.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "509c6355.839cf4",\r
+    "id": "7922b60b.c6e31",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4813.566665649414,\r
-    "y": 7005.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4821.566665649414,\r
+    "y": 6960.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "867fbf45.6b76e8"\r
+        "b0b5d457.a97bd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b664359c.e37a3",\r
+    "id": "1fa90257.6a5f2e",\r
     "type": "set",\r
     "name": "set tmp.aai.the-vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
     "comments": "",\r
-    "x": 6275.566635131836,\r
-    "y": 6943.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 6283.566635131836,\r
+    "y": 6898.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "125d4567.492113",\r
+    "id": "a2de4936.eeff58",\r
     "type": "comment",\r
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4875.566665649414,\r
-    "y": 6681.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4883.566665649414,\r
+    "y": 6636.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2e348bab.75e0fc",\r
+    "id": "90bf2cc6.ca2d58",\r
     "type": "set",\r
     "name": "set srcTtp OTN layer",\r
     "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",\r
     "comments": "",\r
-    "x": 4757.566665649414,\r
-    "y": 6569.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4765.566665649414,\r
+    "y": 6524.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cf763643.011b",\r
+    "id": "917753a8.ea741",\r
     "type": "switchNode",\r
     "name": "switch provider-id domainA",\r
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5102.566665649414,\r
-    "y": 6400.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5110.566665649414,\r
+    "y": 6355.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e8f56973.27478"\r
+        "ddf721ac.b7eef8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e8f56973.27478",\r
+    "id": "ddf721ac.b7eef8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5322.566665649414,\r
-    "y": 6406.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5330.566665649414,\r
+    "y": 6361.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fde5a354.539f28"\r
+        "ff49769d.1bd52"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fde5a354.539f28",\r
+    "id": "ff49769d.1bd52",\r
     "type": "switchNode",\r
     "name": "switch te-topo-id",\r
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5509.566665649414,\r
-    "y": 6366.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5517.566665649414,\r
+    "y": 6321.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "575e4bf2.eff614"\r
+        "4e069c0d.3968f4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "575e4bf2.eff614",\r
+    "id": "4e069c0d.3968f4",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5701.566665649414,\r
-    "y": 6369.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5709.566665649414,\r
+    "y": 6324.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d993f92.1703888"\r
+        "2305c4b2.be932c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d993f92.1703888",\r
+    "id": "2305c4b2.be932c",\r
     "type": "set",\r
     "name": "set otnTopoIdSrc",\r
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
     "comments": "",\r
-    "x": 5910.566665649414,\r
-    "y": 6367.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5918.566665649414,\r
+    "y": 6322.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cf206ffb.cf7668",\r
+    "id": "c8b3b99a.24ee1",\r
     "type": "for",\r
     "name": "for netwidx..allNetworksList_length",\r
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4809.566665649414,\r
-    "y": 6394.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4817.566665649414,\r
+    "y": 6349.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "cf763643.011b"\r
+        "917753a8.ea741"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "882a079d.0537c8",\r
+    "id": "bb8d3610.613d68",\r
     "type": "get-resource",\r
     "name": "get-resource network-resources-list",\r
     "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\" >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4817.566665649414,\r
-    "y": 6287.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4825.566665649414,\r
+    "y": 6242.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "bc620ade.df0f58",\r
-        "6623a49b.f6c65c",\r
-        "19b34b3d.8c8655"\r
+        "ae57a65a.f0c818",\r
+        "d5c36a0.e7a9398",\r
+        "2780984c.5a15a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bc620ade.df0f58",\r
+    "id": "ae57a65a.f0c818",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5053.566665649414,\r
-    "y": 6270.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5061.566665649414,\r
+    "y": 6225.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6623a49b.f6c65c",\r
+    "id": "d5c36a0.e7a9398",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5050.566665649414,\r
-    "y": 6311.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5058.566665649414,\r
+    "y": 6266.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "19b34b3d.8c8655",\r
+    "id": "2780984c.5a15a",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5064.566665649414,\r
-    "y": 6351.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5072.566665649414,\r
+    "y": 6306.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9acad1b0.c8f3c8",\r
+    "id": "89f249f3.3e5608",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
     "comments": "",\r
-    "x": 4753.566665649414,\r
-    "y": 6446.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4761.566665649414,\r
+    "y": 6401.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1591d847.9e7b3",\r
+    "id": "1d656b5f.37186d",\r
     "type": "set",\r
     "name": "set tmp.pce-src-node",\r
     "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]`\" />",\r
     "comments": "",\r
-    "x": 4761.566665649414,\r
-    "y": 6504.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4769.566665649414,\r
+    "y": 6459.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d341cf2c.6ddc78",\r
+    "id": "9b687ead.d5262",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
     "comments": "",\r
-    "x": 4766.566665649414,\r
-    "y": 6244.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4774.566665649414,\r
+    "y": 6199.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2fabd91.b08d0a6",\r
+    "id": "201d95ad.f7c612",\r
     "type": "comment",\r
     "name": "The following section is to find srcTtp OTN layer (its long name)",\r
     "info": "The following section is to find srcTtp OTN layer (its long name)",\r
     "comments": "",\r
-    "x": 4881.566665649414,\r
-    "y": 6196.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4889.566665649414,\r
+    "y": 6151.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "867fbf45.6b76e8",\r
+    "id": "b0b5d457.a97bd",\r
     "type": "switchNode",\r
     "name": "switch ops-note is srcTtpOtnLayer",\r
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5056.566665649414,\r
-    "y": 7002.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5064.566665649414,\r
+    "y": 6957.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ca20f18b.d4eba8",\r
-        "a546871e.5bfa7"\r
+        "46f9fbf7.fbe6cc",\r
+        "bab2d066.0ad5b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ca20f18b.d4eba8",\r
+    "id": "46f9fbf7.fbe6cc",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5285.566665649414,\r
-    "y": 6979.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5293.566665649414,\r
+    "y": 6934.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4274d693.44e7"\r
+        "66be0922.f0399"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a546871e.5bfa7",\r
+    "id": "bab2d066.0ad5b",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5285.566665649414,\r
-    "y": 7028.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5293.566665649414,\r
+    "y": 6983.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9d07c8b0.2ee89",\r
+    "id": "646b562c.1751a8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6018.566635131836,\r
-    "y": 7034.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 6026.566635131836,\r
+    "y": 6989.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "90c25785.3a5d5",\r
-        "b664359c.e37a3",\r
-        "9e3c844f.310898"\r
+        "898afc0c.eb00d8",\r
+        "1fa90257.6a5f2e",\r
+        "9d2bedee.a23cf"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8461f132.9df9d8",\r
+    "id": "5bb30070.2c2c98",\r
     "type": "comment",\r
     "name": "increase the bw of the-vpn-binding and change status to modified",\r
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",\r
     "comments": "",\r
-    "x": 6403.566635131836,\r
-    "y": 6997.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 6411.566635131836,\r
+    "y": 6952.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9e3c844f.310898",\r
+    "id": "9d2bedee.a23cf",\r
     "type": "save",\r
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6373.566635131836,\r
-    "y": 7057.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 6381.566635131836,\r
+    "y": 7012.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "90c25785.3a5d5",\r
+    "id": "898afc0c.eb00d8",\r
     "type": "set",\r
     "name": "unset tmp.aai.the-vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",\r
     "comments": "",\r
-    "x": 6280.566635131836,\r
-    "y": 6885.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 6288.566635131836,\r
+    "y": 6840.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ba444b0.6d090b8",\r
+    "id": "e66ef561.f9598",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4016.566665649414,\r
-    "y": 5942.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4024.566665649414,\r
+    "y": 5897.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d715f85a.00ec7",\r
-        "8228476b.dfc93",\r
-        "394125b3.b0b57a",\r
-        "64250c00.f41444",\r
-        "b4d97863.c15da"\r
+        "526f34d0.18befc",\r
+        "fad64a40.999cd8",\r
+        "1f999717.41db99",\r
+        "c52167d8.94938",\r
+        "be5aff94.f7d12"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c0768f56.37d61",\r
+    "id": "55c4563d.130918",\r
     "type": "set",\r
     "name": "unset otnTopoIdSrc",\r
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
     "comments": "",\r
-    "x": 4758.566665649414,\r
-    "y": 6344.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4766.566665649414,\r
+    "y": 6299.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5a9ba33a.7d1a8c",\r
+    "id": "2487bbac.e2018c",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4886.566665649414,\r
-    "y": 6086.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4894.566665649414,\r
+    "y": 6041.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "42948c30.98f5ec",\r
+    "id": "eef6a242.86b638",\r
     "type": "comment",\r
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",\r
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",\r
     "comments": "",\r
-    "x": 5023.566665649414,\r
-    "y": 6036.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5031.566665649414,\r
+    "y": 5991.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "550c2be9.9018d4",\r
+    "id": "9860b974.593a3",\r
     "type": "save",\r
     "name": "save ROOT UNI in AAI",\r
-    "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",\r
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3850.566665649414,\r
-    "y": 3429.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3858.566665649414,\r
+    "y": 3384.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "371edf0a.6e17f",\r
+    "id": "c96fd773.2e2468",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4028.566635131836,\r
-    "y": 1664.566635131836,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4036.566635131836,\r
+    "y": 1619.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "de567305.4a43d8",\r
+    "id": "e5b482c4.4ff96",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4007.566604614258,\r
-    "y": 2176.566604614258,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4015.566604614258,\r
+    "y": 2131.566604614258,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "25146472.eb3624",\r
+    "id": "58efc802.973c9",\r
     "type": "comment",\r
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3842.566665649414,\r
-    "y": 4050.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3850.566665649414,\r
+    "y": 4005.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c5539a8b.106aa",\r
+    "id": "517fe5d1.d6143c",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3932.566665649414,\r
-    "y": 6430.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3940.566665649414,\r
+    "y": 6385.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e9491637.d51c9",\r
+    "id": "fa1a129b.8e1e58",\r
     "type": "set",\r
     "name": "set current-provider-id and current-cvlan-id",\r
     "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`' />-->",\r
     "comments": "",\r
-    "x": 3734.566665649414,\r
-    "y": 4959.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3742.566665649414,\r
+    "y": 4914.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ed589f33.dee34",\r
+    "id": "8f8ab353.277fd8",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3867.566665649414,\r
-    "y": 5007.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3875.566665649414,\r
+    "y": 4962.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ea96eb7.ae6d798",\r
+    "id": "6651db46.728784",\r
     "type": "switchNode",\r
     "name": "switch found-connectivity?",\r
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4413.566665649414,\r
-    "y": 4635.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4421.566665649414,\r
+    "y": 4590.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a8f10916.be28b",\r
-        "f59d19a8.d9c4d8"\r
+        "894780c2.49e69",\r
+        "859a7332.ec6f6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a8f10916.be28b",\r
+    "id": "894780c2.49e69",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4606.566665649414,\r
-    "y": 4636.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4614.566665649414,\r
+    "y": 4591.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f728dec2.62b3a"\r
+        "ba88b5a5.1ae688"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f59d19a8.d9c4d8",\r
+    "id": "859a7332.ec6f6",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4610.566665649414,\r
-    "y": 4680.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4618.566665649414,\r
+    "y": 4635.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c09bd16a.0b32d"\r
+        "99dc491a.da7278"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c09bd16a.0b32d",\r
+    "id": "99dc491a.da7278",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4749.566665649414,\r
-    "y": 4675.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4757.566665649414,\r
+    "y": 4630.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d9114bfc.f7bce",\r
-        "6c2541da.5d16b8",\r
-        "b22f3c73.35c508"\r
+        "8cf9ac68.b6fb08",\r
+        "b04660b8.eae2",\r
+        "fb45e770.b6fb4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f728dec2.62b3a",\r
+    "id": "ba88b5a5.1ae688",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4749.566665649414,\r
-    "y": 4632.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4757.566665649414,\r
+    "y": 4587.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "df003672.bddd2",\r
-        "dbb46179.c47f78",\r
-        "837adbb2.1c01e8",\r
-        "e8bdf848.077f2"\r
+        "c30363c7.dd0dc",\r
+        "10271018.94b4f8",\r
+        "285754a8.44159c",\r
+        "3647078f.866d7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d9114bfc.f7bce",\r
+    "id": "8cf9ac68.b6fb08",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainA-uuid",\r
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 5151.566909790039,\r
-    "y": 4897.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5159.566909790039,\r
+    "y": 4852.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "430a9d16.e4affc",\r
+    "id": "f52716f7.92c318",\r
     "type": "comment",\r
     "name": "populate connectivity-A variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5158.566909790039,\r
-    "y": 4851.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5166.566909790039,\r
+    "y": 4806.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "68c1a73b.58dcd8",\r
+    "id": "203e33ee.d272e4",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4948.566665649414,\r
-    "y": 6630.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4956.566665649414,\r
+    "y": 6585.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6c2541da.5d16b8",\r
+    "id": "b04660b8.eae2",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5269.566909790039,\r
-    "y": 4939.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5277.566909790039,\r
+    "y": 4894.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5f4b3cc4.eb62f4",\r
+    "id": "3aab431e.930194",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5144.566665649414,\r
-    "y": 5197.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5152.566665649414,\r
+    "y": 5152.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c7484b6a.1b27e8",\r
+    "id": "b6e6466d.f535c8",\r
     "type": "comment",\r
     "name": "Update ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3489.566665649414,\r
-    "y": 4530.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3497.566665649414,\r
+    "y": 4485.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8eb23d5.90166c",\r
+    "id": "eb0222bd.49b5a",\r
     "type": "save",\r
     "name": "update ROOT UNI in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4011.566665649414,\r
-    "y": 4631.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4019.566665649414,\r
+    "y": 4586.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8bbbb496.3df16",\r
+    "id": "e967635e.d5f898",\r
     "type": "save",\r
     "name": "get root uni from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3468.566665649414,\r
-    "y": 4574.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3476.566665649414,\r
+    "y": 4529.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a18c125a.02e14",\r
-        "7f2705d6.db1694",\r
-        "a9eb2c91.698e38"\r
+        "a0645295.c076d8",\r
+        "9cfd1461.a062b8",\r
+        "c3fd0eeb.1191a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f2705d6.db1694",\r
+    "id": "9cfd1461.a062b8",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3657.057632446289,\r
-    "y": 4543.140884399414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3665.057632446289,\r
+    "y": 4498.140884399414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2e3353bd.ee574c"\r
+        "763a574e.7131"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a9eb2c91.698e38",\r
+    "id": "c3fd0eeb.1191a",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3645.566665649414,\r
-    "y": 4582.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3653.566665649414,\r
+    "y": 4537.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5c8fdc07.865394"\r
+        "64809ae2.7e048c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2e3353bd.ee574c",\r
+    "id": "763a574e.7131",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 3816.629165649414,\r
-    "y": 4541.426528930664,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3824.629165649414,\r
+    "y": 4496.426528930664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5c8fdc07.865394",\r
+    "id": "64809ae2.7e048c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3806.566665649414,\r
-    "y": 4583.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3814.566665649414,\r
+    "y": 4538.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9ccbfbe.3763808",\r
+    "id": "9a196ab1.500e98",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3808.566665649414,\r
-    "y": 4627.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3816.566665649414,\r
+    "y": 4582.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b718fb4d.1d2eb",\r
-        "8eb23d5.90166c"\r
+        "6eb0cd28.22b8f4",\r
+        "eb0222bd.49b5a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a18c125a.02e14",\r
+    "id": "a0645295.c076d8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3650.566665649414,\r
-    "y": 4619.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3658.566665649414,\r
+    "y": 4574.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9ccbfbe.3763808"\r
+        "9a196ab1.500e98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b718fb4d.1d2eb",\r
+    "id": "6eb0cd28.22b8f4",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",\r
     "comments": "",\r
-    "x": 3969.566665649414,\r
-    "y": 4559.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3977.566665649414,\r
+    "y": 4514.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "581d9366.e6ee44",\r
+    "id": "a7e951fd.34174",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3834.566665649414,\r
-    "y": 4898.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3842.566665649414,\r
+    "y": 4853.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3bda63fd.be934c",\r
+    "id": "a3ce23a7.48a0c8",\r
     "type": "comment",\r
     "name": "Temporary skipping this check - to support multiple instances in one slice",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5949.449966430664,\r
-    "y": 6648.449966430664,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5957.449966430664,\r
+    "y": 6603.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b22f3c73.35c508",\r
+    "id": "fb45e770.b6fb4",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5149.233901977539,\r
-    "y": 5035.650161743164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5157.233901977539,\r
+    "y": 4990.650161743164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "72bb0449.7c6c4c",\r
+    "id": "7a5a11e8.fe41c8",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5151.450698852539,\r
-    "y": 4995.449966430664,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5159.450698852539,\r
+    "y": 4950.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "76c11af1.9e9b94",\r
+    "id": "c5e59db3.c67ea",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5025.233657836914,\r
-    "y": 5285.650161743164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5033.233657836914,\r
+    "y": 5240.650161743164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9cb7b649.72fc8",\r
+    "id": "57dbe634.714a18",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5027.450454711914,\r
-    "y": 5245.449966430664,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5035.450454711914,\r
+    "y": 5200.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ac700fc2.3e2c98",\r
+    "id": "aa096a62.a00c18",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5115.033462524414,\r
-    "y": 5648.083267211914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5123.033462524414,\r
+    "y": 5603.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9aeab5a.07483c8",\r
+    "id": "a1684c9.099dc3",\r
     "type": "switchNode",\r
     "name": "switch found-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4942.033462524414,\r
-    "y": 5705.083267211914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4950.033462524414,\r
+    "y": 5660.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7adad055.f81858",\r
-        "1c623aa1.b56e9d"\r
+        "322ec37b.7f462c",\r
+        "a4688844.be2738"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7adad055.f81858",\r
+    "id": "322ec37b.7f462c",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5153.033462524414,\r
-    "y": 5705.083267211914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5161.033462524414,\r
+    "y": 5660.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8b4d22b1.51563"\r
+        "32e06877.2a572"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1c623aa1.b56e9d",\r
+    "id": "a4688844.be2738",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5149.033462524414,\r
-    "y": 5753.083267211914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5157.033462524414,\r
+    "y": 5708.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1d139b8d.b9ffb4"\r
+        "748c1810.be501"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8b4d22b1.51563",\r
+    "id": "32e06877.2a572",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5309.033462524414,\r
-    "y": 5701.083267211914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5317.033462524414,\r
+    "y": 5656.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f5948089.056778",\r
-        "eda1ec63.f88a8",\r
-        "116803c1.b8c5c4"\r
+        "c380fc3b.e6c15",\r
+        "4e971f2e.5d2078",\r
+        "7fabceea.e8bd9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1d139b8d.b9ffb4",\r
+    "id": "748c1810.be501",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
     "comments": "",\r
-    "x": 5297.033462524414,\r
-    "y": 5748.083267211914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5305.033462524414,\r
+    "y": 5703.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fa3077ab.1dba8",\r
+    "id": "bf0ec53.d08f2b8",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5618.917251586914,\r
-    "y": 5801.966567993164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5626.917251586914,\r
+    "y": 5756.966567993164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "116803c1.b8c5c4",\r
+    "id": "7fabceea.e8bd9",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5622.700454711914,\r
-    "y": 5840.166763305664,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5630.700454711914,\r
+    "y": 5795.166763305664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "eda1ec63.f88a8",\r
+    "id": "4e971f2e.5d2078",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5729.033462524414,\r
-    "y": 5753.083267211914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5737.033462524414,\r
+    "y": 5708.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f5948089.056778",\r
+    "id": "c380fc3b.e6c15",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainB-uuid",\r
     "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",\r
     "comments": "",\r
-    "x": 5613.033462524414,\r
-    "y": 5701.083267211914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5621.033462524414,\r
+    "y": 5656.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d30afa49.07b758",\r
+    "id": "ddfb9582.3445a8",\r
     "type": "comment",\r
     "name": "populate connectivity-B variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5004.033462524414,\r
-    "y": 5606.083267211914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5012.033462524414,\r
+    "y": 5561.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "221756d1.77b252",\r
+    "id": "3c1017d1.449bb",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4716.366470336914,\r
-    "y": 5781.083267211914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4724.366470336914,\r
+    "y": 5736.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ac700fc2.3e2c98",\r
-        "9aeab5a.07483c8",\r
-        "986cd5c9.02e9d",\r
-        "cfe4284f.245dc"\r
+        "aa096a62.a00c18",\r
+        "a1684c9.099dc3",\r
+        "a4cbceb2.4df788",\r
+        "9c03eaae.aa875"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6b274a0f.281994",\r
+    "id": "21e17170.9d1c4e",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5016.399673461914,\r
-    "y": 6141.766860961914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5024.399673461914,\r
+    "y": 6096.766860961914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9356e875.de45c8",\r
+    "id": "bfe53aa3.d585a8",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5822.683334350586,\r
-    "y": 6978.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5830.683334350586,\r
+    "y": 6933.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4274d693.44e7",\r
+    "id": "66be0922.f0399",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5441.683334350586,\r
-    "y": 6981.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5449.683334350586,\r
+    "y": 6936.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9356e875.de45c8",\r
-        "f4fb32f5.290118",\r
-        "fc73441.6e16238"\r
+        "bfe53aa3.d585a8",\r
+        "f8b29486.7e71d",\r
+        "bf54edf8.ad3758"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f4fb32f5.290118",\r
+    "id": "f8b29486.7e71d",\r
     "type": "switchNode",\r
     "name": "switch $foundVpnName",\r
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5667.683334350586,\r
-    "y": 7033.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5675.683334350586,\r
+    "y": 6988.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7d48e95d.36571"\r
+        "45d6980.5fa0ee8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7d48e95d.36571",\r
+    "id": "45d6980.5fa0ee8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5846.683334350586,\r
-    "y": 7032.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5854.683334350586,\r
+    "y": 6987.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9d07c8b0.2ee89"\r
+        "646b562c.1751a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fc73441.6e16238",\r
+    "id": "bf54edf8.ad3758",\r
     "type": "set",\r
     "name": "set vpnNameToSearch",\r
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",\r
     "comments": "",\r
-    "x": 5668.683334350586,\r
-    "y": 6926.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5676.683334350586,\r
+    "y": 6881.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c7583bfe.6dbd",\r
+    "id": "7c0aae65.c25f7",\r
     "type": "notify",\r
     "name": "notify",\r
     "xml": "<notify plugin='' resource='' action='' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2662.683334350586,\r
-    "y": 975.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 2670.683334350586,\r
+    "y": 930.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "17e6527f.ea49de",\r
+    "id": "c9e93381.966988",\r
     "type": "set",\r
     "name": "set network-route-three",\r
     "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3340.683334350586,\r
-    "y": 751.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3348.683334350586,\r
+    "y": 706.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4ef95e12.fd687",\r
+    "id": "18d11d50.cb3a7b",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3556.683334350586,\r
-    "y": 1079.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3564.683334350586,\r
+    "y": 1034.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "76cbe80c.f4e188",\r
+    "id": "e2e500c.35b568",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3552.192398071289,\r
-    "y": 1122.109390258789,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3560.192398071289,\r
+    "y": 1077.109390258789,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2e93ec7e.d04c6c",\r
+    "id": "ac92425e.1b5228",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3556.192367553711,\r
-    "y": 1170.109359741211,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3564.192367553711,\r
+    "y": 1125.109359741211,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b4c3abcb.bb0aa8"\r
+        "74bd1e76.c1a798"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b4c3abcb.bb0aa8",\r
+    "id": "74bd1e76.c1a798",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3713.683334350586,\r
-    "y": 1169.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3721.683334350586,\r
+    "y": 1124.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c59d6859.c80d1"\r
+        "75cda54f.508c54"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c59d6859.c80d1",\r
+    "id": "75cda54f.508c54",\r
     "type": "switchNode",\r
     "name": "switch nr type",\r
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3883.683364868164,\r
-    "y": 1172.6834869384766,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3891.683364868164,\r
+    "y": 1127.6834869384766,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b806c285.3c1eb",\r
-        "1890bb58.2d4ee5",\r
-        "614f0a7f.a53cf4"\r
+        "b5759425.3c5bd",\r
+        "a5689d25.4480b8",\r
+        "32c4f78e.6013e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b806c285.3c1eb",\r
+    "id": "b5759425.3c5bd",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4057.683334350586,\r
-    "y": 1110.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4065.683334350586,\r
+    "y": 1065.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "224fa1be.62b94e"\r
+        "e254226b.74faf"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1890bb58.2d4ee5",\r
+    "id": "a5689d25.4480b8",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4059.683334350586,\r
-    "y": 1164.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4067.683334350586,\r
+    "y": 1119.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5ec2cf4e.ba2b2"\r
+        "b214dc3a.ed1eb8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "224fa1be.62b94e",\r
+    "id": "e254226b.74faf",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4185.683334350586,\r
-    "y": 1110.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4193.683334350586,\r
+    "y": 1065.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a900cf11.02bcd",\r
-        "1c2b8eb2.2e6009"\r
+        "1e63a796.08e87",\r
+        "c1790587.ac9f08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5ec2cf4e.ba2b2",\r
+    "id": "b214dc3a.ed1eb8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4188.683334350586,\r
-    "y": 1163.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4196.683334350586,\r
+    "y": 1118.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "459af4e0.72f56c",\r
-        "8371ef21.19884"\r
+        "ea9630d6.e1db68",\r
+        "7cd0ca92.870d14"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1c2b8eb2.2e6009",\r
+    "id": "c1790587.ac9f08",\r
     "type": "set",\r
     "name": "set network-route-B",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4346.683334350586,\r
-    "y": 1134.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4354.683334350586,\r
+    "y": 1089.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "459af4e0.72f56c",\r
+    "id": "ea9630d6.e1db68",\r
     "type": "set",\r
     "name": "set network-route-LEAF",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4363.683334350586,\r
-    "y": 1176.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4371.683334350586,\r
+    "y": 1131.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8371ef21.19884",\r
+    "id": "7cd0ca92.870d14",\r
     "type": "set",\r
     "name": "set network-route-A",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4348.683334350586,\r
-    "y": 1214.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4356.683334350586,\r
+    "y": 1169.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a900cf11.02bcd",\r
+    "id": "1e63a796.08e87",\r
     "type": "set",\r
     "name": "set network-route-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4360.683334350586,\r
-    "y": 1094.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4368.683334350586,\r
+    "y": 1049.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f4867be8.a3739",\r
+    "id": "5b64a8f4.eea95",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4525.683334350586,\r
-    "y": 1110.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4533.683334350586,\r
+    "y": 1065.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c22e8ab9.0a6b88",\r
+    "id": "5fc9799.82ba788",\r
     "type": "save",\r
     "name": "get network-route-three from aai",\r
     "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\">",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3316.683334350586,\r
-    "y": 1096.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3324.683334350586,\r
+    "y": 1051.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4ef95e12.fd687",\r
-        "76cbe80c.f4e188",\r
-        "2e93ec7e.d04c6c"\r
+        "18d11d50.cb3a7b",\r
+        "e2e500c.35b568",\r
+        "ac92425e.1b5228"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "614f0a7f.a53cf4",\r
+    "id": "32c4f78e.6013e8",\r
     "type": "outcome",\r
     "name": "SECONDARY-ROOT",\r
     "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4002.683334350586,\r
-    "y": 1228.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4010.683334350586,\r
+    "y": 1183.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7f1b4232.b1cfb4"\r
+        "e8d5048b.eb9908"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f1b4232.b1cfb4",\r
+    "id": "e8d5048b.eb9908",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4176.683334350586,\r
-    "y": 1223.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4184.683334350586,\r
+    "y": 1178.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "838abc45.59f7a",\r
-        "db00c52c.5ed268"\r
+        "cbdde789.933e38",\r
+        "ff9c265d.ccb66"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "db00c52c.5ed268",\r
+    "id": "ff9c265d.ccb66",\r
     "type": "set",\r
     "name": "set network-route-C",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4346.683334350586,\r
-    "y": 1296.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4354.683334350586,\r
+    "y": 1251.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "838abc45.59f7a",\r
+    "id": "cbdde789.933e38",\r
     "type": "set",\r
     "name": "set network-route-SECONDARY-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4400.683334350586,\r
-    "y": 1256.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4408.683334350586,\r
+    "y": 1211.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ff2b32b5.5b2a08",\r
+    "id": "fa28f519.9b734",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4514.683334350586,\r
-    "y": 1281.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4522.683334350586,\r
+    "y": 1236.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "56529717.d57cf",\r
+    "id": "65095290.735c7c",\r
     "type": "outcome",\r
     "name": "SECONDARY-ROOT",\r
     "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4073.683334350586,\r
-    "y": 984.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4081.683334350586,\r
+    "y": 939.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ee2de2c6.4f08d8"\r
+        "6a27287d.2ebf6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ca426e77.b8a868",\r
+    "id": "d7809ac8.28364",\r
     "type": "set",\r
     "name": "set network-route-C",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4417.683334350586,\r
-    "y": 1052.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4425.683334350586,\r
+    "y": 1007.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f04a072d.a1bc78",\r
+    "id": "38b369ba.8d91fe",\r
     "type": "set",\r
     "name": "set network-route-SECONDARY-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4471.683334350586,\r
-    "y": 1012.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4479.683334350586,\r
+    "y": 967.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "494ac499.527a64",\r
+    "id": "7d1c2c8b.bd9814",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4615.683334350586,\r
-    "y": 1041.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4623.683334350586,\r
+    "y": 996.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ee2de2c6.4f08d8",\r
+    "id": "6a27287d.2ebf6",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4247.683334350586,\r
-    "y": 979.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4255.683334350586,\r
+    "y": 934.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f04a072d.a1bc78",\r
-        "ca426e77.b8a868"\r
+        "38b369ba.8d91fe",\r
+        "d7809ac8.28364"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fbdccf10.5fabc",\r
+    "id": "b03ebc69.8e68d8",\r
     "type": "outcome",\r
     "name": "SECONDARY-ROOT",\r
     "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4133.683334350586,\r
-    "y": 722.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4141.683334350586,\r
+    "y": 677.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b0420846.4df49"\r
+        "e58f35e3.4b6a2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6f89ab47.26e854",\r
+    "id": "6a2c136e.692edc",\r
     "type": "set",\r
     "name": "set network-route-C",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4477.683334350586,\r
-    "y": 790.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4485.683334350586,\r
+    "y": 745.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bf3e885.5679178",\r
+    "id": "66ae94b1.018af4",\r
     "type": "set",\r
     "name": "set network-route-SECONDARY-ROOT",\r
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
     "comments": "",\r
-    "x": 4531.683334350586,\r
-    "y": 750.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4539.683334350586,\r
+    "y": 705.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fd3136c3.1f9f9",\r
+    "id": "33be367d.fbce62",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4645.683334350586,\r
-    "y": 775.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4653.683334350586,\r
+    "y": 730.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b0420846.4df49",\r
+    "id": "e58f35e3.4b6a2",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4307.683334350586,\r
-    "y": 717.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4315.683334350586,\r
+    "y": 672.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "bf3e885.5679178",\r
-        "6f89ab47.26e854"\r
+        "66ae94b1.018af4",\r
+        "6a2c136e.692edc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d5e167ce.f19998",\r
+    "id": "64cdb464.83135c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3714.683334350586,\r
-    "y": 2599.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3722.683334350586,\r
+    "y": 2554.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "eb74e655.05ff7",\r
-        "e886ebc1.1661e8"\r
+        "7a3829d.42a01d8",\r
+        "d03e5e53.5cee58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "47201997.7cc3c",\r
+    "id": "6e42edd4.58cd0c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3542.016830444336,\r
-    "y": 2600.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3550.016830444336,\r
+    "y": 2555.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d5e167ce.f19998"\r
+        "64cdb464.83135c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "164be473.b70384",\r
+    "id": "b61e07a3.0e4238",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3551.507797241211,\r
-    "y": 2643.257369995117,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3559.507797241211,\r
+    "y": 2598.257369995117,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "784aa04.7c1dfe",\r
+    "id": "2df3a08e.41f4c",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3540.016830444336,\r
-    "y": 2689.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3548.016830444336,\r
+    "y": 2644.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "eb74e655.05ff7",\r
+    "id": "7a3829d.42a01d8",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4001.016830444336,\r
-    "y": 2603.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4009.016830444336,\r
+    "y": 2558.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3f64df6c.c641f8",\r
-        "e65de275.42f878"\r
+        "38c64779.e618f",\r
+        "14f81708.27e459"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e65de275.42f878",\r
+    "id": "14f81708.27e459",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4224.016830444336,\r
-    "y": 2558.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4232.016830444336,\r
+    "y": 2513.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "34b4944b.960704"\r
+        "2753f3be.c9c924"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3f64df6c.c641f8",\r
+    "id": "38c64779.e618f",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4226.016830444336,\r
-    "y": 2622.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4234.016830444336,\r
+    "y": 2577.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "699d84d7.6602fc"\r
+        "43ad3093.31a088"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9c75cfb6.9dae68",\r
+    "id": "9fbb56ee.c43378",\r
     "type": "save",\r
     "name": "get p-interface-dst from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3314.016830444336,\r
-    "y": 2635.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3322.016830444336,\r
+    "y": 2590.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "47201997.7cc3c",\r
-        "164be473.b70384",\r
-        "784aa04.7c1dfe"\r
+        "6e42edd4.58cd0c",\r
+        "b61e07a3.0e4238",\r
+        "2df3a08e.41f4c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "23b8fd1e.0cb2fa",\r
+    "id": "ac1718b4.765b78",\r
     "type": "comment",\r
     "name": "Question?",\r
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
     "comments": "",\r
-    "x": 3275.016830444336,\r
-    "y": 2579.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3283.016830444336,\r
+    "y": 2534.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "647f2e19.e50158",\r
+    "id": "7ebd6769.0b5428",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3334.016830444336,\r
-    "y": 2375.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3342.016830444336,\r
+    "y": 2330.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5e42c344.eae60c",\r
-        "af9299b9.b3a958"\r
+        "2f0a58a8.ee7038",\r
+        "79cdcb97.546894"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "af9299b9.b3a958",\r
+    "id": "79cdcb97.546894",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3557.016830444336,\r
-    "y": 2361.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3565.016830444336,\r
+    "y": 2316.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9102a653.17d73"\r
+        "49eedb67.f00374"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5e42c344.eae60c",\r
+    "id": "2f0a58a8.ee7038",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3559.016830444336,\r
-    "y": 2394.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3567.016830444336,\r
+    "y": 2349.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9102a653.17d73",\r
+    "id": "49eedb67.f00374",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3705.016830444336,\r
-    "y": 2354.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3713.016830444336,\r
+    "y": 2309.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9818833d.58ad9",\r
-        "288d55d1.6f744a"\r
+        "f5d93681.391ea",\r
+        "66937670.413898"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9818833d.58ad9",\r
+    "id": "f5d93681.391ea",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "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",\r
     "comments": "",\r
-    "x": 3899.016830444336,\r
-    "y": 2357.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3907.016830444336,\r
+    "y": 2312.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e886ebc1.1661e8",\r
+    "id": "d03e5e53.5cee58",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3952.016799926758,\r
-    "y": 2726.683303833008,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3960.016799926758,\r
+    "y": 2681.683303833008,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f013a1b2.101138"\r
+        "1dfcba6a.928896"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f013a1b2.101138",\r
+    "id": "1dfcba6a.928896",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4158.016799926758,\r
-    "y": 2726.683303833008,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4166.016799926758,\r
+    "y": 2681.683303833008,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "386bba62.16259e"\r
+        "ad7b62a1.1a3de8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "288d55d1.6f744a",\r
+    "id": "66937670.413898",\r
     "type": "get-resource",\r
     "name": "get-resource src pnf",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3921.016830444336,\r
-    "y": 2425.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3929.016830444336,\r
+    "y": 2380.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "50cea31f.42d1c4",\r
-        "35a7b03.f8d85d",\r
-        "21702f57.67315"\r
+        "7e1c1529.6f1464",\r
+        "e1251115.be77b",\r
+        "d084db0e.513758"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "50cea31f.42d1c4",\r
+    "id": "7e1c1529.6f1464",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4116.516952514648,\r
-    "y": 2377.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4124.516952514648,\r
+    "y": 2332.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "295cc726.ea872"\r
+        "24a5d36d.06630c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "35a7b03.f8d85d",\r
+    "id": "e1251115.be77b",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4108.516952514648,\r
-    "y": 2432.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4116.516952514648,\r
+    "y": 2387.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2c7fef61.a7451"\r
+        "e4759099.9196a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "21702f57.67315",\r
+    "id": "d084db0e.513758",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4113.516952514648,\r
-    "y": 2489.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4121.516952514648,\r
+    "y": 2444.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9bbdca0e.a0cf58"\r
+        "68e5ccfb.96ac94"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9bbdca0e.a0cf58",\r
+    "id": "68e5ccfb.96ac94",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4265.516952514648,\r
-    "y": 2490.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4273.516952514648,\r
+    "y": 2445.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "295cc726.ea872",\r
+    "id": "24a5d36d.06630c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4260.899276733398,\r
-    "y": 2375.339126586914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4268.899276733398,\r
+    "y": 2330.339126586914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "723c9a0.e71c268"\r
+        "b2ff1ea.8d4406"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9a8ce081.e6446",\r
+    "id": "387e5bde.fd50e4",\r
     "type": "set",\r
     "name": "set SECONDARY-ROOT stuff",\r
     "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",\r
     "comments": "",\r
-    "x": 3336.683334350586,\r
-    "y": 2714.683334350586,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3344.683334350586,\r
+    "y": 2669.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c2ddeb07.7a6948",\r
+    "id": "4cfd3be4.f62fcc",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4011.683303833008,\r
-    "y": 2678.683303833008,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4019.683303833008,\r
+    "y": 2633.683303833008,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "699d84d7.6602fc",\r
+    "id": "43ad3093.31a088",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 4385.016830444336,\r
-    "y": 2641.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4393.016830444336,\r
+    "y": 2596.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "34b4944b.960704",\r
+    "id": "2753f3be.c9c924",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4389.016830444336,\r
-    "y": 2555.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4397.016830444336,\r
+    "y": 2510.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "276189b1.3ed3ce",\r
-        "a978fa30.e2e848"\r
+        "a6bf1231.b0b2f8",\r
+        "b6449bb5.90e018"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "386bba62.16259e",\r
+    "id": "ad7b62a1.1a3de8",\r
     "type": "outcome",\r
     "name": "tunnel-termination-point",\r
     "xml": "<outcome value='tunnel-termination-point'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4375.302444458008,\r
-    "y": 2725.505081176758,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4383.302444458008,\r
+    "y": 2680.505081176758,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "89559da6.e6cb3"\r
+        "e5d22111.f520c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2c7fef61.a7451",\r
+    "id": "e4759099.9196a",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4276.516952514648,\r
-    "y": 2435.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4284.516952514648,\r
+    "y": 2390.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "276189b1.3ed3ce",\r
+    "id": "a6bf1231.b0b2f8",\r
     "type": "set",\r
     "name": "set ltpId",\r
     "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",\r
     "comments": "",\r
-    "x": 4559.016830444336,\r
-    "y": 2516.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4567.016830444336,\r
+    "y": 2471.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a978fa30.e2e848",\r
+    "id": "b6449bb5.90e018",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",\r
     "comments": "",\r
-    "x": 4560.016830444336,\r
-    "y": 2621.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4568.016830444336,\r
+    "y": 2576.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1a2899c1.f9127e",\r
+    "id": "2544beb5.524cf2",\r
     "type": "comment",\r
     "name": "TODO: FIXME",\r
     "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",\r
     "comments": "",\r
-    "x": 4555.016830444336,\r
-    "y": 2570.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4563.016830444336,\r
+    "y": 2525.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "89559da6.e6cb3",\r
+    "id": "e5d22111.f520c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4582.133987426758,\r
-    "y": 2715.0237579345703,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4590.133987426758,\r
+    "y": 2670.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8f483fd3.15e2b",\r
-        "5a0d7606.c42ec8",\r
-        "f5ace162.1d1728"\r
+        "387e5354.258eec",\r
+        "d91f6407.9298c8",\r
+        "8a12363d.8f67b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8f483fd3.15e2b",\r
+    "id": "387e5354.258eec",\r
     "type": "set",\r
     "name": "set destination ttp-id",\r
     "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",\r
     "comments": "",\r
-    "x": 4797.133987426758,\r
-    "y": 2677.0237579345703,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4805.133987426758,\r
+    "y": 2632.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5a0d7606.c42ec8",\r
+    "id": "d91f6407.9298c8",\r
     "type": "get-resource",\r
     "name": "get-resource src TTP",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4794.133987426758,\r
-    "y": 2716.0237579345703,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4802.133987426758,\r
+    "y": 2671.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "be061b72.c7b818"\r
+        "824c0ca3.93f64"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f5ace162.1d1728",\r
+    "id": "8a12363d.8f67b8",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4749.633987426758,\r
-    "y": 2758.0237579345703,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4757.633987426758,\r
+    "y": 2713.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b11d681f.057f4",\r
+    "id": "b23c99bf.cf2e8",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4843.016830444336,\r
-    "y": 2393.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4851.016830444336,\r
+    "y": 2348.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "530fa7ff.bc17d"\r
+        "97206b42.8c742"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "723c9a0.e71c268",\r
+    "id": "b2ff1ea.8d4406",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4445.016830444336,\r
-    "y": 2389.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4453.016830444336,\r
+    "y": 2344.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "46b1f311.91a404"\r
+        "3bc9e41b.32e2f4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "46b1f311.91a404",\r
+    "id": "3bc9e41b.32e2f4",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4640.016830444336,\r
-    "y": 2389.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4648.016830444336,\r
+    "y": 2344.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b11d681f.057f4",\r
-        "6f790d02.3c377c"\r
+        "b23c99bf.cf2e8",\r
+        "c333a868.fb119"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6f790d02.3c377c",\r
+    "id": "c333a868.fb119",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4845.016830444336,\r
-    "y": 2466.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4853.016830444336,\r
+    "y": 2421.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e6043cfa.36703"\r
+        "bd453b0b.71f93"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "be061b72.c7b818",\r
+    "id": "824c0ca3.93f64",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4974.633987426758,\r
-    "y": 2715.0237579345703,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4982.633987426758,\r
+    "y": 2670.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ce777f2e.3171a8"\r
+        "95206ee6.94dd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ce777f2e.3171a8",\r
+    "id": "95206ee6.94dd",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5132.633987426758,\r
-    "y": 2715.0237579345703,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5140.633987426758,\r
+    "y": 2670.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b697c93d.c44198"\r
+        "a1087d28.90e2f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b697c93d.c44198",\r
+    "id": "a1087d28.90e2f",\r
     "type": "set",\r
     "name": "set destination tunnel tp ip",\r
     "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",\r
     "comments": "",\r
-    "x": 5339.633987426758,\r
-    "y": 2715.0237579345703,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5347.633987426758,\r
+    "y": 2670.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "530fa7ff.bc17d",\r
+    "id": "97206b42.8c742",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5020.016830444336,\r
-    "y": 2385.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5028.016830444336,\r
+    "y": 2340.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5455e2bb.51abf4",\r
-        "38fcf2b0.31bbc6"\r
+        "4cfed3d4.2e715c",\r
+        "b3c82e8a.c152c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "38fcf2b0.31bbc6",\r
+    "id": "b3c82e8a.c152c",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "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' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5228.016830444336,\r
-    "y": 2392.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5236.016830444336,\r
+    "y": 2347.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "46db257f.be5d5c",\r
-        "10ef5dcf.987c42",\r
-        "cdb4ea9.23d2198"\r
+        "c3765dd7.98e19",\r
+        "82480139.31c848",\r
+        "da19380a.5cc67"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e6043cfa.36703",\r
+    "id": "bd453b0b.71f93",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5022.016830444336,\r
-    "y": 2458.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5030.016830444336,\r
+    "y": 2413.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "dba257b1.4bfa28"\r
+        "14471967.2bb00f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5455e2bb.51abf4",\r
+    "id": "4cfed3d4.2e715c",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainC id",\r
     "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",\r
     "comments": "",\r
-    "x": 5258.016830444336,\r
-    "y": 2340.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5266.016830444336,\r
+    "y": 2295.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "dba257b1.4bfa28",\r
+    "id": "14471967.2bb00f",\r
     "type": "set",\r
     "name": "set domainC ethernet layer network-id",\r
     "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",\r
     "comments": "",\r
-    "x": 5257.016830444336,\r
-    "y": 2582.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5265.016830444336,\r
+    "y": 2537.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "46db257f.be5d5c",\r
+    "id": "c3765dd7.98e19",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5438.016830444336,\r
-    "y": 2383.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5446.016830444336,\r
+    "y": 2338.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "40633d04.a1b504"\r
+        "eb76aab.05915d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "10ef5dcf.987c42",\r
+    "id": "82480139.31c848",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5430.016830444336,\r
-    "y": 2438.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5438.016830444336,\r
+    "y": 2393.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7af2b98b.8d665"\r
+        "3c8ef50f.dc9d5a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cdb4ea9.23d2198",\r
+    "id": "da19380a.5cc67",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5435.016830444336,\r
-    "y": 2495.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5443.016830444336,\r
+    "y": 2450.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f683ae7d.1eb048"\r
+        "11ed4dc4.069aca"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f683ae7d.1eb048",\r
+    "id": "11ed4dc4.069aca",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5587.016830444336,\r
-    "y": 2496.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5595.016830444336,\r
+    "y": 2451.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7af2b98b.8d665",\r
+    "id": "3c8ef50f.dc9d5a",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5598.016830444336,\r
-    "y": 2441.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5606.016830444336,\r
+    "y": 2396.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "40633d04.a1b504",\r
+    "id": "eb76aab.05915d8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5582.399154663086,\r
-    "y": 2381.339126586914,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5590.399154663086,\r
+    "y": 2336.339126586914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8b20e4dc.c76628"\r
+        "57675f66.16eb5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8b20e4dc.c76628",\r
+    "id": "57675f66.16eb5",\r
     "type": "set",\r
     "name": "set controller domainC data",\r
     "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",\r
     "comments": "",\r
-    "x": 5797.016830444336,\r
-    "y": 2377.6834564208984,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5805.016830444336,\r
+    "y": 2332.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c989c621.8b708",\r
+    "id": "a78822a6.5321b",\r
     "type": "switchNode",\r
     "name": "switch secondary empty?",\r
     "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3310.683334350586,\r
-    "y": 850.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3318.683334350586,\r
+    "y": 805.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c25ccae3.59498",\r
-        "69b0287f.333378"\r
+        "ee3317c4.be6f98",\r
+        "785558d0.46aa7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c25ccae3.59498",\r
+    "id": "ee3317c4.be6f98",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3432.683364868164,\r
-    "y": 795.6833648681641,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3440.683364868164,\r
+    "y": 750.6833648681641,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "18001e31.10fe62"\r
+        "b70329ff.3ba71"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "69b0287f.333378",\r
+    "id": "785558d0.46aa7",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3419.683364868164,\r
-    "y": 904.6833648681641,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3427.683364868164,\r
+    "y": 859.6833648681641,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "643ae015.6b3ff8"\r
+        "e7d34a7a.6aac6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "18001e31.10fe62",\r
+    "id": "b70329ff.3ba71",\r
     "type": "set",\r
     "name": "set hasSecondary false",\r
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3647.683334350586,\r
-    "y": 632.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3655.683334350586,\r
+    "y": 587.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "643ae015.6b3ff8",\r
+    "id": "e7d34a7a.6aac6",\r
     "type": "set",\r
     "name": "set hasSecondary true",\r
     "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",\r
     "comments": "",\r
-    "x": 3643.683334350586,\r
-    "y": 676.6833343505859,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3651.683334350586,\r
+    "y": 631.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "25259a32.c04fe6",\r
+    "id": "3cc87f7.3864a",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3840.683364868164,\r
-    "y": 3576.683364868164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3848.683364868164,\r
+    "y": 3531.683364868164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e17fd7c.5d8d2a8"\r
+        "f7171cc6.827928"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e17fd7c.5d8d2a8",\r
+    "id": "f7171cc6.827928",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4031.683364868164,\r
-    "y": 3580.683364868164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4039.683364868164,\r
+    "y": 3535.683364868164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "6f9d8ee6.40f9a8"\r
+        "27271b87.886184"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6f9d8ee6.40f9a8",\r
+    "id": "27271b87.886184",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4158.683364868164,\r
-    "y": 3579.683364868164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4166.683364868164,\r
+    "y": 3534.683364868164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5d450f44.f186c8",\r
-        "87679aab.884488"\r
+        "90e47ea0.ecee8",\r
+        "8a6c8ced.8f741"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "87679aab.884488",\r
+    "id": "8a6c8ced.8f741",\r
     "type": "save",\r
     "name": "save SECONDARY-ROOT UNI in AAI",\r
-    "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",\r
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4380.683364868164,\r
-    "y": 3468.683364868164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4388.683364868164,\r
+    "y": 3423.683364868164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "88b89d66.20648",\r
+    "id": "a4c94b0b.1b4718",\r
     "type": "set",\r
     "name": "unset secondary related variables",\r
     "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",\r
     "comments": "",\r
-    "x": 3385.566665649414,\r
-    "y": 508.56666564941406,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3393.566665649414,\r
+    "y": 463.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5d450f44.f186c8",\r
+    "id": "90e47ea0.ecee8",\r
     "type": "switchNode",\r
     "name": "switch 2-ROOTS in same domain?",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4376.566665649414,\r
-    "y": 3527.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4384.566665649414,\r
+    "y": 3482.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a8e3fac.bdef108",\r
-        "d683cc3e.7534e8"\r
+        "61b6ba56.719bdc",\r
+        "226a53c4.28be4c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a8e3fac.bdef108",\r
+    "id": "61b6ba56.719bdc",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4586.566665649414,\r
-    "y": 3504.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4594.566665649414,\r
+    "y": 3459.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d7e8440b.3d707"\r
+        "3f2dca65.c993b6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d7e8440b.3d707",\r
+    "id": "3f2dca65.c993b6",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4712.566665649414,\r
-    "y": 3504.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4720.566665649414,\r
+    "y": 3459.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "23eff82f.a0dc88"\r
+        "812380f1.94aae8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a5367218.35d1e",\r
+    "id": "32cc56e4.b47402",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4717.566665649414,\r
-    "y": 3553.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4725.566665649414,\r
+    "y": 3508.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "67e71008.eb1898",\r
-        "df5e72dc.bc108",\r
-        "728f0d90.8753cc",\r
-        "8686c784.f837e"\r
+        "7de42311.cfc97c",\r
+        "94a4f684.655798",\r
+        "9102db37.03feb",\r
+        "168bc7a3.f57628"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d683cc3e.7534e8",\r
+    "id": "226a53c4.28be4c",\r
     "type": "outcomeTrue",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4591.566665649414,\r
-    "y": 3553.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4599.566665649414,\r
+    "y": 3508.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a5367218.35d1e"\r
+        "32cc56e4.b47402"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "23eff82f.a0dc88",\r
+    "id": "812380f1.94aae8",\r
     "type": "save",\r
     "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5040.566665649414,\r
-    "y": 3501.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5048.566665649414,\r
+    "y": 3456.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "67e71008.eb1898",\r
+    "id": "7de42311.cfc97c",\r
     "type": "execute",\r
     "name": "execute UUID generator for connectivity domainC",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4993.566665649414,\r
-    "y": 3592.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5001.566665649414,\r
+    "y": 3547.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "df5e72dc.bc108",\r
+    "id": "94a4f684.655798",\r
     "type": "save",\r
     "name": "save connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4941.566665649414,\r
-    "y": 3634.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4949.566665649414,\r
+    "y": 3589.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "728f0d90.8753cc",\r
+    "id": "9102db37.03feb",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5070.566665649414,\r
-    "y": 3676.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5078.566665649414,\r
+    "y": 3631.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "41be2f96.b765f8",\r
+    "id": "3c0b7ceb.8c4ecc",\r
     "type": "comment",\r
     "name": "Create SECONDARY-ROOT connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4956.566665649414,\r
-    "y": 3549.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4964.566665649414,\r
+    "y": 3504.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8686c784.f837e",\r
+    "id": "168bc7a3.f57628",\r
     "type": "save",\r
     "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5048.566665649414,\r
-    "y": 3724.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5056.566665649414,\r
+    "y": 3679.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "561c7038.198b5",\r
+    "id": "54d0b322.54c85c",\r
     "type": "comment",\r
     "name": "Create SECONDARY-ROOT UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3868.566665649414,\r
-    "y": 3527.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3876.566665649414,\r
+    "y": 3482.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b87e18c5.0db5e8",\r
+    "id": "5fefabc6.f62f5c",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3843.566665649414,\r
-    "y": 4198.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3851.566665649414,\r
+    "y": 4153.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "be1f4e62.15aa38"\r
+        "b4ef06b7.1fe62"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "be1f4e62.15aa38",\r
+    "id": "b4ef06b7.1fe62",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4035.566665649414,\r
-    "y": 4193.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4043.566665649414,\r
+    "y": 4148.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a0659afe.abed3"\r
+        "815df3f1.7eb0f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a0659afe.abed3",\r
+    "id": "815df3f1.7eb0f",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4164.566665649414,\r
-    "y": 4193.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4172.566665649414,\r
+    "y": 4148.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "aacb47f4.be072"\r
+        "67264e9c.83602"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "aacb47f4.be072",\r
+    "id": "67264e9c.83602",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4496.566665649414,\r
-    "y": 4191.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4504.566665649414,\r
+    "y": 4146.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "88b90ca8.e250c",\r
+    "id": "dbd95dbb.cf097",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3831.566665649414,\r
-    "y": 4422.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3839.566665649414,\r
+    "y": 4377.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d69507e0.d93c6"\r
+        "aef64578.f3199"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d69507e0.d93c6",\r
+    "id": "aef64578.f3199",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4011.566665649414,\r
-    "y": 4421.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4019.566665649414,\r
+    "y": 4376.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "280736a4.7aa0f2"\r
+        "9830e38b.25b19"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "280736a4.7aa0f2",\r
+    "id": "9830e38b.25b19",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4140.566665649414,\r
-    "y": 4421.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4148.566665649414,\r
+    "y": 4376.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ff5dea73.98b998"\r
+        "7d4e5c3a.fc6a0c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ff5dea73.98b998",\r
+    "id": "7d4e5c3a.fc6a0c",\r
     "type": "switchNode",\r
     "name": "switch 2-ROOTS in same domain?",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4358.449966430664,\r
-    "y": 4420.449966430664,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4366.449966430664,\r
+    "y": 4375.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "860e2e4b.61a0d8"\r
+        "1e59b518.b0bee3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "860e2e4b.61a0d8",\r
+    "id": "1e59b518.b0bee3",\r
     "type": "outcomeTrue",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4573.449966430664,\r
-    "y": 4420.449966430664,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4581.449966430664,\r
+    "y": 4375.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3ff2617b.840e76"\r
+        "40af1183.5043e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3ff2617b.840e76",\r
+    "id": "40af1183.5043e",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4705.449966430664,\r
-    "y": 4420.449966430664,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4713.449966430664,\r
+    "y": 4375.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "96149cb2.d633c"\r
+        "9532f45e.79d66"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "96149cb2.d633c",\r
+    "id": "9532f45e.79d66",\r
     "type": "save",\r
     "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5069.566665649414,\r
-    "y": 4419.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5077.566665649414,\r
+    "y": 4374.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f0668881.7d6d6",\r
+    "id": "147222b6.72d4a5",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3506.566665649414,\r
-    "y": 4677.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3514.566665649414,\r
+    "y": 4632.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2492336a.68b20c"\r
+        "adad110b.2a8008"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2492336a.68b20c",\r
+    "id": "adad110b.2a8008",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3686.566665649414,\r
-    "y": 4676.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3694.566665649414,\r
+    "y": 4631.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f54b8794.2acdd"\r
+        "b9b6357c.7dc958"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f54b8794.2acdd",\r
+    "id": "b9b6357c.7dc958",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3815.566665649414,\r
-    "y": 4676.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3823.566665649414,\r
+    "y": 4631.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c3a4f53e.304d78"\r
+        "883d53e4.0057c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "84f57def.b063a",\r
+    "id": "8f1b73bf.36d998",\r
     "type": "comment",\r
     "name": "Update SECONDARY-ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3551.566665649414,\r
-    "y": 4735.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3559.566665649414,\r
+    "y": 4690.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cebbd661.72d4b8",\r
+    "id": "f9162d4b.d76cb",\r
     "type": "save",\r
     "name": "update S-ROOT UNI in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4117.566665649414,\r
-    "y": 4834.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4125.566665649414,\r
+    "y": 4789.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c3a4f53e.304d78",\r
+    "id": "883d53e4.0057c",\r
     "type": "save",\r
     "name": "get S-root uni from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3581.566665649414,\r
-    "y": 4768.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3589.566665649414,\r
+    "y": 4723.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9d76d7ba.037948",\r
-        "c6779daf.7d7a8",\r
-        "62f3b274.175fb4"\r
+        "a081e505.7d3b8",\r
+        "370b0cd4.1d67f4",\r
+        "3bb246d3.6b0eb2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c6779daf.7d7a8",\r
+    "id": "370b0cd4.1d67f4",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3763.057632446289,\r
-    "y": 4746.140884399414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3771.057632446289,\r
+    "y": 4701.140884399414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "168b9f85.394368"\r
+        "21a39fa9.8cdbc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "62f3b274.175fb4",\r
+    "id": "3bb246d3.6b0eb2",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3751.566665649414,\r
-    "y": 4785.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3759.566665649414,\r
+    "y": 4740.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "6d9d5aec.85fd34"\r
+        "3acf6433.2f683c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "168b9f85.394368",\r
+    "id": "21a39fa9.8cdbc",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 3922.629165649414,\r
-    "y": 4744.426528930664,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3930.629165649414,\r
+    "y": 4699.426528930664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6d9d5aec.85fd34",\r
+    "id": "3acf6433.2f683c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3912.566665649414,\r
-    "y": 4786.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3920.566665649414,\r
+    "y": 4741.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1514bf18.105d59",\r
+    "id": "c435208e.fb61a8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3914.566665649414,\r
-    "y": 4830.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3922.566665649414,\r
+    "y": 4785.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "16719b54.ca935d",\r
-        "cebbd661.72d4b8"\r
+        "6438caae.bf37d4",\r
+        "f9162d4b.d76cb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9d76d7ba.037948",\r
+    "id": "a081e505.7d3b8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3756.566665649414,\r
-    "y": 4822.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3764.566665649414,\r
+    "y": 4777.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1514bf18.105d59"\r
+        "c435208e.fb61a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "16719b54.ca935d",\r
+    "id": "6438caae.bf37d4",\r
     "type": "set",\r
     "name": "set new bw",\r
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",\r
     "comments": "",\r
-    "x": 4075.566665649414,\r
-    "y": 4762.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4083.566665649414,\r
+    "y": 4717.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "993866bb.1b2058",\r
+    "id": "3f5c519e.52fcfe",\r
     "type": "comment",\r
     "name": "populate connectivity-C variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4441.566665649414,\r
-    "y": 5330.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4449.566665649414,\r
+    "y": 5285.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f715ac9f.9b32b8",\r
+    "id": "128b476.c3c24b9",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4596.566665649414,\r
-    "y": 5371.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4604.566665649414,\r
+    "y": 5326.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c2d27f90.576768",\r
+    "id": "ef90095c.80a978",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainC-uuid",\r
     "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",\r
     "comments": "",\r
-    "x": 5039.566665649414,\r
-    "y": 5419.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5047.566665649414,\r
+    "y": 5374.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "79d51ab0.5a125c",\r
+    "id": "b1e27ce1.629f7",\r
     "type": "switchNode",\r
     "name": "switch found-secondary-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4412.566665649414,\r
-    "y": 5429.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4420.566665649414,\r
+    "y": 5384.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fbb7e2aa.d5f0a8",\r
-        "7443db3b.00f94c"\r
+        "6c93874b.ea46a8",\r
+        "a48ce649.08b9f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fbb7e2aa.d5f0a8",\r
+    "id": "6c93874b.ea46a8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4648.566665649414,\r
-    "y": 5413.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4656.566665649414,\r
+    "y": 5368.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2a6159e8.abaf0e"\r
+        "2bac874c.98bee"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2a6159e8.abaf0e",\r
+    "id": "2bac874c.98bee",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4792.566665649414,\r
-    "y": 5415.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4800.566665649414,\r
+    "y": 5370.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c2d27f90.576768",\r
-        "5c6afd36.faf1f4",\r
-        "86183466.e0956"\r
+        "ef90095c.80a978",\r
+        "900ede93.5cfd68",\r
+        "c9e4ee74.f1da1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7443db3b.00f94c",\r
+    "id": "a48ce649.08b9f8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4647.566665649414,\r
-    "y": 5461.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4655.566665649414,\r
+    "y": 5416.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5c6afd36.faf1f4",\r
+    "id": "900ede93.5cfd68",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5160.566665649414,\r
-    "y": 5466.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5168.566665649414,\r
+    "y": 5421.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "86183466.e0956",\r
+    "id": "c9e4ee74.f1da1",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5042.233657836914,\r
-    "y": 5551.650161743164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5050.233657836914,\r
+    "y": 5506.650161743164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "85909b06.96d1d8",\r
+    "id": "80a5d0bc.394668",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5043.450454711914,\r
-    "y": 5510.449966430664,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5051.450454711914,\r
+    "y": 5465.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d5d61aed.e9642",\r
+    "id": "7af1ce17.a2c558",\r
     "type": "set",\r
     "name": "set prop.connectivity-domainC-uuid",\r
     "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",\r
     "comments": "",\r
-    "x": 5574.566665649414,\r
-    "y": 5898.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5582.566665649414,\r
+    "y": 5853.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cfe4284f.245dc",\r
+    "id": "9c03eaae.aa875",\r
     "type": "switchNode",\r
     "name": "switch found-secondary-root-connectivity",\r
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4947.566665649414,\r
-    "y": 5908.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4955.566665649414,\r
+    "y": 5863.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "67276eef.04fd3",\r
-        "9ce9471a.def67"\r
+        "c8852cc.de0315",\r
+        "d3e42d04.fd0a28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "67276eef.04fd3",\r
+    "id": "c8852cc.de0315",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5180.566665649414,\r
-    "y": 5902.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5188.566665649414,\r
+    "y": 5857.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7fd061d3.3dea5"\r
+        "3860ec82.4027f4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7fd061d3.3dea5",\r
+    "id": "3860ec82.4027f4",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5327.566665649414,\r
-    "y": 5910.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5335.566665649414,\r
+    "y": 5865.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d5d61aed.e9642",\r
-        "f7e19ea0.d5ede",\r
-        "ccb01b06.92e6a8"\r
+        "7af1ce17.a2c558",\r
+        "cf788720.b865d8",\r
+        "78c6b3da.3a0f94"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9ce9471a.def67",\r
+    "id": "d3e42d04.fd0a28",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5181.566665649414,\r
-    "y": 5952.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5189.566665649414,\r
+    "y": 5907.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f7e19ea0.d5ede",\r
+    "id": "cf788720.b865d8",\r
     "type": "save",\r
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
     "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`\" />-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5695.566665649414,\r
-    "y": 5945.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5703.566665649414,\r
+    "y": 5900.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ccb01b06.92e6a8",\r
+    "id": "78c6b3da.3a0f94",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5577.233657836914,\r
-    "y": 6030.650161743164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5585.233657836914,\r
+    "y": 5985.650161743164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e15ccbfd.b5904",\r
+    "id": "187aa522.975483",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5578.450454711914,\r
-    "y": 5989.449966430664,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5586.450454711914,\r
+    "y": 5944.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "986cd5c9.02e9d",\r
+    "id": "a4cbceb2.4df788",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5108.566665649414,\r
-    "y": 5858.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 5116.566665649414,\r
+    "y": 5813.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b4899b08.51e5b",\r
+    "id": "1eb398cf.3d4a57",\r
     "type": "comment",\r
     "name": "populate connectivity-C variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4942.566665649414,\r
-    "y": 5819.566665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4950.566665649414,\r
+    "y": 5774.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c617e6ee.8b983",\r
+    "id": "629500a0.f350c",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3269.816665649414,\r
-    "y": 6428.816665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3277.816665649414,\r
+    "y": 6383.816665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9cb4bafc.51db",\r
-        "31675b48.f480a4"\r
+        "9cad2425.bfa4",\r
+        "5e118a1d.622834"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9cb4bafc.51db",\r
+    "id": "9cad2425.bfa4",\r
     "type": "outcomeTrue",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3460.816665649414,\r
-    "y": 6432.816665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3468.816665649414,\r
+    "y": 6387.816665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4d6a56c7.6a325"\r
+        "eaa9d7ab.22184"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4d6a56c7.6a325",\r
+    "id": "eaa9d7ab.22184",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3587.816665649414,\r
-    "y": 6431.816665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3595.816665649414,\r
+    "y": 6386.816665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c5539a8b.106aa"\r
+        "517fe5d1.d6143c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "31675b48.f480a4",\r
+    "id": "5e118a1d.622834",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3456.816665649414,\r
-    "y": 6502.816665649414,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3464.816665649414,\r
+    "y": 6457.816665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8a9f9d03.ba9c7"\r
+        "3146887c.847d98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9f506842.a5d348",\r
+    "id": "9e160da7.86044",\r
     "type": "call",\r
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",\r
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4006.316665649414,\r
-    "y": 6501.900161743164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 4014.316665649414,\r
+    "y": 6456.900161743164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8a9f9d03.ba9c7",\r
+    "id": "3146887c.847d98",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3590.316665649414,\r
-    "y": 6504.900161743164,\r
-    "z": "294b5e8a.041612",\r
+    "x": 3598.316665649414,\r
+    "y": 6459.900161743164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9f506842.a5d348"\r
+        "9e160da7.86044"\r
       ]\r
     ]\r
   }\r