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 2fc491a..f834a97 100644 (file)
@@ -1,20 +1,20 @@
 [\r
   {\r
-    "id": "934a37b5.570538",\r
+    "id": "760c3032.024ec8",\r
     "type": "dgstart",\r
     "name": "DGSTART",\r
     "outputs": 1,\r
-    "x": 132.56666564941406,\r
-    "y": 130,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 176.56666564941406,\r
+    "y": 129.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "56cf7e3f.c20408"\r
+        "5c65c97e.4fcce"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "56cf7e3f.c20408",\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": 416.85235595703125,\r
-    "y": 191.23810863494873,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 460.85235595703125,\r
+    "y": 190.8047742843628,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9d6f7a83.dd2e58"\r
+        "f52e4a2.8e9b7b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9d6f7a83.dd2e58",\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": 422.9952697753906,\r
-    "y": 276.0000305175781,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 466.9952697753906,\r
+    "y": 275.5666961669922,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "69ada9d9.f9e3c"\r
+        "f52145b6.00f26"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "69ada9d9.f9e3c",\r
+    "id": "f52145b6.00f26",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 772.5666656494141,\r
-    "y": 335,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 816.5666656494141,\r
+    "y": 334.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8dd82f3b.b9fa5",\r
-        "304cbf07.b12f58",\r
-        "1a3f65b2.521b1a"\r
+        "b781570d.1bdc6",\r
+        "a3b9d436.7cd37",\r
+        "916ad2e4.da3bd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8dd82f3b.b9fa5",\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": 1073.900161743164,\r
-    "y": 605.9302978515625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1117.900161743164,\r
+    "y": 605.4969635009766,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "304cbf07.b12f58",\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": 1095.328628540039,\r
-    "y": 308.33331298828125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1139.328628540039,\r
+    "y": 307.8999786376953,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c42506f9.b054",\r
-        "15d85509.bac5fb",\r
-        "c693218f.780828"\r
+        "a44b76d8.232f78",\r
+        "2fc87770.5a98b8",\r
+        "d48f40d3.37656"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c42506f9.b054",\r
+    "id": "a44b76d8.232f78",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1320.328628540039,\r
-    "y": 166.33331298828125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1364.328628540039,\r
+    "y": 165.8999786376953,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c432fa86.b14b18"\r
+        "a9f7ac5b.dc2e28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "15d85509.bac5fb",\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": 1315.819595336914,\r
-    "y": 235.9073486328125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1359.819595336914,\r
+    "y": 235.47401428222656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c16eebd5.51383"\r
+        "87351fcb.5849e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c693218f.780828",\r
+    "id": "d48f40d3.37656",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1304.328628540039,\r
-    "y": 282.33331298828125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1348.328628540039,\r
+    "y": 281.8999786376953,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3a0cbeb0.e80882"\r
+        "81b461.b8b3eba"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2b8d35c8.ebc05a",\r
+    "id": "ed4dfd16.f55a8",\r
     "type": "comment",\r
     "name": "new for TransportSlicing",\r
     "info": "",\r
     "comments": "",\r
-    "x": 1074.328628540039,\r
-    "y": 196.33331298828125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1118.328628540039,\r
+    "y": 195.8999786376953,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1a3f65b2.521b1a",\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": 1062.328628540039,\r
-    "y": 248.33331298828125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1106.328628540039,\r
+    "y": 247.8999786376953,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c432fa86.b14b18",\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": 1560.566665649414,\r
-    "y": 163,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1604.566665649414,\r
+    "y": 162.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1d921b54.6d01cd",\r
-        "4b7292d8.462d44"\r
+        "9413aaeb.d092f",\r
+        "4243f2e3.377954"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c16eebd5.51383",\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": 1470.6290435791016,\r
-    "y": 238.85977172851562,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1514.6290435791016,\r
+    "y": 238.4264373779297,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3a0cbeb0.e80882",\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": 1474.566665649414,\r
-    "y": 283,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1518.566665649414,\r
+    "y": 282.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1d921b54.6d01cd",\r
+    "id": "9413aaeb.d092f",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1765.566665649414,\r
-    "y": 200,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1809.566665649414,\r
+    "y": 199.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e73b29c9.cbd5e8"\r
+        "41ee935e.7af694"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4b7292d8.462d44",\r
+    "id": "4243f2e3.377954",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1775.566665649414,\r
-    "y": 127,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1819.566665649414,\r
+    "y": 126.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e73b29c9.cbd5e8",\r
+    "id": "41ee935e.7af694",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1758.566665649414,\r
-    "y": 275,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1802.566665649414,\r
+    "y": 274.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d6fcbbd7.6468b8",\r
-        "8f5c7a9a.326598",\r
-        "cd48af2d.929d6",\r
-        "528e88db.403fc",\r
-        "899de386.880988"\r
+        "48c9f8b7.accfc",\r
+        "4b70868c.ca77",\r
+        "33568fb6.bac76",\r
+        "ed1c5832.299138",\r
+        "629500a0.f350c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1f336392.1dac3c",\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": 2244.566665649414,\r
-    "y": 326,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2288.566665649414,\r
+    "y": 325.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "923c23f1.638a98",\r
-        "ba451af8.67c9c8",\r
-        "2ed7be49.0a7032"\r
+        "7bf84f8a.19dac",\r
+        "e93a24fd.89bb98",\r
+        "b3019feb.2307b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "923c23f1.638a98",\r
+    "id": "7bf84f8a.19dac",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2460.566665649414,\r
-    "y": 393,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2504.566665649414,\r
+    "y": 392.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c090e3a4.ec2058"\r
+        "28ff285d.675018"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ba451af8.67c9c8",\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": 2461.057632446289,\r
-    "y": 292.573974609375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2505.057632446289,\r
+    "y": 292.14064025878906,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4c29ba0c.292a6c"\r
+        "4ef0e01e.f3cdf"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2ed7be49.0a7032",\r
+    "id": "b3019feb.2307b",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2456.566665649414,\r
-    "y": 342,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2500.566665649414,\r
+    "y": 341.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f2cd659.3fc4898"\r
+        "2913a1dc.ae6786"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d6fcbbd7.6468b8",\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": 1961.566665649414,\r
-    "y": 307,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2005.566665649414,\r
+    "y": 306.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "419d8708.3b9078",\r
-        "1f336392.1dac3c",\r
-        "90827cac.7f3cc8",\r
-        "e557ce2.09f823"\r
+        "8b66b4b0.d208d8",\r
+        "911385ff.dcfb6",\r
+        "79257077.5f1ff8",\r
+        "8a55fb57.dfc438"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "419d8708.3b9078",\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": 2241.566665649414,\r
-    "y": 245,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2285.566665649414,\r
+    "y": 244.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "528e88db.403fc",\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": 1935.566665649414,\r
-    "y": 257,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1979.566665649414,\r
+    "y": 256.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8f5c7a9a.326598",\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": 1978.566665649414,\r
-    "y": 116,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2022.566665649414,\r
+    "y": 115.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "cd48af2d.929d6",\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": 1990.566665649414,\r
-    "y": 157,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2034.566665649414,\r
+    "y": 156.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "73efca11.a03e0c",\r
+    "id": "2a477cee.98364c",\r
     "type": "comment",\r
     "name": "The following two nodes are for PCE",\r
     "info": "",\r
     "comments": "",\r
-    "x": 2015.566665649414,\r
-    "y": 69,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2059.566665649414,\r
+    "y": 68.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "19fb453a.d497cb",\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": 1935.566665649414,\r
-    "y": 203,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 1979.566665649414,\r
+    "y": 202.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4c29ba0c.292a6c",\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": 2639.566665649414,\r
-    "y": 295,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2683.566665649414,\r
+    "y": 294.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f2cd659.3fc4898",\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": 2639.504165649414,\r
-    "y": 344.1402587890625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2683.504165649414,\r
+    "y": 343.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c090e3a4.ec2058",\r
+    "id": "28ff285d.675018",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2641.504165649414,\r
-    "y": 395.1402587890625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2685.504165649414,\r
+    "y": 394.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "383f413.f1d10be"\r
+        "ef99d74f.4057d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "383f413.f1d10be",\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": 2934.504165649414,\r
-    "y": 342.1402587890625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2978.504165649414,\r
+    "y": 341.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7f2204ba.ff0eac",\r
-        "6593ad3c.c3a94c",\r
-        "91d5dd73.0552a8"\r
+        "e456d5f.a155828",\r
+        "7848fc63.19f06c",\r
+        "64a94fba.40e7a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6593ad3c.c3a94c",\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": 3237.995101928711,\r
-    "y": 74.7142333984375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3281.995101928711,\r
+    "y": 74.28089904785156,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "578e5a01.301d74"\r
+        "afcd1c40.b768f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "578e5a01.301d74",\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": 3415.566635131836,\r
-    "y": 75,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3459.566635131836,\r
+    "y": 74.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "91d5dd73.0552a8",\r
+    "id": "64a94fba.40e7a",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3233.504135131836,\r
-    "y": 124.1402587890625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3277.504135131836,\r
+    "y": 123.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3a340bd0.83bde4"\r
+        "9649b9cd.238c78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3a340bd0.83bde4",\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": 3415.504135131836,\r
-    "y": 124.1402587890625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3459.504135131836,\r
+    "y": 123.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7f2204ba.ff0eac",\r
+    "id": "e456d5f.a155828",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3237.504135131836,\r
-    "y": 175.1402587890625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3281.504135131836,\r
+    "y": 174.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5f6b46f2.1bbc28"\r
+        "8fd753ef.f9f648"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5f6b46f2.1bbc28",\r
+    "id": "8fd753ef.f9f648",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3417.504135131836,\r
-    "y": 175.1402587890625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3461.504135131836,\r
+    "y": 174.70692443847656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "432203ff.80791c"\r
+        "f37cd8dc.622f28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "432203ff.80791c",\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": 2953.566665649414,\r
-    "y": 470,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2997.566665649414,\r
+    "y": 469.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "25bf5884.d1bc1",\r
-        "68d7ca3f.b9c4a4"\r
+        "d8de60b.2b55ea",\r
+        "6b2e15a0.33589c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "68d7ca3f.b9c4a4",\r
+    "id": "6b2e15a0.33589c",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3293.566635131836,\r
-    "y": 317,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3337.566635131836,\r
+    "y": 316.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "25bf5884.d1bc1",\r
+    "id": "d8de60b.2b55ea",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3292.566635131836,\r
-    "y": 371,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3336.566635131836,\r
+    "y": 370.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a4256717.8bdab"\r
+        "41425976.6167f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dc3dd60e.e6fb58",\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": 4037.566635131836,\r
-    "y": 325,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4081.566635131836,\r
+    "y": 324.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7a99d9c1.cc807"\r
+        "20569ac4.3ebdd6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7a99d9c1.cc807",\r
+    "id": "20569ac4.3ebdd6",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4214.566513061523,\r
-    "y": 317.9998779296875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4258.566513061523,\r
+    "y": 317.56654357910156,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "54329230.9376a4",\r
-        "e44ffd73.3caae8"\r
+        "f7578f2.98aaff",\r
+        "fec27249.f43818"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a4256717.8bdab",\r
+    "id": "41425976.6167f8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3456.566635131836,\r
-    "y": 297,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3500.566635131836,\r
+    "y": 296.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ab8d2f4.fb7de5",\r
-        "6cd92abd.ea602c"\r
+        "bf1caed6.dba4d",\r
+        "7892547.06584ac"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ab8d2f4.fb7de5",\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": 3737.566635131836,\r
-    "y": 253,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3781.566635131836,\r
+    "y": 252.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d2f6d2c1.0cd0b8"\r
+        "37857fb8.f82a48"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d2f6d2c1.0cd0b8",\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": 3999.566635131836,\r
-    "y": 253,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4043.566635131836,\r
+    "y": 252.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "dc3dd60e.e6fb58"\r
+        "d54e5594.aff43"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "54329230.9376a4",\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": 4457.566513061523,\r
-    "y": 274.9998779296875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4501.566513061523,\r
+    "y": 274.56654357910156,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e44ffd73.3caae8",\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": 4446.566513061523,\r
-    "y": 329.9998779296875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4490.566513061523,\r
+    "y": 329.56654357910156,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9db3143c.c20748",\r
-        "3f90e90d.8c4416",\r
-        "767c00f3.c60f18"\r
+        "7d11439b.9c402c",\r
+        "1159889c.e4b977",\r
+        "672fe755.7cac68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "767c00f3.c60f18",\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": 4697.566879272461,\r
-    "y": 271,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4741.566879272461,\r
+    "y": 270.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "eb2a7a65.4a99c"\r
+        "8e6a85a9.42bd58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eb2a7a65.4a99c",\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": 4846.138412475586,\r
-    "y": 271.2857666015625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4890.138412475586,\r
+    "y": 270.85243225097656,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1d4fa709.d3c2b1",\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": 4845.075912475586,\r
-    "y": 315.426025390625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4889.075912475586,\r
+    "y": 314.99269104003906,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3f90e90d.8c4416",\r
+    "id": "1159889c.e4b977",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4686.075912475586,\r
-    "y": 315.426025390625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4730.075912475586,\r
+    "y": 314.99269104003906,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1d4fa709.d3c2b1"\r
+        "d22f2789.6a3cb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9db3143c.c20748",\r
+    "id": "7d11439b.9c402c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4693.075912475586,\r
-    "y": 394.426025390625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4737.075912475586,\r
+    "y": 393.99269104003906,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d725abd1.c0b928"\r
+        "1927fc16.6351c4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d725abd1.c0b928",\r
+    "id": "1927fc16.6351c4",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4832.075912475586,\r
-    "y": 394.426025390625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4876.075912475586,\r
+    "y": 393.99269104003906,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "561b0f6d.fce1f8",\r
-        "8702a1ee.cea5e8"\r
+        "4ec1a8d7.67b3c8",\r
+        "4af48fa4.c20fa"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "561b0f6d.fce1f8",\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": 5037.566879272461,\r
-    "y": 392,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5081.566879272461,\r
+    "y": 391.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8702a1ee.cea5e8",\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": 5036.566879272461,\r
-    "y": 438,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5080.566879272461,\r
+    "y": 437.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6cd92abd.ea602c",\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": 3554.566635131836,\r
-    "y": 369,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3598.566635131836,\r
+    "y": 368.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "dd91e386.997658"\r
+        "ea9b4d5b.2a42f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dd91e386.997658",\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": 3834.566635131836,\r
-    "y": 369,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3878.566635131836,\r
+    "y": 368.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d0b5ecff.91d928"\r
+        "476ea684.13443"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d0b5ecff.91d928",\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": 2217.5667877197266,\r
-    "y": 782.0001220703125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2261.5667877197266,\r
+    "y": 781.5667877197266,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3175715f.1727f6"\r
+        "c7ca0b2.bde93f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3175715f.1727f6",\r
+    "id": "c7ca0b2.bde93f8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2394.566665649414,\r
-    "y": 775,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2438.566665649414,\r
+    "y": 774.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e36efc83.994d78",\r
-        "41c74306.d5cc9c"\r
+        "86b11ccc.07eb1",\r
+        "5c684ea4.22866"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e36efc83.994d78",\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": 2637.566665649414,\r
-    "y": 732,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2681.566665649414,\r
+    "y": 731.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "41c74306.d5cc9c",\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": 2626.566665649414,\r
-    "y": 787,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2670.566665649414,\r
+    "y": 786.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9d68f10f.bd8b8",\r
-        "dffb55fa.85b55",\r
-        "c53e6e84.05ac9"\r
+        "2c2754a5.0b7c2c",\r
+        "9ab044d8.9332",\r
+        "6aa476a7.c1db08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9d68f10f.bd8b8",\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": 2918.057632446289,\r
-    "y": 765.573974609375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2962.057632446289,\r
+    "y": 765.1406402587891,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b9d2eb35.931cc8"\r
+        "606104a3.7d17dc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dffb55fa.85b55",\r
+    "id": "9ab044d8.9332",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2906.566665649414,\r
-    "y": 810,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2950.566665649414,\r
+    "y": 809.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e6924452.e6205"\r
+        "187a718c.4bcdf6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b9d2eb35.931cc8",\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": 3066.629165649414,\r
-    "y": 765.8597412109375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3110.629165649414,\r
+    "y": 765.4264068603516,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e6924452.e6205",\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": 3065.566665649414,\r
-    "y": 810,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3109.566665649414,\r
+    "y": 809.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c53e6e84.05ac9",\r
+    "id": "6aa476a7.c1db08",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2913.566665649414,\r
-    "y": 889,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2957.566665649414,\r
+    "y": 888.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "361f88a3.058c08"\r
+        "9fd32ca0.d84048"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "361f88a3.058c08",\r
+    "id": "9fd32ca0.d84048",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3052.566665649414,\r
-    "y": 889,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3096.566665649414,\r
+    "y": 888.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "936c7f50.057838",\r
-        "fff97b6b.1650f8",\r
-        "40c59221.de8304",\r
-        "da2087d.3780d78",\r
-        "db5a893f.6acb2",\r
-        "855375ef.856b78",\r
-        "bd585daa.5b0d3",\r
-        "d3754757.4f2538",\r
-        "dd28e890.6f37f",\r
-        "10147ab3.fed6fd",\r
-        "425867c4.b0a9",\r
-        "e3e1a44c.9927b8",\r
-        "4a62d4e.fca9aac",\r
-        "2ae40328.466974",\r
-        "f71bee39.3d2f68",\r
-        "6cb3b80a.d81b1",\r
-        "7411f30.15b1c8c",\r
-        "59ced5c4.1cbb54",\r
-        "b2338e3d.f752e8",\r
-        "8b07e19d.5f94",\r
-        "877b276.88c73d8"\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": "b5bad4b9.685ad8",\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": 3401.566665649414,\r
-    "y": 422.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3445.566665649414,\r
+    "y": 422.56663513183594,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "936c7f50.057838",\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": 3382.566604614258,\r
-    "y": 501.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3426.566604614258,\r
+    "y": 501.56663513183594,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2ae40328.466974",\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": 3339.566604614258,\r
-    "y": 546.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3383.566604614258,\r
+    "y": 546.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fff97b6b.1650f8",\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": 3304.566635131836,\r
-    "y": 600.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3348.566635131836,\r
+    "y": 600.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "40c59221.de8304",\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": 3305.566635131836,\r
-    "y": 655.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3349.566635131836,\r
+    "y": 655.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "da2087d.3780d78",\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": 3303.566635131836,\r
-    "y": 919.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3347.566635131836,\r
+    "y": 919.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "969278b.6dcd308",\r
-        "8ef50320.33a2f",\r
-        "bc9f501b.616458"\r
+        "ab7d525c.39024",\r
+        "e9514e17.b4663",\r
+        "e95aa54a.0cb1c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "db5a893f.6acb2",\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": 3298.566635131836,\r
-    "y": 980.9998474121094,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3342.566635131836,\r
+    "y": 980.5665130615234,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3f6dc76b.2c189",\r
-        "8fe533b.8ccffd",\r
-        "17823dcb.715f8a"\r
+        "ba38cd77.3ddd8",\r
+        "3fe85825.5036d",\r
+        "4b77c928.b0503"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "969278b.6dcd308",\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": 3614.566635131836,\r
-    "y": 690.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3658.566635131836,\r
+    "y": 690.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9ca5fa1b.024df8"\r
+        "a41dfa2.144c608"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8ef50320.33a2f",\r
+    "id": "e9514e17.b4663",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3610.075668334961,\r
-    "y": 740.4259948730469,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3654.075668334961,\r
+    "y": 739.9926605224609,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e39d355.b4f33c8"\r
+        "88fea61b.80803"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bc9f501b.616458",\r
+    "id": "e95aa54a.0cb1c8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3614.075668334961,\r
-    "y": 793.4259948730469,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3658.075668334961,\r
+    "y": 792.9926605224609,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e84899ba.db50e8"\r
+        "5f495b77.8e475c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9ca5fa1b.024df8",\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": 3763.138168334961,\r
-    "y": 690.2857360839844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3807.138168334961,\r
+    "y": 689.8524017333984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e39d355.b4f33c8",\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": 3753.075668334961,\r
-    "y": 740.4259948730469,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3797.075668334961,\r
+    "y": 739.9926605224609,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3f6dc76b.2c189",\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": 3576.566604614258,\r
-    "y": 880.9998168945312,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3620.566604614258,\r
+    "y": 880.5664825439453,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "62e0b7bc.37a4e"\r
+        "5d8c160b.0c4ea8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8fe533b.8ccffd",\r
+    "id": "3fe85825.5036d",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3572.075668334961,\r
-    "y": 923.4258728027344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3616.075668334961,\r
+    "y": 922.9925384521484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ac864505.12601"\r
+        "b6433621.de36a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "17823dcb.715f8a",\r
+    "id": "4b77c928.b0503",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3573.075668334961,\r
-    "y": 976.4258728027344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3617.075668334961,\r
+    "y": 975.9925384521484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "bed44813.048dd"\r
+        "999aafa8.043a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "62e0b7bc.37a4e",\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": 3725.138137817383,\r
-    "y": 880.2855834960938,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3769.138137817383,\r
+    "y": 879.8522491455078,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ac864505.12601",\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": 3715.075668334961,\r
-    "y": 923.4258728027344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3759.075668334961,\r
+    "y": 922.9925384521484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e84899ba.db50e8",\r
+    "id": "5f495b77.8e475c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3775.566635131836,\r
-    "y": 792.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3819.566635131836,\r
+    "y": 792.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f9db2337.8fb9d"\r
+        "f4d50ce3.687d98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bed44813.048dd",\r
+    "id": "999aafa8.043a8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3726.566635131836,\r
-    "y": 975.9998474121094,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3770.566635131836,\r
+    "y": 975.5665130615234,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "423a02cf.14e434"\r
+        "6c0d4a32.4f3524"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f9db2337.8fb9d",\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": 3950.566635131836,\r
-    "y": 766.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3994.566635131836,\r
+    "y": 766.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2c035f93.775ae8",\r
-        "a1971f98.6ccb48",\r
-        "dd62b4eb.26fb1"\r
+        "e8eddbb7.6cfbd",\r
+        "54846c0d.33a74c",\r
+        "b03ebc69.8e68d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "423a02cf.14e434",\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": 3910.566635131836,\r
-    "y": 883.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3954.566635131836,\r
+    "y": 883.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9f546ca0.9d33e8",\r
-        "2ec96d4e.1ca132",\r
-        "cb966d3f.bcf358"\r
+        "4f37a3d1.2e362c",\r
+        "efd815b8.8e6db8",\r
+        "65095290.735c7c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2c035f93.775ae8",\r
+    "id": "e8eddbb7.6cfbd",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4072.566635131836,\r
-    "y": 551.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4116.566635131836,\r
+    "y": 551.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "6429cd23.35e7c4"\r
+        "c7edad0e.b216"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a1971f98.6ccb48",\r
+    "id": "54846c0d.33a74c",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4074.566635131836,\r
-    "y": 605.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4118.566635131836,\r
+    "y": 605.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "17c9fbf5.2a0a34"\r
+        "d5f61daa.4b4388"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9f546ca0.9d33e8",\r
+    "id": "4f37a3d1.2e362c",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4091.566665649414,\r
-    "y": 822,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4135.566665649414,\r
+    "y": 821.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "22d232ad.fa9d6e"\r
+        "81e90993.f1d9a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2ec96d4e.1ca132",\r
+    "id": "efd815b8.8e6db8",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4093.566665649414,\r
-    "y": 876,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4137.566665649414,\r
+    "y": 875.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5c001c7.14606e4"\r
+        "da2103e1.15169"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d98ccbbe.37e04",\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": 4382.566635131836,\r
-    "y": 503.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4426.566635131836,\r
+    "y": 503.56663513183594,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "449eb720.722948",\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": 4375.566635131836,\r
-    "y": 601.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4419.566635131836,\r
+    "y": 601.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "83bfbc5.ae6994",\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": 4393.566665649414,\r
-    "y": 795,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4437.566665649414,\r
+    "y": 794.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5244a859.c728e8",\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": 4397.566665649414,\r
-    "y": 888,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4441.566665649414,\r
+    "y": 887.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6ca3f458.2d99d4",\r
+    "id": "c685a00a.7f3668",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3540.566665649414,\r
-    "y": 1560,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3584.566665649414,\r
+    "y": 1559.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3eea4372.1c5814"\r
+        "3e8c64de.c5d6ac"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "662947db.2b96e8",\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": 3550.057632446289,\r
-    "y": 1602.5740356445312,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3594.057632446289,\r
+    "y": 1602.1407012939453,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f28295e0.d2c148"\r
+        "a457c21e.dc24c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5677884d.d93c78",\r
+    "id": "fe413554.38fd68",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3538.566665649414,\r
-    "y": 1649,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3582.566665649414,\r
+    "y": 1648.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f900f622.22fda"\r
+        "f7393df4.54a488"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eddb7de7.123d5",\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": 3240.566665649414,\r
-    "y": 1522,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3284.566665649414,\r
+    "y": 1521.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bd585daa.5b0d3",\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": 3283.566665649414,\r
-    "y": 1587,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3327.566665649414,\r
+    "y": 1586.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "6ca3f458.2d99d4",\r
-        "662947db.2b96e8",\r
-        "5677884d.d93c78"\r
+        "c685a00a.7f3668",\r
+        "c307eb50.c4efc",\r
+        "fe413554.38fd68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "855375ef.856b78",\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": 3284.566665649414,\r
-    "y": 1257,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3328.566665649414,\r
+    "y": 1256.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "74d070ad.2d8b38",\r
-        "f1856675.64f168"\r
+        "ce053797.967e5",\r
+        "1d8318a4.118f1f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f1856675.64f168",\r
+    "id": "1d8318a4.118f1f",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3505.566635131836,\r
-    "y": 1309.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3549.566635131836,\r
+    "y": 1309.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "77f0bbcf.b75e0c"\r
+        "d7acba72.b8d088"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "74d070ad.2d8b38",\r
+    "id": "ce053797.967e5",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3507.566635131836,\r
-    "y": 1342.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3551.566635131836,\r
+    "y": 1342.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "6e268d43.53f934"\r
+        "b936608f.415c9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3eea4372.1c5814",\r
+    "id": "3e8c64de.c5d6ac",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3713.233169555664,\r
-    "y": 1559,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3757.233169555664,\r
+    "y": 1558.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f48e6ddf.17618",\r
-        "cc30c632.26f008"\r
+        "61a62886.979d9",\r
+        "69747a1f.4d36a4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f28295e0.d2c148",\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": 3703.6290435791016,\r
-    "y": 1605.8597717285156,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3747.6290435791016,\r
+    "y": 1605.4264373779297,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f900f622.22fda",\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": 3707.566665649414,\r
-    "y": 1650,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3751.566665649414,\r
+    "y": 1649.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f48e6ddf.17618",\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": 3977.566665649414,\r
-    "y": 1543,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4021.566665649414,\r
+    "y": 1542.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c31fbd4a.4c152",\r
-        "ca57bc98.e008f"\r
+        "d27c3919.e4f1e8",\r
+        "744ce69a.cd2cd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ca57bc98.e008f",\r
+    "id": "744ce69a.cd2cd",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4200.566665649414,\r
-    "y": 1498,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4244.566665649414,\r
+    "y": 1497.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ae27226e.c1211"\r
+        "d24d75df.899958"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c31fbd4a.4c152",\r
+    "id": "d27c3919.e4f1e8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4202.566665649414,\r
-    "y": 1562,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4246.566665649414,\r
+    "y": 1561.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "48b6888c.1688c8"\r
+        "195cae09.6a270a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "48b6888c.1688c8",\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": 4364.566665649414,\r
-    "y": 1558,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4408.566665649414,\r
+    "y": 1557.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ae27226e.c1211",\r
+    "id": "d24d75df.899958",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4365.566665649414,\r
-    "y": 1495,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4409.566665649414,\r
+    "y": 1494.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "dc9805ea.b1d968",\r
-        "e17a88a7.3a0c68"\r
+        "64761578.742944",\r
+        "545ae19b.2a1238"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6e268d43.53f934",\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": 3650.566635131836,\r
-    "y": 1339.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3694.566635131836,\r
+    "y": 1339.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "77f0bbcf.b75e0c",\r
+    "id": "d7acba72.b8d088",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3653.566635131836,\r
-    "y": 1302.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3697.566635131836,\r
+    "y": 1302.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "6b41cb54.146c7c",\r
-        "2227088d.da8978"\r
+        "66afead4.578fec",\r
+        "d914a00d.43d42"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6b41cb54.146c7c",\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": 3827.566635131836,\r
-    "y": 1258.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3871.566635131836,\r
+    "y": 1258.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cc30c632.26f008",\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": 3926.566635131836,\r
-    "y": 1652.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3970.566635131836,\r
+    "y": 1652.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4c51d8d9.7e50e"\r
+        "6692ad9d.63a244"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4c51d8d9.7e50e",\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": 4132.566635131836,\r
-    "y": 1652.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4176.566635131836,\r
+    "y": 1652.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ea6dd5aa.f54cc"\r
+        "efeaf290.376e48"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ea6dd5aa.f54cc",\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": 4347.852279663086,\r
-    "y": 1652.8217468261719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4391.852279663086,\r
+    "y": 1652.388412475586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "878f0a88.cc7f28"\r
+        "9388038d.e5f508"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2227088d.da8978",\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": 3842.566635131836,\r
-    "y": 1369.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3886.566635131836,\r
+    "y": 1369.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a1b22fed.dd46f",\r
-        "39006ff3.e4d42",\r
-        "90a88d63.a0deb"\r
+        "3150a2ed.678f16",\r
+        "5769f8b6.da962",\r
+        "c8b63edf.598bb8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a1b22fed.dd46f",\r
+    "id": "3150a2ed.678f16",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4038.0667572021484,\r
-    "y": 1321.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4082.0667572021484,\r
+    "y": 1321.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "11cc8b93.732e94"\r
+        "47f6939a.0cca7c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "39006ff3.e4d42",\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": 4030.0667572021484,\r
-    "y": 1376.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4074.0667572021484,\r
+    "y": 1376.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "dc84c818.c1238"\r
+        "dfce5624.4d0e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "90a88d63.a0deb",\r
+    "id": "c8b63edf.598bb8",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4035.0667572021484,\r
-    "y": 1433.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4079.0667572021484,\r
+    "y": 1433.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5b4aec5c.78ea6c"\r
+        "16d53904.a69817"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5b4aec5c.78ea6c",\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": 4187.066757202148,\r
-    "y": 1434.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4231.066757202148,\r
+    "y": 1434.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "dc84c818.c1238",\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": 4198.066757202148,\r
-    "y": 1379.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4242.066757202148,\r
+    "y": 1379.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "11cc8b93.732e94",\r
+    "id": "47f6939a.0cca7c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4182.449081420898,\r
-    "y": 1319.6556396484375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4226.449081420898,\r
+    "y": 1319.2223052978516,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3dd6ac8d.e6d824"\r
+        "57719ed2.829e5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3dd6ac8d.e6d824",\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": 4366.566635131836,\r
-    "y": 1333.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4410.566635131836,\r
+    "y": 1333.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2c6d0561.1001da"\r
+        "8b55301b.b943a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e17a88a7.3a0c68",\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": 4535.566665649414,\r
-    "y": 1453,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4579.566665649414,\r
+    "y": 1452.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "dc9805ea.b1d968",\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": 4536.566665649414,\r
-    "y": 1561,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4580.566665649414,\r
+    "y": 1560.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4eccdb3c.a00b8c",\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": 4537.566665649414,\r
-    "y": 1510,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4581.566665649414,\r
+    "y": 1509.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "878f0a88.cc7f28",\r
+    "id": "9388038d.e5f508",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4554.683822631836,\r
-    "y": 1653.3403015136719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4598.683822631836,\r
+    "y": 1652.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a6df4a7c.6d4298",\r
-        "e55c6491.d1cf5",\r
-        "7eb455b8.997c94"\r
+        "13805827.ade3d",\r
+        "a9502d93.1e2b78",\r
+        "a1b1941b.f9c738"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a6df4a7c.6d4298",\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": 4769.683822631836,\r
-    "y": 1615.3403015136719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4813.683822631836,\r
+    "y": 1614.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e55c6491.d1cf5",\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": 4766.683822631836,\r
-    "y": 1654.3403015136719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4810.683822631836,\r
+    "y": 1653.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5121fcc7.d1555c"\r
+        "b0dee9b7.4f5918"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7eb455b8.997c94",\r
+    "id": "a1b1941b.f9c738",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4722.183822631836,\r
-    "y": 1696.3403015136719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4766.183822631836,\r
+    "y": 1695.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5121fcc7.d1555c",\r
+    "id": "b0dee9b7.4f5918",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4947.183822631836,\r
-    "y": 1653.3403015136719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4991.183822631836,\r
+    "y": 1652.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "dcdffb31.a68748"\r
+        "915aa3e1.c4697"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ee290dd7.3447b8",\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": 4766.566665649414,\r
-    "y": 1271,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4810.566665649414,\r
+    "y": 1270.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f5c3f7a5.0472d8"\r
+        "5118de9a.01dd88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f5c3f7a5.0472d8",\r
+    "id": "5118de9a.01dd88",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4943.566665649414,\r
-    "y": 1263,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4987.566665649414,\r
+    "y": 1262.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "92327400.5b0ea",\r
-        "7dac197a.3be828"\r
+        "94a9a0f9.c59e58",\r
+        "85408268.2c3368"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2c6d0561.1001da",\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": 4561.566635131836,\r
-    "y": 1333.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4605.566635131836,\r
+    "y": 1333.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ee290dd7.3447b8",\r
-        "97637af.969a388"\r
+        "25f4a2bf.12e7a6",\r
+        "95e8d812.cc8ca8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "97637af.969a388",\r
+    "id": "95e8d812.cc8ca8",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4769.566665649414,\r
-    "y": 1345,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4813.566665649414,\r
+    "y": 1344.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2b94ab82.f6af74"\r
+        "f38eef5.12b7d1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2b94ab82.f6af74",\r
+    "id": "f38eef5.12b7d1",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4946.566665649414,\r
-    "y": 1337,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4990.566665649414,\r
+    "y": 1336.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a745e5da.a32578"\r
+        "c816565f.10d5d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dcdffb31.a68748",\r
+    "id": "915aa3e1.c4697",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5105.183822631836,\r
-    "y": 1653.3403015136719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5149.183822631836,\r
+    "y": 1652.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f0d23e06.a32c6"\r
+        "6c003d6.b17f944"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f0d23e06.a32c6",\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": 5312.183822631836,\r
-    "y": 1653.3403015136719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5356.183822631836,\r
+    "y": 1652.906967163086,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7dac197a.3be828",\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": 5151.566665649414,\r
-    "y": 1270,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5195.566665649414,\r
+    "y": 1269.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "36ef2efb.214b2a",\r
-        "a6a3aa1c.6f7288",\r
-        "f4089fab.088a2"\r
+        "53b236d8.1b02c",\r
+        "4083b24b.fff034",\r
+        "39446af.e663d96"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "92327400.5b0ea",\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": 5181.566665649414,\r
-    "y": 1218,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5225.566665649414,\r
+    "y": 1217.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "36ef2efb.214b2a",\r
+    "id": "53b236d8.1b02c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5361.566665649414,\r
-    "y": 1261,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5405.566665649414,\r
+    "y": 1260.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8d49602b.5cbbb8"\r
+        "85a67c1c.71be78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a6a3aa1c.6f7288",\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": 5353.566665649414,\r
-    "y": 1316,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5397.566665649414,\r
+    "y": 1315.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2502bb8.26e4744"\r
+        "ef1cd568.ee18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f4089fab.088a2",\r
+    "id": "39446af.e663d96",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5358.566665649414,\r
-    "y": 1373,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5402.566665649414,\r
+    "y": 1372.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "192598bd.b5d887"\r
+        "9b4ff565.a53cd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "192598bd.b5d887",\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": 5510.566665649414,\r
-    "y": 1374,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5554.566665649414,\r
+    "y": 1373.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2502bb8.26e4744",\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": 5521.566665649414,\r
-    "y": 1319,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5565.566665649414,\r
+    "y": 1318.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8d49602b.5cbbb8",\r
+    "id": "85a67c1c.71be78",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5505.948989868164,\r
-    "y": 1258.6556701660156,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5549.948989868164,\r
+    "y": 1258.2223358154297,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "34dd56c8.a561f2"\r
+        "53e9aeb2.242928"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a745e5da.a32578",\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": 5181.566665649414,\r
-    "y": 1461,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5225.566665649414,\r
+    "y": 1460.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "34dd56c8.a561f2",\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": 5720.566665649414,\r
-    "y": 1255,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5764.566665649414,\r
+    "y": 1254.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9cc65469.2e5488",\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": 4370.566635131836,\r
-    "y": 539.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4414.566635131836,\r
+    "y": 539.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bae36160.d0fbc",\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": 4361.566635131836,\r
-    "y": 637.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4405.566635131836,\r
+    "y": 637.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6429cd23.35e7c4",\r
+    "id": "c7edad0e.b216",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4195.566635131836,\r
-    "y": 545.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4239.566635131836,\r
+    "y": 545.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d98ccbbe.37e04",\r
-        "9cc65469.2e5488"\r
+        "f5d37541.2d47c8",\r
+        "bd4af2f9.e804e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "17c9fbf5.2a0a34",\r
+    "id": "d5f61daa.4b4388",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4201.566635131836,\r
-    "y": 609.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4245.566635131836,\r
+    "y": 609.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "449eb720.722948",\r
-        "bae36160.d0fbc"\r
+        "2bfe954c.51473a",\r
+        "ff102e0b.75a238"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "22d232ad.fa9d6e",\r
+    "id": "81e90993.f1d9a8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4219.566665649414,\r
-    "y": 822,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4263.566665649414,\r
+    "y": 821.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "83bfbc5.ae6994",\r
-        "7c60504e.d38f7"\r
+        "9391f162.46d07",\r
+        "cb81a4f3.d6156"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5c001c7.14606e4",\r
+    "id": "da2103e1.15169",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4222.566665649414,\r
-    "y": 875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4266.566665649414,\r
+    "y": 874.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5244a859.c728e8",\r
-        "9835c9a0.4caf78"\r
+        "8da0410.b4be6c",\r
+        "e6103926.96cb88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7c60504e.d38f7",\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": 4379.566665649414,\r
-    "y": 835,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4423.566665649414,\r
+    "y": 834.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9835c9a0.4caf78",\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": 4382.566665649414,\r
-    "y": 926,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4426.566665649414,\r
+    "y": 925.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c2220864.024798",\r
+    "id": "9fb68dad.7c92d",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3674.566635131836,\r
-    "y": 2052.999969482422,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3718.566635131836,\r
+    "y": 2052.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b80ff39a.5788d",\r
-        "d5ffb970.fa1968"\r
+        "931d0e50.a84728",\r
+        "4385be6.d4f41c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "db8ae4f9.347f",\r
+    "id": "62a0ff40.3fa718",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3501.900131225586,\r
-    "y": 2053.999969482422,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3545.900131225586,\r
+    "y": 2053.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c2220864.024798"\r
+        "9fb68dad.7c92d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4d1c7431.f53f04",\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": 3511.391098022461,\r
-    "y": 2096.574005126953,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3555.391098022461,\r
+    "y": 2096.140670776367,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c720d68c.d6ef88"\r
+        "b1d5af05.b8b6a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f027027b.1605f8",\r
+    "id": "e64b0ffd.d5764",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3499.900131225586,\r
-    "y": 2142.999969482422,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3543.900131225586,\r
+    "y": 2142.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "174ecc35.cb4194"\r
+        "c5461a06.0ba95"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c720d68c.d6ef88",\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": 3664.9625091552734,\r
-    "y": 2099.8597412109375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3708.9625091552734,\r
+    "y": 2099.4264068603516,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "174ecc35.cb4194",\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": 3668.900131225586,\r
-    "y": 2143.999969482422,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3712.900131225586,\r
+    "y": 2143.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b80ff39a.5788d",\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": 3960.900131225586,\r
-    "y": 2057.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4004.900131225586,\r
+    "y": 2056.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f5a758df.e8e0d8",\r
-        "83d46017.2ef77"\r
+        "ff2f7e35.94528",\r
+        "ccece71a.073de8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "83d46017.2ef77",\r
+    "id": "ccece71a.073de8",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4183.900131225586,\r
-    "y": 2012.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4227.900131225586,\r
+    "y": 2011.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "128bbd7c.ee7803"\r
+        "c18c40eb.b59cb8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f5a758df.e8e0d8",\r
+    "id": "ff2f7e35.94528",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4185.900131225586,\r
-    "y": 2076.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4229.900131225586,\r
+    "y": 2075.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7922a686.9432f8"\r
+        "a47e6ec9.683da"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7922a686.9432f8",\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": 4344.900131225586,\r
-    "y": 2095.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4388.900131225586,\r
+    "y": 2094.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "128bbd7c.ee7803",\r
+    "id": "c18c40eb.b59cb8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4348.900131225586,\r
-    "y": 2009.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4392.900131225586,\r
+    "y": 2008.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ecc94bdb.36f218",\r
-        "70d8643e.5fc584"\r
+        "50191e6c.286e58",\r
+        "e564295c.7502a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dd28e890.6f37f",\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": 3273.900131225586,\r
-    "y": 2088.999969482422,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3317.900131225586,\r
+    "y": 2088.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "db8ae4f9.347f",\r
-        "4d1c7431.f53f04",\r
-        "f027027b.1605f8"\r
+        "62a0ff40.3fa718",\r
+        "a9db3cf5.8c98a8",\r
+        "e64b0ffd.d5764"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6cb9de7.531902",\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": 3234.900131225586,\r
-    "y": 2032.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3278.900131225586,\r
+    "y": 2032.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d3754757.4f2538",\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": 3293.900131225586,\r
-    "y": 1828.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3337.900131225586,\r
+    "y": 1828.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c926dd8a.c40d78",\r
-        "b866a3cd.1307c8"\r
+        "fc191473.db2cb8",\r
+        "44d4fd2b.8896cc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b866a3cd.1307c8",\r
+    "id": "44d4fd2b.8896cc",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3516.900131225586,\r
-    "y": 1814.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3560.900131225586,\r
+    "y": 1814.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "963b51c2.5c60a8"\r
+        "e4dd083d.cd18f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c926dd8a.c40d78",\r
+    "id": "fc191473.db2cb8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3518.900131225586,\r
-    "y": 1847.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3562.900131225586,\r
+    "y": 1847.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "288c4b3e.38e3ac"\r
+        "28eac456.f04cbc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "288c4b3e.38e3ac",\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": 3661.900131225586,\r
-    "y": 1844.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3705.900131225586,\r
+    "y": 1844.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "963b51c2.5c60a8",\r
+    "id": "e4dd083d.cd18f8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3664.900131225586,\r
-    "y": 1807.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3708.900131225586,\r
+    "y": 1807.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "dba238c.ade58c8",\r
-        "11c5499c.e33516"\r
+        "c8368cdf.b15f18",\r
+        "26325ab5.37c516"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dba238c.ade58c8",\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": 3858.900131225586,\r
-    "y": 1811.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3902.900131225586,\r
+    "y": 1810.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d5ffb970.fa1968",\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": 3911.900100708008,\r
-    "y": 2179.9999389648438,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3955.900100708008,\r
+    "y": 2179.566604614258,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8ab0c323.e760e"\r
+        "ab5afaa2.b8a2e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8ab0c323.e760e",\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": 4117.900100708008,\r
-    "y": 2179.9999389648438,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4161.900100708008,\r
+    "y": 2179.566604614258,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ef601430.2ce96"\r
+        "8b90a37d.df48a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ef601430.2ce96",\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": 4335.185745239258,\r
-    "y": 2178.8217163085938,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4379.185745239258,\r
+    "y": 2178.388381958008,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e64538ad.e88608"\r
+        "9497250f.2d9438"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "11c5499c.e33516",\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": 3880.900131225586,\r
-    "y": 1879.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3924.900131225586,\r
+    "y": 1878.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "72da73e.01fae8c",\r
-        "1bf4f20c.844916",\r
-        "c2abc766.4ac0f"\r
+        "572475c6.9df474",\r
+        "8a4bcee9.a6e838",\r
+        "52414e68.698aa8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "72da73e.01fae8c",\r
+    "id": "572475c6.9df474",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4076.4002532958984,\r
-    "y": 1831.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4120.400253295898,\r
+    "y": 1830.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e5dd1f31.8ac458"\r
+        "cc04a6ba.577058"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1bf4f20c.844916",\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": 4068.4002532958984,\r
-    "y": 1886.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4112.400253295898,\r
+    "y": 1885.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2c7c5a6c.8f4a66"\r
+        "5bcad340.b7a94c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c2abc766.4ac0f",\r
+    "id": "52414e68.698aa8",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4073.4002532958984,\r
-    "y": 1943.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4117.400253295898,\r
+    "y": 1942.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a0f15b8e.a7ebb"\r
+        "78c91f5c.6a81a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a0f15b8e.a7ebb",\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": 4225.400253295898,\r
-    "y": 1944.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4269.400253295898,\r
+    "y": 1943.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2c7c5a6c.8f4a66",\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": 4236.400253295898,\r
-    "y": 1889.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4280.400253295898,\r
+    "y": 1888.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e5dd1f31.8ac458",\r
+    "id": "cc04a6ba.577058",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4220.782577514648,\r
-    "y": 1828.65576171875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4264.782577514648,\r
+    "y": 1828.222427368164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5bc7c506.3f7314"\r
+        "b056f70a.5ef0e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ecc94bdb.36f218",\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": 4518.900131225586,\r
-    "y": 1970.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4562.900131225586,\r
+    "y": 1969.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "70d8643e.5fc584",\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": 4519.900131225586,\r
-    "y": 2075.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4563.900131225586,\r
+    "y": 2074.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "75e052b3.6ff0fc",\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": 4514.900131225586,\r
-    "y": 2024.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4558.900131225586,\r
+    "y": 2023.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e64538ad.e88608",\r
+    "id": "9497250f.2d9438",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4542.017288208008,\r
-    "y": 2168.3403930664062,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4586.017288208008,\r
+    "y": 2167.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "58b39a0b.a28104",\r
-        "908d048a.fd0138",\r
-        "5394d746.97415"\r
+        "dc5203d6.63ee88",\r
+        "bfaf928b.d789b",\r
+        "75ef4dfa.4963fc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "58b39a0b.a28104",\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": 4757.017288208008,\r
-    "y": 2130.3403930664062,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4801.017288208008,\r
+    "y": 2129.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "908d048a.fd0138",\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": 4754.017288208008,\r
-    "y": 2169.3403930664062,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4798.017288208008,\r
+    "y": 2168.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "160d9213.6a516e"\r
+        "6dd4b7bc.60078"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5394d746.97415",\r
+    "id": "75ef4dfa.4963fc",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4709.517288208008,\r
-    "y": 2211.3403930664062,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4753.517288208008,\r
+    "y": 2210.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "160d9213.6a516e",\r
+    "id": "6dd4b7bc.60078",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4934.517288208008,\r
-    "y": 2168.3403930664062,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4978.517288208008,\r
+    "y": 2167.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2403cbf1.90bae4"\r
+        "f825fb77.fb7bc8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2403cbf1.90bae4",\r
+    "id": "f825fb77.fb7bc8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5092.517288208008,\r
-    "y": 2168.3403930664062,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5136.517288208008,\r
+    "y": 2167.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "15dae2c1.fe6bdd"\r
+        "aa2ab587.72eca"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "15dae2c1.fe6bdd",\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": 5299.517288208008,\r
-    "y": 2168.3403930664062,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5343.517288208008,\r
+    "y": 2167.9070587158203,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e7ce121f.269bb",\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": 4802.900131225586,\r
-    "y": 1847.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4846.900131225586,\r
+    "y": 1846.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "30725ca7.222ea4"\r
+        "ef66532c.d6746"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "30725ca7.222ea4",\r
+    "id": "ef66532c.d6746",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4979.900131225586,\r
-    "y": 1839.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5023.900131225586,\r
+    "y": 1838.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "82bc9190.99083",\r
-        "c6a75ef3.9aa488"\r
+        "f7a2f11b.7a291",\r
+        "d2b30e12.01e548"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5bc7c506.3f7314",\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": 4404.900131225586,\r
-    "y": 1843.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4448.900131225586,\r
+    "y": 1842.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9e2fa3d8.88246"\r
+        "658c9b9.fce64e4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9e2fa3d8.88246",\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": 4599.900131225586,\r
-    "y": 1843.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4643.900131225586,\r
+    "y": 1842.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e7ce121f.269bb",\r
-        "87abf2c8.a21648"\r
+        "5ec77bbd.698654",\r
+        "d91be682.fd9ed8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c6a75ef3.9aa488",\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": 5187.900131225586,\r
-    "y": 1846.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5231.900131225586,\r
+    "y": 1845.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d33681ca.12c55",\r
-        "54cfcb70.c20a5c",\r
-        "76901bc2.c646ec"\r
+        "5cd3941f.991a64",\r
+        "72be6080.49369",\r
+        "27b21fad.3c3a98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c7485083.08e3d",\r
+    "id": "a895224b.6a3d58",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4981.900131225586,\r
-    "y": 1912.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5025.900131225586,\r
+    "y": 1911.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9f7ab33f.3d3ee8"\r
+        "de5c0fa7.2ddfe8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "87abf2c8.a21648",\r
+    "id": "d91be682.fd9ed8",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4804.900131225586,\r
-    "y": 1920.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4848.900131225586,\r
+    "y": 1919.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c7485083.08e3d"\r
+        "a895224b.6a3d58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "82bc9190.99083",\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": 5217.900131225586,\r
-    "y": 1794.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5261.900131225586,\r
+    "y": 1793.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9f7ab33f.3d3ee8",\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": 5216.900131225586,\r
-    "y": 2036.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5260.900131225586,\r
+    "y": 2035.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d33681ca.12c55",\r
+    "id": "5cd3941f.991a64",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5397.900131225586,\r
-    "y": 1837.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5441.900131225586,\r
+    "y": 1836.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "52bdc174.53236"\r
+        "2d963acb.7812d6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "54cfcb70.c20a5c",\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": 5389.900131225586,\r
-    "y": 1892.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5433.900131225586,\r
+    "y": 1891.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "da0362e9.7cf8b8"\r
+        "7809e6f0.3ba7a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "76901bc2.c646ec",\r
+    "id": "27b21fad.3c3a98",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5394.900131225586,\r
-    "y": 1949.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5438.900131225586,\r
+    "y": 1948.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "656ad13e.13aaf8"\r
+        "76fc1345.ebf534"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "656ad13e.13aaf8",\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": 5546.900131225586,\r
-    "y": 1950.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5590.900131225586,\r
+    "y": 1949.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "da0362e9.7cf8b8",\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": 5557.900131225586,\r
-    "y": 1895.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5601.900131225586,\r
+    "y": 1894.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "52bdc174.53236",\r
+    "id": "2d963acb.7812d6",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5542.282455444336,\r
-    "y": 1834.65576171875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5586.282455444336,\r
+    "y": 1834.222427368164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2dd4dc53.801b1c"\r
+        "3e96d581.6be972"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2dd4dc53.801b1c",\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": 5756.900131225586,\r
-    "y": 1831.0000915527344,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5800.900131225586,\r
+    "y": 1830.5667572021484,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "10147ab3.fed6fd",\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": 3241.566635131836,\r
-    "y": 1649.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3285.566635131836,\r
+    "y": 1649.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bb3da11a.4b756",\r
+    "id": "906a6d5d.cfc198",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4537.566635131836,\r
-    "y": 623.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4581.566635131836,\r
+    "y": 623.5666351318359,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "550747e5.fd6e4",\r
+    "id": "c5fcfc8e.70af78",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4547.566665649414,\r
-    "y": 820,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4591.566665649414,\r
+    "y": 819.5666656494141,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "425867c4.b0a9",\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": 3244.566604614258,\r
-    "y": 2157.9999389648438,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3288.566604614258,\r
+    "y": 2157.566604614258,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e3e1a44c.9927b8",\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": 3381.566665649414,\r
-    "y": 2814,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3425.566665649414,\r
+    "y": 2813.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4a62d4e.fca9aac",\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": 3258.566665649414,\r
-    "y": 2924,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3302.566665649414,\r
+    "y": 2923.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "81493f2.f26234",\r
-        "6c24115d.c6e7c"\r
+        "2a58524.cf6ab2e",\r
+        "b22f43e3.b228e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "81493f2.f26234",\r
+    "id": "2a58524.cf6ab2e",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3442.566665649414,\r
-    "y": 2903,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3486.566665649414,\r
+    "y": 2902.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3aff0eaf.ff7b7a"\r
+        "1fd47368.eaee3d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6c24115d.c6e7c",\r
+    "id": "b22f43e3.b228e",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3334.566665649414,\r
-    "y": 5081,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3378.566665649414,\r
+    "y": 5080.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5bc4950a.db01dc"\r
+        "bb1800d1.b22838"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5bc4950a.db01dc",\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": 3489.566665649414,\r
-    "y": 5074,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3533.566665649414,\r
+    "y": 5073.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2f2701b5.2dac16",\r
-        "316110e0.e54cc",\r
-        "b160de6d.e8ced8",\r
-        "595e7f4b.3b8bd8",\r
-        "8bf8bc6f.53ce6",\r
-        "1e2222c.7b917dd"\r
+        "eb692208.605d48",\r
+        "fa1a129b.8e1e58",\r
+        "8f8ab353.277fd8",\r
+        "e967635e.d5f898",\r
+        "a7e951fd.34174",\r
+        "147222b6.72d4a5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3aff0eaf.ff7b7a",\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": 3585.566665649414,\r
-    "y": 2903,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3629.566665649414,\r
+    "y": 2902.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5168a07f.a36df8",\r
-        "6c599b75.a60fcc",\r
-        "35850a83.44a89e",\r
-        "ae160236.4157c8",\r
-        "b7fd9c88.558b98",\r
-        "6e041a0e.19b3cc",\r
-        "612f5852.aaa57",\r
-        "8d9898f5.dd7e",\r
-        "638e1104.d7c428",\r
-        "d797d3a4.8fe9",\r
-        "ce4e4e08.0ce56",\r
-        "a4cacc19.7d376",\r
-        "57e31ea9.c7173",\r
-        "bf6be8f0.fb6c88",\r
-        "982a1a56.4966b8",\r
-        "8feec705.936fd8",\r
-        "eb6eb29c.21a438",\r
-        "cad73781.1cf898",\r
-        "bdd8ea07.2740c",\r
-        "8877dbf4.9fef7",\r
-        "374b533b.d2c934",\r
-        "e008f489.a45f08"\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": "638e1104.d7c428",\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": 3895.566665649414,\r
-    "y": 3218,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3939.566665649414,\r
+    "y": 3217.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5168a07f.a36df8",\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
+    "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": 3843.566665649414,\r
-    "y": 3260,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3887.566665649414,\r
+    "y": 3259.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6c599b75.a60fcc",\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": 3972.566665649414,\r
-    "y": 3302,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4016.566665649414,\r
+    "y": 3301.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e80dd6ae.f178",\r
+    "id": "c56513f7.9839c8",\r
     "type": "comment",\r
     "name": "Create ROOT connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3818.566665649414,\r
-    "y": 3177,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3862.566665649414,\r
+    "y": 3176.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b4b36e39.27fc08",\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": 4343.566665649414,\r
-    "y": 3698,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4387.566665649414,\r
+    "y": 3697.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "35850a83.44a89e",\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": 3907.566665649414,\r
-    "y": 3737,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3951.566665649414,\r
+    "y": 3736.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ae160236.4157c8",\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
+    "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": 3855.566665649414,\r
-    "y": 3788,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3899.566665649414,\r
+    "y": 3787.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b7fd9c88.558b98",\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": 3991.566665649414,\r
-    "y": 3835,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4035.566665649414,\r
+    "y": 3834.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f07a7af4.49b438",\r
+    "id": "3a844032.bf9ac",\r
     "type": "comment",\r
     "name": "Create MIDDLE-MAN connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3848.566665649414,\r
-    "y": 3697,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3892.566665649414,\r
+    "y": 3696.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d7c1d718.25aef8",\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": 4278.566665649414,\r
-    "y": 3894,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4322.566665649414,\r
+    "y": 3893.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6e041a0e.19b3cc",\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": 3869.566665649414,\r
-    "y": 3941,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3913.566665649414,\r
+    "y": 3940.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3be15b0.8cc9ea6",\r
-        "8fcafedd.8f9ff8",\r
-        "74f3c2d6.5194d4"\r
+        "34b4bb6d.84f2ec",\r
+        "39b05e8d.991162",\r
+        "b7823394.4e1968"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3be15b0.8cc9ea6",\r
+    "id": "34b4bb6d.84f2ec",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4116.566665649414,\r
-    "y": 3895,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4160.566665649414,\r
+    "y": 3894.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d7c1d718.25aef8"\r
+        "debaf07d.db6d5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8fcafedd.8f9ff8",\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": 4117.057632446289,\r
-    "y": 3940.5740356445312,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4161.057632446289,\r
+    "y": 3940.1407012939453,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "535b8241.bba134"\r
+        "483dd1d6.aa392"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "74f3c2d6.5194d4",\r
+    "id": "b7823394.4e1968",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4114.566665649414,\r
-    "y": 3984,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4158.566665649414,\r
+    "y": 3983.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4abd8099.5640c"\r
+        "59b157ce.93edc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "535b8241.bba134",\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": 4279.629043579102,\r
-    "y": 3940.8597717285156,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4323.629043579102,\r
+    "y": 3940.4264373779297,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4abd8099.5640c",\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": 4283.566665649414,\r
-    "y": 3985,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4327.566665649414,\r
+    "y": 3984.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "982a1a56.4966b8",\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": 3923.566665649414,\r
-    "y": 4283,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3967.566665649414,\r
+    "y": 4282.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8feec705.936fd8",\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": 3926.566665649414,\r
-    "y": 4328,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3970.566665649414,\r
+    "y": 4327.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "cad73781.1cf898",\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": 3918.566665649414,\r
-    "y": 4056,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3962.566665649414,\r
+    "y": 4055.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bdd8ea07.2740c",\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": 3920.566665649414,\r
-    "y": 4103,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3964.566665649414,\r
+    "y": 4102.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b21853e4.c6418",\r
+    "id": "e3efee4c.cbd228",\r
     "type": "comment",\r
     "name": "The following two will be done in F1",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3839.566665649414,\r
-    "y": 4236,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3883.566665649414,\r
+    "y": 4235.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f1842c11.743b7",\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": 4449.566665649414,\r
-    "y": 4902,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4493.566665649414,\r
+    "y": 4901.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2f2701b5.2dac16",\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": 3704.566665649414,\r
-    "y": 5055,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3748.566665649414,\r
+    "y": 5054.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "bb4138b0.4e1d88",\r
-        "3497566e.93319a"\r
+        "35961804.034dd",\r
+        "1c6960fb.af77c7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3497566e.93319a",\r
+    "id": "1c6960fb.af77c7",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3876.566665649414,\r
-    "y": 5052,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3920.566665649414,\r
+    "y": 5051.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c7f4755e.39d608"\r
+        "44ac8602.f7b438"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bb4138b0.4e1d88",\r
+    "id": "35961804.034dd",\r
     "type": "outcomeFalse",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3828.566665649414,\r
-    "y": 5899,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3872.566665649414,\r
+    "y": 5898.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "6c4c0ada.7452e4"\r
+        "e66ef561.f9598"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4c3530ee.3fa66",\r
+    "id": "a7546f8d.e642f8",\r
     "type": "comment",\r
     "name": "1 --> PCE is needed",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3889.566665649414,\r
-    "y": 5022,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3933.566665649414,\r
+    "y": 5021.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "56d0be77.8f738",\r
+    "id": "7377305c.6344e",\r
     "type": "comment",\r
     "name": "2 --> no need to call PCE",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3899.566665649414,\r
-    "y": 5857,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3943.566665649414,\r
+    "y": 5856.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "612f5852.aaa57",\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": 3922.566665649414,\r
-    "y": 4431,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3966.566665649414,\r
+    "y": 4430.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c7f4755e.39d608",\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": 4052.566665649414,\r
-    "y": 5054,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4096.566665649414,\r
+    "y": 5053.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "230e1b13.237ccc",\r
-        "5181bb49.6fa9a4",\r
-        "fd0048f2.8665c8",\r
-        "78647ab5.49b354",\r
-        "f0982e54.06c37",\r
-        "828e934c.bce518",\r
-        "f1842c11.743b7",\r
-        "76d94500.85b34c",\r
-        "66bf889f.a4f118"\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": "ae961dcf.a0b6c",\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": 5497.566665649414,\r
-    "y": 4527,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5541.566665649414,\r
+    "y": 4526.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "230e1b13.237ccc",\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": 4430.566665649414,\r
-    "y": 5557,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4474.566665649414,\r
+    "y": 5556.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8d9898f5.dd7e",\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": 3901.566665649414,\r
-    "y": 3431,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3945.566665649414,\r
+    "y": 3430.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d797d3a4.8fe9",\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": 3899.566665649414,\r
-    "y": 2888,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3943.566665649414,\r
+    "y": 2887.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ce4e4e08.0ce56",\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
+    "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": 3847.566665649414,\r
-    "y": 2936,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3891.566665649414,\r
+    "y": 2935.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a4cacc19.7d376",\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": 3975.566665649414,\r
-    "y": 2983,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4019.566665649414,\r
+    "y": 2982.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ae968df.974b9f",\r
+    "id": "be22c48f.b88288",\r
     "type": "comment",\r
     "name": "Create LEAF connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3812.566665649414,\r
-    "y": 2846,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3856.566665649414,\r
+    "y": 2845.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "57e31ea9.c7173",\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": 3809.566665649414,\r
-    "y": 3074,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3853.566665649414,\r
+    "y": 3073.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "bf6be8f0.fb6c88",\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": 3902.566665649414,\r
-    "y": 3127,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3946.566665649414,\r
+    "y": 3126.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "155d8942.126f0f",\r
+    "id": "8249248d.fd861",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3793.566665649414,\r
-    "y": 3030,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3837.566665649414,\r
+    "y": 3029.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "eda430a0.e8a4b8",\r
+    "id": "8a8f5ba9.d4da6",\r
     "type": "comment",\r
     "name": "Create ROOT UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3797.566665649414,\r
-    "y": 3346,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3841.566665649414,\r
+    "y": 3345.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "78647ab5.49b354",\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": 4366.566665649414,\r
-    "y": 4535,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4410.566665649414,\r
+    "y": 4534.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "db99df8c.8021",\r
+    "id": "5bce380a.32d878",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4350.566665649414,\r
-    "y": 4491,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4394.566665649414,\r
+    "y": 4490.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fea8fd97.74e2c8",\r
+    "id": "1b090d31.1314e3",\r
     "type": "comment",\r
     "name": "Create LEAF connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5097.566665649414,\r
-    "y": 4522,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5141.566665649414,\r
+    "y": 4521.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5a0b429f.b8f42c",\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": 5184.566665649414,\r
-    "y": 4564,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5228.566665649414,\r
+    "y": 4563.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5930a956.25a2b",\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
+    "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": 5132.566665649414,\r
-    "y": 4612,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5176.566665649414,\r
+    "y": 4611.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8f7ba394.827068",\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": 5260.566665649414,\r
-    "y": 4659,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5304.566665649414,\r
+    "y": 4658.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "828e934c.bce518",\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": 4437.566665649414,\r
-    "y": 4944,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4481.566665649414,\r
+    "y": 4943.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "29a2a107.550e86",\r
+    "id": "572f6814.fa386",\r
     "type": "comment",\r
     "name": "populate connectivity-B variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4420.566665649414,\r
-    "y": 5006,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4464.566665649414,\r
+    "y": 5005.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5181bb49.6fa9a4",\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": 4531.566665649414,\r
-    "y": 5048,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4575.566665649414,\r
+    "y": 5047.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "a3e1b718.3ad9",\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": 4979.566665649414,\r
-    "y": 5101,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5023.566665649414,\r
+    "y": 5100.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "778aa80b.aa4e1",\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": 4289.566665649414,\r
-    "y": 5799,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4333.566665649414,\r
+    "y": 5798.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5829dcc0.7722b4",\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": 4187.566665649414,\r
-    "y": 5748,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4231.566665649414,\r
+    "y": 5747.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e74f47d7.82472",\r
+    "id": "6826024b.ca723c",\r
     "type": "comment",\r
     "name": "Create LEAF UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4171.566665649414,\r
-    "y": 5704,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4215.566665649414,\r
+    "y": 5703.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "edf4200a.b4f218",\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": 4957.566665649414,\r
-    "y": 5961,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5001.566665649414,\r
+    "y": 5960.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "fd0048f2.8665c8",\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": 4358.566665649414,\r
-    "y": 5105,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4402.566665649414,\r
+    "y": 5104.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ad0bda8.59e5ba8",\r
-        "a82a76f3.4e09c"\r
+        "baf822c4.3f205",\r
+        "32a48883.ef2b98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ad0bda8.59e5ba8",\r
+    "id": "baf822c4.3f205",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4569.566665649414,\r
-    "y": 5105,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4613.566665649414,\r
+    "y": 5104.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "85a5596f.5bdcf8"\r
+        "58c9a296.a42094"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "85a5596f.5bdcf8",\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": 4725.566665649414,\r
-    "y": 5101,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4769.566665649414,\r
+    "y": 5100.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "a3e1b718.3ad9",\r
-        "31466e0d.9a3dba",\r
-        "19c788e0.a62557"\r
+        "8c58cbc3.7f4b88",\r
+        "3aab431e.930194",\r
+        "c5e59db3.c67ea"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a82a76f3.4e09c",\r
+    "id": "32a48883.ef2b98",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4565.566665649414,\r
-    "y": 5153,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4609.566665649414,\r
+    "y": 5152.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9fc5ee1f.667928"\r
+        "255e5d4d.31482a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9fc5ee1f.667928",\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": 4713.566665649414,\r
-    "y": 5148,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4757.566665649414,\r
+    "y": 5147.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4161f07f.2b4a78",\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": 5221.566665649414,\r
-    "y": 4730,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5265.566665649414,\r
+    "y": 4729.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "90827cac.7f3cc8",\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": 2387.566665649414,\r
-    "y": 141,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2431.566665649414,\r
+    "y": 140.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e557ce2.09f823",\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": 2321.566665649414,\r
-    "y": 177,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2365.566665649414,\r
+    "y": 176.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "47435c42.bdd92c",\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": 2506.566665649414,\r
-    "y": 104,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2550.566665649414,\r
+    "y": 103.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b6d8895e.58d1b",\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": 4256.566665649414,\r
-    "y": 5865,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4300.566665649414,\r
+    "y": 5864.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c1456abb.063048",\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": 4389.566665649414,\r
-    "y": 5913,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4433.566665649414,\r
+    "y": 5912.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "da4c1b48.fae9f8",\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": 4208.566665649414,\r
-    "y": 5971,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4252.566665649414,\r
+    "y": 5970.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "86ae7c06.4b48",\r
-        "7bcdf21f.be49d4"\r
+        "19e438e0.03d147",\r
+        "34d88bae.811d0c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "86ae7c06.4b48",\r
+    "id": "19e438e0.03d147",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4401.566665649414,\r
-    "y": 5972,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4445.566665649414,\r
+    "y": 5971.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "97f7b4f.de4c2c8"\r
+        "41319fcd.d8b348"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "97f7b4f.de4c2c8",\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": 4557.566665649414,\r
-    "y": 5969,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4601.566665649414,\r
+    "y": 5968.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7bcdf21f.be49d4",\r
+    "id": "34d88bae.811d0c",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4405.566665649414,\r
-    "y": 6016,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4449.566665649414,\r
+    "y": 6015.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c9f63d74.2677a"\r
+        "9cc4dc7d.174798"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c9f63d74.2677a",\r
+    "id": "9cc4dc7d.174798",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4544.566665649414,\r
-    "y": 6011,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4588.566665649414,\r
+    "y": 6010.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "edf4200a.b4f218",\r
-        "684d5c9e.960e44",\r
-        "fa17bed2.102338",\r
-        "4394fc56.b0a524",\r
-        "c58358a8.9796d8",\r
-        "f1d05d51.ef74a8",\r
-        "9dd9cb2c.0f6d38",\r
-        "e3b520b5.76f3e",\r
-        "1492db48.4787f5",\r
-        "4433eaac.652284",\r
-        "5e482e7e.e4be78",\r
-        "b03c5831.d4c5f"\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": "9dd9cb2c.0f6d38",\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": 4741.566665649414,\r
-    "y": 6690,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4785.566665649414,\r
+    "y": 6689.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1b9180c4.9f766f",\r
-        "3223a99b.bae36e",\r
-        "f1d0a095.e9e33"\r
+        "f455e87a.bb05c8",\r
+        "dc467c76.6e0b1",\r
+        "26412110.73f856"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1b9180c4.9f766f",\r
+    "id": "f455e87a.bb05c8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4946.566665649414,\r
-    "y": 6687,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4990.566665649414,\r
+    "y": 6686.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "901d20b6.63b228"\r
+        "8ff8217a.525ad8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3223a99b.bae36e",\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": 4930.057632446289,\r
-    "y": 6748.574035644531,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4974.057632446289,\r
+    "y": 6748.140701293945,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "74136956.3d8c9"\r
+        "2b587a1.cfe3f86"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f1d0a095.e9e33",\r
+    "id": "26412110.73f856",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4927.566665649414,\r
-    "y": 6792,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4971.566665649414,\r
+    "y": 6791.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c0df29cc.8ad0d8"\r
+        "b747b55e.88ecf8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "901d20b6.63b228",\r
+    "id": "8ff8217a.525ad8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5102.566665649414,\r
-    "y": 6701,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5146.566665649414,\r
+    "y": 6700.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1ef77bcc.af8c2c"\r
+        "8429b279.d4cdf"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "74136956.3d8c9",\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": 5092.629043579102,\r
-    "y": 6748.859771728516,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5136.629043579102,\r
+    "y": 6748.42643737793,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c0df29cc.8ad0d8",\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": 5094.566665649414,\r
-    "y": 6791,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5138.566665649414,\r
+    "y": 6790.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1ef77bcc.af8c2c",\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": 5349.566665649414,\r
-    "y": 6698,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5393.566665649414,\r
+    "y": 6697.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "77c4c783.c3eb4"\r
+        "1ddbd038.9357b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "77c4c783.c3eb4",\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": 5586.566665649414,\r
-    "y": 6694,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5630.566665649414,\r
+    "y": 6693.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "aa349c90.ef423"\r
+        "7922b60b.c6e31"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "41bd4d7e.8e8f9c",\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": 5829.566665649414,\r
-    "y": 6666,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5873.566665649414,\r
+    "y": 6665.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "858dc053.37b33",\r
-        "5e74f51.5b7928c"\r
+        "6697bde5.6a73ec",\r
+        "f1cd44ef.865458"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "858dc053.37b33",\r
+    "id": "6697bde5.6a73ec",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6034.566665649414,\r
-    "y": 6686,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 6078.566665649414,\r
+    "y": 6685.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "aa349c90.ef423"\r
+        "7922b60b.c6e31"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5e74f51.5b7928c",\r
+    "id": "f1cd44ef.865458",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 6033.566665649414,\r
-    "y": 6639,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 6077.566665649414,\r
+    "y": 6638.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "aa349c90.ef423",\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": 4777.566665649414,\r
-    "y": 6961,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4821.566665649414,\r
+    "y": 6960.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b674f90b.943ea8"\r
+        "b0b5d457.a97bd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4b6f312b.4e491",\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": 6239.566635131836,\r
-    "y": 6898.999969482422,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 6283.566635131836,\r
+    "y": 6898.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e9dae4fe.64e148",\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": 4839.566665649414,\r
-    "y": 6637,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4883.566665649414,\r
+    "y": 6636.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f1d05d51.ef74a8",\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": 4721.566665649414,\r
-    "y": 6525,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4765.566665649414,\r
+    "y": 6524.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "87a0032d.5441b8",\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": 5066.566665649414,\r
-    "y": 6356,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5110.566665649414,\r
+    "y": 6355.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e7a622d1.3aac3"\r
+        "ddf721ac.b7eef8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e7a622d1.3aac3",\r
+    "id": "ddf721ac.b7eef8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5286.566665649414,\r
-    "y": 6362,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5330.566665649414,\r
+    "y": 6361.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d7851175.526278"\r
+        "ff49769d.1bd52"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d7851175.526278",\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": 5473.566665649414,\r
-    "y": 6322,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5517.566665649414,\r
+    "y": 6321.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "56e3e30c.886de4"\r
+        "4e069c0d.3968f4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "56e3e30c.886de4",\r
+    "id": "4e069c0d.3968f4",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5665.566665649414,\r
-    "y": 6325,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5709.566665649414,\r
+    "y": 6324.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c0a5fdcc.0dad4"\r
+        "2305c4b2.be932c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c0a5fdcc.0dad4",\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": 5874.566665649414,\r
-    "y": 6323,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5918.566665649414,\r
+    "y": 6322.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e3b520b5.76f3e",\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": 4773.566665649414,\r
-    "y": 6350,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4817.566665649414,\r
+    "y": 6349.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "87a0032d.5441b8"\r
+        "917753a8.ea741"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fa17bed2.102338",\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": 4781.566665649414,\r
-    "y": 6243,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4825.566665649414,\r
+    "y": 6242.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b854c35b.ab4dd8",\r
-        "6917c22f.3449c4",\r
-        "56393d6a.f28b34"\r
+        "ae57a65a.f0c818",\r
+        "d5c36a0.e7a9398",\r
+        "2780984c.5a15a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b854c35b.ab4dd8",\r
+    "id": "ae57a65a.f0c818",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5017.566665649414,\r
-    "y": 6226,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5061.566665649414,\r
+    "y": 6225.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "6917c22f.3449c4",\r
+    "id": "d5c36a0.e7a9398",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5014.566665649414,\r
-    "y": 6267,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5058.566665649414,\r
+    "y": 6266.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "56393d6a.f28b34",\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": 5028.566665649414,\r
-    "y": 6307,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5072.566665649414,\r
+    "y": 6306.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4394fc56.b0a524",\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": 4717.566665649414,\r
-    "y": 6402,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4761.566665649414,\r
+    "y": 6401.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c58358a8.9796d8",\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": 4725.566665649414,\r
-    "y": 6460,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4769.566665649414,\r
+    "y": 6459.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "684d5c9e.960e44",\r
+    "id": "9b687ead.d5262",\r
     "type": "set",\r
     "name": "unset parameters",\r
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
     "comments": "",\r
-    "x": 4730.566665649414,\r
-    "y": 6200,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4774.566665649414,\r
+    "y": 6199.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4f9189d2.f34a8",\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": 4845.566665649414,\r
-    "y": 6152,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4889.566665649414,\r
+    "y": 6151.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b674f90b.943ea8",\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": 5020.566665649414,\r
-    "y": 6958,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5064.566665649414,\r
+    "y": 6957.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f695cd31.082f9",\r
-        "a92f49c6.640148"\r
+        "46f9fbf7.fbe6cc",\r
+        "bab2d066.0ad5b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f695cd31.082f9",\r
+    "id": "46f9fbf7.fbe6cc",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5249.566665649414,\r
-    "y": 6935,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5293.566665649414,\r
+    "y": 6934.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fe65cd53.d11278"\r
+        "66be0922.f0399"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a92f49c6.640148",\r
+    "id": "bab2d066.0ad5b",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5249.566665649414,\r
-    "y": 6984,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5293.566665649414,\r
+    "y": 6983.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8c69c55b.110248",\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": 5982.566635131836,\r
-    "y": 6989.999969482422,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 6026.566635131836,\r
+    "y": 6989.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "aeda0706.1d102",\r
-        "4b6f312b.4e491",\r
-        "eebb4557.9c03c"\r
+        "898afc0c.eb00d8",\r
+        "1fa90257.6a5f2e",\r
+        "9d2bedee.a23cf"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ca7dd8b0.fcddf",\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": 6367.566635131836,\r
-    "y": 6952.999969482422,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 6411.566635131836,\r
+    "y": 6952.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "eebb4557.9c03c",\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": 6337.566635131836,\r
-    "y": 7012.999969482422,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 6381.566635131836,\r
+    "y": 7012.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "aeda0706.1d102",\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": 6244.566635131836,\r
-    "y": 6840.999969482422,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 6288.566635131836,\r
+    "y": 6840.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6c4c0ada.7452e4",\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": 3980.566665649414,\r
-    "y": 5898,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4024.566665649414,\r
+    "y": 5897.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5829dcc0.7722b4",\r
-        "b6d8895e.58d1b",\r
-        "c1456abb.063048",\r
-        "da4c1b48.fae9f8",\r
-        "778aa80b.aa4e1"\r
+        "526f34d0.18befc",\r
+        "fad64a40.999cd8",\r
+        "1f999717.41db99",\r
+        "c52167d8.94938",\r
+        "be5aff94.f7d12"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "146e3d98.17031a",\r
+    "id": "55c4563d.130918",\r
     "type": "set",\r
     "name": "unset otnTopoIdSrc",\r
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
     "comments": "",\r
-    "x": 4722.566665649414,\r
-    "y": 6300,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4766.566665649414,\r
+    "y": 6299.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1492db48.4787f5",\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": 4850.566665649414,\r
-    "y": 6042,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4894.566665649414,\r
+    "y": 6041.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "cc643bc5.4660a",\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": 4987.566665649414,\r
-    "y": 5992,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5031.566665649414,\r
+    "y": 5991.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "eb6eb29c.21a438",\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": 3814.566665649414,\r
-    "y": 3385,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3858.566665649414,\r
+    "y": 3384.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3ddb9817.a2345",\r
+    "id": "c96fd773.2e2468",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3992.566635131836,\r
-    "y": 1619.9999694824219,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4036.566635131836,\r
+    "y": 1619.566635131836,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "87712f4d.617c48",\r
+    "id": "e5b482c4.4ff96",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3971.566604614258,\r
-    "y": 2131.9999389648438,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4015.566604614258,\r
+    "y": 2131.566604614258,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4a9500be.eb8d5",\r
+    "id": "58efc802.973c9",\r
     "type": "comment",\r
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3806.566665649414,\r
-    "y": 4006,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3850.566665649414,\r
+    "y": 4005.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1cb779c6.3641ce",\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": 3896.566665649414,\r
-    "y": 6386,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3940.566665649414,\r
+    "y": 6385.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "316110e0.e54cc",\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": 3698.566665649414,\r
-    "y": 4915,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3742.566665649414,\r
+    "y": 4914.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b160de6d.e8ced8",\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": 3831.566665649414,\r
-    "y": 4963,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3875.566665649414,\r
+    "y": 4962.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f0982e54.06c37",\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": 4377.566665649414,\r
-    "y": 4591,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4421.566665649414,\r
+    "y": 4590.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c8f13ad.170ba48",\r
-        "e5fec2af.744f18"\r
+        "894780c2.49e69",\r
+        "859a7332.ec6f6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c8f13ad.170ba48",\r
+    "id": "894780c2.49e69",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4570.566665649414,\r
-    "y": 4592,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4614.566665649414,\r
+    "y": 4591.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7d8426b0.28b2e8"\r
+        "ba88b5a5.1ae688"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e5fec2af.744f18",\r
+    "id": "859a7332.ec6f6",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4574.566665649414,\r
-    "y": 4636,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4618.566665649414,\r
+    "y": 4635.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "bbb62c5.19c455"\r
+        "99dc491a.da7278"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bbb62c5.19c455",\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": 4713.566665649414,\r
-    "y": 4631,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4757.566665649414,\r
+    "y": 4630.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fdbb486.bd6db38",\r
-        "ecce0ba1.70791",\r
-        "5cdec210.c3723c"\r
+        "8cf9ac68.b6fb08",\r
+        "b04660b8.eae2",\r
+        "fb45e770.b6fb4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7d8426b0.28b2e8",\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": 4713.566665649414,\r
-    "y": 4588,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4757.566665649414,\r
+    "y": 4587.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5a0b429f.b8f42c",\r
-        "5930a956.25a2b",\r
-        "8f7ba394.827068",\r
-        "4161f07f.2b4a78"\r
+        "c30363c7.dd0dc",\r
+        "10271018.94b4f8",\r
+        "285754a8.44159c",\r
+        "3647078f.866d7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fdbb486.bd6db38",\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": 5115.566909790039,\r
-    "y": 4853,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5159.566909790039,\r
+    "y": 4852.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1b42c685.843199",\r
+    "id": "f52716f7.92c318",\r
     "type": "comment",\r
     "name": "populate connectivity-A variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5122.566909790039,\r
-    "y": 4807,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5166.566909790039,\r
+    "y": 4806.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4433eaac.652284",\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": 4912.566665649414,\r
-    "y": 6586,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4956.566665649414,\r
+    "y": 6585.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ecce0ba1.70791",\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": 5233.566909790039,\r
-    "y": 4895,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5277.566909790039,\r
+    "y": 4894.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "31466e0d.9a3dba",\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": 5108.566665649414,\r
-    "y": 5153,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5152.566665649414,\r
+    "y": 5152.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c7cb9f6d.ac734",\r
+    "id": "b6e6466d.f535c8",\r
     "type": "comment",\r
     "name": "Update ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3453.566665649414,\r
-    "y": 4486,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3497.566665649414,\r
+    "y": 4485.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9ba8b5cc.a415f",\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": 3975.566665649414,\r
-    "y": 4587,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4019.566665649414,\r
+    "y": 4586.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "595e7f4b.3b8bd8",\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": 3432.566665649414,\r
-    "y": 4530,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3476.566665649414,\r
+    "y": 4529.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2a6568f7.a02838",\r
-        "9843c265.208d4",\r
-        "db80e493.f550d"\r
+        "a0645295.c076d8",\r
+        "9cfd1461.a062b8",\r
+        "c3fd0eeb.1191a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9843c265.208d4",\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": 3621.057632446289,\r
-    "y": 4498.57421875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3665.057632446289,\r
+    "y": 4498.140884399414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d1fd8036.140ed8"\r
+        "763a574e.7131"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "db80e493.f550d",\r
+    "id": "c3fd0eeb.1191a",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3609.566665649414,\r
-    "y": 4538,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3653.566665649414,\r
+    "y": 4537.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b0bc7666.9d27d8"\r
+        "64809ae2.7e048c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d1fd8036.140ed8",\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": 3780.629165649414,\r
-    "y": 4496.85986328125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3824.629165649414,\r
+    "y": 4496.426528930664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b0bc7666.9d27d8",\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": 3770.566665649414,\r
-    "y": 4539,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3814.566665649414,\r
+    "y": 4538.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "aa03472e.31d4e8",\r
+    "id": "9a196ab1.500e98",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3772.566665649414,\r
-    "y": 4583,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3816.566665649414,\r
+    "y": 4582.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4ba9a34f.8b45e4",\r
-        "9ba8b5cc.a415f"\r
+        "6eb0cd28.22b8f4",\r
+        "eb0222bd.49b5a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2a6568f7.a02838",\r
+    "id": "a0645295.c076d8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3614.566665649414,\r
-    "y": 4575,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3658.566665649414,\r
+    "y": 4574.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "aa03472e.31d4e8"\r
+        "9a196ab1.500e98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4ba9a34f.8b45e4",\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": 3933.566665649414,\r
-    "y": 4515,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3977.566665649414,\r
+    "y": 4514.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8bf8bc6f.53ce6",\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": 3798.566665649414,\r
-    "y": 4854,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3842.566665649414,\r
+    "y": 4853.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d58a2a07.e32878",\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": 5913.449966430664,\r
-    "y": 6603.88330078125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5957.449966430664,\r
+    "y": 6603.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5cdec210.c3723c",\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": 5113.233901977539,\r
-    "y": 4991.08349609375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5157.233901977539,\r
+    "y": 4990.650161743164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7d691c73.0a445c",\r
+    "id": "7a5a11e8.fe41c8",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5115.450698852539,\r
-    "y": 4950.88330078125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5159.450698852539,\r
+    "y": 4950.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "19c788e0.a62557",\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": 4989.233657836914,\r
-    "y": 5241.08349609375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5033.233657836914,\r
+    "y": 5240.650161743164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b53673c2.40ae68",\r
+    "id": "57dbe634.714a18",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4991.450454711914,\r
-    "y": 5200.88330078125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5035.450454711914,\r
+    "y": 5200.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cb99e55a.09312",\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": 5079.033462524414,\r
-    "y": 5603.5166015625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5123.033462524414,\r
+    "y": 5603.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b6bbe449.e349b8",\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": 4906.033462524414,\r
-    "y": 5660.5166015625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4950.033462524414,\r
+    "y": 5660.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9f020db8.9d3b98",\r
-        "42fb1006.cd98b"\r
+        "322ec37b.7f462c",\r
+        "a4688844.be2738"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9f020db8.9d3b98",\r
+    "id": "322ec37b.7f462c",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5117.033462524414,\r
-    "y": 5660.5166015625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5161.033462524414,\r
+    "y": 5660.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "406d3b53.ee3654"\r
+        "32e06877.2a572"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "42fb1006.cd98b",\r
+    "id": "a4688844.be2738",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5113.033462524414,\r
-    "y": 5708.5166015625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5157.033462524414,\r
+    "y": 5708.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fa70895e.520cf8"\r
+        "748c1810.be501"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "406d3b53.ee3654",\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": 5273.033462524414,\r
-    "y": 5656.5166015625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5317.033462524414,\r
+    "y": 5656.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8249d2ac.0a73f8",\r
-        "2838a041.93c678",\r
-        "45d14641.c6458"\r
+        "c380fc3b.e6c15",\r
+        "4e971f2e.5d2078",\r
+        "7fabceea.e8bd9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fa70895e.520cf8",\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": 5261.033462524414,\r
-    "y": 5703.5166015625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5305.033462524414,\r
+    "y": 5703.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f332f23.f01a81",\r
+    "id": "bf0ec53.d08f2b8",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5582.917251586914,\r
-    "y": 5757.39990234375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5626.917251586914,\r
+    "y": 5756.966567993164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "45d14641.c6458",\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": 5586.700454711914,\r
-    "y": 5795.60009765625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5630.700454711914,\r
+    "y": 5795.166763305664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2838a041.93c678",\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": 5693.033462524414,\r
-    "y": 5708.5166015625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5737.033462524414,\r
+    "y": 5708.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "8249d2ac.0a73f8",\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": 5577.033462524414,\r
-    "y": 5656.5166015625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5621.033462524414,\r
+    "y": 5656.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "3aa78165.d5c51e",\r
+    "id": "ddfb9582.3445a8",\r
     "type": "comment",\r
     "name": "populate connectivity-B variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4968.033462524414,\r
-    "y": 5561.5166015625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5012.033462524414,\r
+    "y": 5561.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5e482e7e.e4be78",\r
+    "id": "3c1017d1.449bb",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4680.366470336914,\r
-    "y": 5736.5166015625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4724.366470336914,\r
+    "y": 5736.083267211914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "cb99e55a.09312",\r
-        "b6bbe449.e349b8",\r
-        "5021b590.5d75e4",\r
-        "316a2790.87ce5"\r
+        "aa096a62.a00c18",\r
+        "a1684c9.099dc3",\r
+        "a4cbceb2.4df788",\r
+        "9c03eaae.aa875"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b03c5831.d4c5f",\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": 4980.399673461914,\r
-    "y": 6097.2001953125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5024.399673461914,\r
+    "y": 6096.766860961914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b60a5a20.1568d",\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": 5786.683334350586,\r
-    "y": 6934.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5830.683334350586,\r
+    "y": 6933.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "fe65cd53.d11278",\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": 5405.683334350586,\r
-    "y": 6937.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5449.683334350586,\r
+    "y": 6936.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b60a5a20.1568d",\r
-        "364f2ed4.be66d2",\r
-        "3daa885e.628288"\r
+        "bfe53aa3.d585a8",\r
+        "f8b29486.7e71d",\r
+        "bf54edf8.ad3758"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "364f2ed4.be66d2",\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": 5631.683334350586,\r
-    "y": 6989.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5675.683334350586,\r
+    "y": 6988.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1f12c870.4650c"\r
+        "45d6980.5fa0ee8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1f12c870.4650c",\r
+    "id": "45d6980.5fa0ee8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5810.683334350586,\r
-    "y": 6988.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5854.683334350586,\r
+    "y": 6987.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8c69c55b.110248"\r
+        "646b562c.1751a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3daa885e.628288",\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": 5632.683334350586,\r
-    "y": 6882.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5676.683334350586,\r
+    "y": 6881.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "651f3c1e.ddf684",\r
+    "id": "7c0aae65.c25f7",\r
     "type": "notify",\r
     "name": "notify",\r
     "xml": "<notify plugin='' resource='' action='' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2626.683334350586,\r
-    "y": 931.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 2670.683334350586,\r
+    "y": 930.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f71bee39.3d2f68",\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": 3304.683334350586,\r
-    "y": 707.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3348.683334350586,\r
+    "y": 706.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1f090c0d.f20bac",\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": 3520.683334350586,\r
-    "y": 1035.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3564.683334350586,\r
+    "y": 1034.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4c96009f.d63af8",\r
+    "id": "e2e500c.35b568",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3516.192398071289,\r
-    "y": 1077.542724609375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3560.192398071289,\r
+    "y": 1077.109390258789,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "30702b44.ca2744",\r
+    "id": "ac92425e.1b5228",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3520.192367553711,\r
-    "y": 1125.5426940917969,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3564.192367553711,\r
+    "y": 1125.109359741211,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f0fe90c1.1ee158"\r
+        "74bd1e76.c1a798"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f0fe90c1.1ee158",\r
+    "id": "74bd1e76.c1a798",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3677.683334350586,\r
-    "y": 1125.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3721.683334350586,\r
+    "y": 1124.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "24f554c8.25b494"\r
+        "75cda54f.508c54"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "24f554c8.25b494",\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": 3847.683364868164,\r
-    "y": 1128.1168212890625,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3891.683364868164,\r
+    "y": 1127.6834869384766,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "92b753af.8b83b",\r
-        "e0d04b94.0a949",\r
-        "3f783acd.f1212e"\r
+        "b5759425.3c5bd",\r
+        "a5689d25.4480b8",\r
+        "32c4f78e.6013e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "92b753af.8b83b",\r
+    "id": "b5759425.3c5bd",\r
     "type": "outcome",\r
     "name": "ROOT",\r
     "xml": "<outcome value='ROOT'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4021.683334350586,\r
-    "y": 1066.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4065.683334350586,\r
+    "y": 1065.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "34be9217.24bb7e"\r
+        "e254226b.74faf"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e0d04b94.0a949",\r
+    "id": "a5689d25.4480b8",\r
     "type": "outcome",\r
     "name": "LEAF",\r
     "xml": "<outcome value='LEAF'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4023.683334350586,\r
-    "y": 1120.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4067.683334350586,\r
+    "y": 1119.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1a5ec0d1.1d1527"\r
+        "b214dc3a.ed1eb8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "34be9217.24bb7e",\r
+    "id": "e254226b.74faf",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4149.683334350586,\r
-    "y": 1066.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4193.683334350586,\r
+    "y": 1065.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c2e9a46e.2fa128",\r
-        "d3171aa3.cb0078"\r
+        "1e63a796.08e87",\r
+        "c1790587.ac9f08"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1a5ec0d1.1d1527",\r
+    "id": "b214dc3a.ed1eb8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4152.683334350586,\r
-    "y": 1119.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4196.683334350586,\r
+    "y": 1118.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1fb8ea51.9b1c8e",\r
-        "b9df456c.24fc38"\r
+        "ea9630d6.e1db68",\r
+        "7cd0ca92.870d14"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d3171aa3.cb0078",\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": 4310.683334350586,\r
-    "y": 1090.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4354.683334350586,\r
+    "y": 1089.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1fb8ea51.9b1c8e",\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": 4327.683334350586,\r
-    "y": 1132.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4371.683334350586,\r
+    "y": 1131.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b9df456c.24fc38",\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": 4312.683334350586,\r
-    "y": 1170.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4356.683334350586,\r
+    "y": 1169.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c2e9a46e.2fa128",\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": 4324.683334350586,\r
-    "y": 1050.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4368.683334350586,\r
+    "y": 1049.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "dc69c361.915968",\r
+    "id": "5b64a8f4.eea95",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4489.683334350586,\r
-    "y": 1066.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4533.683334350586,\r
+    "y": 1065.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6cb3b80a.d81b1",\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": 3280.683334350586,\r
-    "y": 1052.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3324.683334350586,\r
+    "y": 1051.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1f090c0d.f20bac",\r
-        "4c96009f.d63af8",\r
-        "30702b44.ca2744"\r
+        "18d11d50.cb3a7b",\r
+        "e2e500c.35b568",\r
+        "ac92425e.1b5228"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3f783acd.f1212e",\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": 3966.683334350586,\r
-    "y": 1184.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4010.683334350586,\r
+    "y": 1183.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ce69203c.a7c0d"\r
+        "e8d5048b.eb9908"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ce69203c.a7c0d",\r
+    "id": "e8d5048b.eb9908",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4140.683334350586,\r
-    "y": 1179.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4184.683334350586,\r
+    "y": 1178.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "77a19b24.92e3d4",\r
-        "6c3b4ea8.3b622"\r
+        "cbdde789.933e38",\r
+        "ff9c265d.ccb66"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6c3b4ea8.3b622",\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": 4310.683334350586,\r
-    "y": 1252.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4354.683334350586,\r
+    "y": 1251.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "77a19b24.92e3d4",\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": 4364.683334350586,\r
-    "y": 1212.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4408.683334350586,\r
+    "y": 1211.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a7c6adcc.5c3908",\r
+    "id": "fa28f519.9b734",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4478.683334350586,\r
-    "y": 1237.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4522.683334350586,\r
+    "y": 1236.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cb966d3f.bcf358",\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": 4037.683334350586,\r
-    "y": 940.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4081.683334350586,\r
+    "y": 939.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "359af935.19ef46"\r
+        "6a27287d.2ebf6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ca572ac1.2b94f8",\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": 4381.683334350586,\r
-    "y": 1008.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4425.683334350586,\r
+    "y": 1007.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "60fff9bd.2ccfe",\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": 4435.683334350586,\r
-    "y": 968.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4479.683334350586,\r
+    "y": 967.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "74e2fab5.3910b4",\r
+    "id": "7d1c2c8b.bd9814",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4579.683334350586,\r
-    "y": 997.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4623.683334350586,\r
+    "y": 996.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "359af935.19ef46",\r
+    "id": "6a27287d.2ebf6",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4211.683334350586,\r
-    "y": 935.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4255.683334350586,\r
+    "y": 934.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "60fff9bd.2ccfe",\r
-        "ca572ac1.2b94f8"\r
+        "38b369ba.8d91fe",\r
+        "d7809ac8.28364"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dd62b4eb.26fb1",\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": 4097.683334350586,\r
-    "y": 678.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4141.683334350586,\r
+    "y": 677.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "eaab099.c2c5e78"\r
+        "e58f35e3.4b6a2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "44f31aac.78bf4c",\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": 4441.683334350586,\r
-    "y": 746.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4485.683334350586,\r
+    "y": 745.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e00b5614.1b212",\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": 4495.683334350586,\r
-    "y": 706.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4539.683334350586,\r
+    "y": 705.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fb8145.224d2eb8",\r
+    "id": "33be367d.fbce62",\r
     "type": "comment",\r
     "name": "This is it (should be)",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4609.683334350586,\r
-    "y": 731.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4653.683334350586,\r
+    "y": 730.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "eaab099.c2c5e78",\r
+    "id": "e58f35e3.4b6a2",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4271.683334350586,\r
-    "y": 673.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4315.683334350586,\r
+    "y": 672.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e00b5614.1b212",\r
-        "44f31aac.78bf4c"\r
+        "66ae94b1.018af4",\r
+        "6a2c136e.692edc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "47b6d6c0.771098",\r
+    "id": "64cdb464.83135c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3678.683334350586,\r
-    "y": 2555.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3722.683334350586,\r
+    "y": 2554.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d5c762a3.e1b22",\r
-        "cd80f814.c17fb8"\r
+        "7a3829d.42a01d8",\r
+        "d03e5e53.5cee58"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6a53c92c.c39ad8",\r
+    "id": "6e42edd4.58cd0c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3506.016830444336,\r
-    "y": 2556.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3550.016830444336,\r
+    "y": 2555.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "47b6d6c0.771098"\r
+        "64cdb464.83135c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "15ee64d.915489b",\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": 3515.507797241211,\r
-    "y": 2598.690704345703,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3559.507797241211,\r
+    "y": 2598.257369995117,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "ffc72b13.54b308",\r
+    "id": "2df3a08e.41f4c",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3504.016830444336,\r
-    "y": 2645.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3548.016830444336,\r
+    "y": 2644.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d5c762a3.e1b22",\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": 3965.016830444336,\r
-    "y": 2559.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4009.016830444336,\r
+    "y": 2558.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "39f97b3f.483dec",\r
-        "a10b377c.8904d8"\r
+        "38c64779.e618f",\r
+        "14f81708.27e459"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a10b377c.8904d8",\r
+    "id": "14f81708.27e459",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4188.016830444336,\r
-    "y": 2514.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4232.016830444336,\r
+    "y": 2513.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1c79745.54c4b0c"\r
+        "2753f3be.c9c924"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "39f97b3f.483dec",\r
+    "id": "38c64779.e618f",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4190.016830444336,\r
-    "y": 2578.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4234.016830444336,\r
+    "y": 2577.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5e26eb53.994624"\r
+        "43ad3093.31a088"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "59ced5c4.1cbb54",\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": 3278.016830444336,\r
-    "y": 2591.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3322.016830444336,\r
+    "y": 2590.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "6a53c92c.c39ad8",\r
-        "15ee64d.915489b",\r
-        "ffc72b13.54b308"\r
+        "6e42edd4.58cd0c",\r
+        "b61e07a3.0e4238",\r
+        "2df3a08e.41f4c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bf53a639.73b6d8",\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": 3239.016830444336,\r
-    "y": 2535.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3283.016830444336,\r
+    "y": 2534.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7411f30.15b1c8c",\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": 3298.016830444336,\r
-    "y": 2331.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3342.016830444336,\r
+    "y": 2330.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "dd801267.ae8a78",\r
-        "2c468159.26cb9e"\r
+        "2f0a58a8.ee7038",\r
+        "79cdcb97.546894"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2c468159.26cb9e",\r
+    "id": "79cdcb97.546894",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3521.016830444336,\r
-    "y": 2317.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3565.016830444336,\r
+    "y": 2316.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1f5c2f54.7e50d9"\r
+        "49eedb67.f00374"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "dd801267.ae8a78",\r
+    "id": "2f0a58a8.ee7038",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3523.016830444336,\r
-    "y": 2350.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3567.016830444336,\r
+    "y": 2349.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1f5c2f54.7e50d9",\r
+    "id": "49eedb67.f00374",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3669.016830444336,\r
-    "y": 2310.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3713.016830444336,\r
+    "y": 2309.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "33d7ee91.be9492",\r
-        "2cd16653.cccd12"\r
+        "f5d93681.391ea",\r
+        "66937670.413898"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "33d7ee91.be9492",\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": 3863.016830444336,\r
-    "y": 2313.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3907.016830444336,\r
+    "y": 2312.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cd80f814.c17fb8",\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": 3916.016799926758,\r
-    "y": 2682.1166381835938,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3960.016799926758,\r
+    "y": 2681.683303833008,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f197c90a.b0bfd8"\r
+        "1dfcba6a.928896"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f197c90a.b0bfd8",\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": 4122.016799926758,\r
-    "y": 2682.1166381835938,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4166.016799926758,\r
+    "y": 2681.683303833008,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ee87c14f.7e00c8"\r
+        "ad7b62a1.1a3de8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2cd16653.cccd12",\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": 3885.016830444336,\r
-    "y": 2381.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3929.016830444336,\r
+    "y": 2380.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b86ed6f1.7f482",\r
-        "f1a441ce.e5665",\r
-        "de4f03bc.b1dad"\r
+        "7e1c1529.6f1464",\r
+        "e1251115.be77b",\r
+        "d084db0e.513758"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b86ed6f1.7f482",\r
+    "id": "7e1c1529.6f1464",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4080.5169525146484,\r
-    "y": 2333.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4124.516952514648,\r
+    "y": 2332.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4728dd3.dc78424"\r
+        "24a5d36d.06630c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f1a441ce.e5665",\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": 4072.5169525146484,\r
-    "y": 2388.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4116.516952514648,\r
+    "y": 2387.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "250a014d.a07c5e"\r
+        "e4759099.9196a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "de4f03bc.b1dad",\r
+    "id": "d084db0e.513758",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4077.5169525146484,\r
-    "y": 2445.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4121.516952514648,\r
+    "y": 2444.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c4850afb.039ba"\r
+        "68e5ccfb.96ac94"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c4850afb.039ba",\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": 4229.516952514648,\r
-    "y": 2446.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4273.516952514648,\r
+    "y": 2445.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4728dd3.dc78424",\r
+    "id": "24a5d36d.06630c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4224.899276733398,\r
-    "y": 2330.7724609375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4268.899276733398,\r
+    "y": 2330.339126586914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f5f74636.92701"\r
+        "b2ff1ea.8d4406"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b2338e3d.f752e8",\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": 3300.683334350586,\r
-    "y": 2670.116668701172,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3344.683334350586,\r
+    "y": 2669.683334350586,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b3bc28cb.23625",\r
+    "id": "4cfd3be4.f62fcc",\r
     "type": "comment",\r
     "name": "NOT NEEDED ANYMORE?",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3975.683303833008,\r
-    "y": 2634.1166381835938,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4019.683303833008,\r
+    "y": 2633.683303833008,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5e26eb53.994624",\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": 4349.016830444336,\r
-    "y": 2597.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4393.016830444336,\r
+    "y": 2596.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1c79745.54c4b0c",\r
+    "id": "2753f3be.c9c924",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4353.016830444336,\r
-    "y": 2511.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4397.016830444336,\r
+    "y": 2510.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fe7cdeb0.daac9",\r
-        "34c0d4b1.5c7dfc"\r
+        "a6bf1231.b0b2f8",\r
+        "b6449bb5.90e018"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ee87c14f.7e00c8",\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": 4339.302444458008,\r
-    "y": 2680.9384155273438,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4383.302444458008,\r
+    "y": 2680.505081176758,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fc8a72d4.98e42"\r
+        "e5d22111.f520c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "250a014d.a07c5e",\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": 4240.516952514648,\r
-    "y": 2391.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4284.516952514648,\r
+    "y": 2390.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fe7cdeb0.daac9",\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": 4523.016830444336,\r
-    "y": 2472.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4567.016830444336,\r
+    "y": 2471.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "34c0d4b1.5c7dfc",\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": 4524.016830444336,\r
-    "y": 2577.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4568.016830444336,\r
+    "y": 2576.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6a8cd207.c1e8c4",\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": 4519.016830444336,\r
-    "y": 2526.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4563.016830444336,\r
+    "y": 2525.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fc8a72d4.98e42",\r
+    "id": "e5d22111.f520c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4546.133987426758,\r
-    "y": 2670.4570922851562,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4590.133987426758,\r
+    "y": 2670.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8f4cacd5.ce6228",\r
-        "4e56644.a64779c",\r
-        "68f649.e92691b8"\r
+        "387e5354.258eec",\r
+        "d91f6407.9298c8",\r
+        "8a12363d.8f67b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8f4cacd5.ce6228",\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": 4761.133987426758,\r
-    "y": 2632.4570922851562,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4805.133987426758,\r
+    "y": 2632.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4e56644.a64779c",\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": 4758.133987426758,\r
-    "y": 2671.4570922851562,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4802.133987426758,\r
+    "y": 2671.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9a6ae8ae.1adf3"\r
+        "824c0ca3.93f64"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "68f649.e92691b8",\r
+    "id": "8a12363d.8f67b8",\r
     "type": "break",\r
     "name": "break",\r
     "xml": "<break>\n",\r
     "comments": "",\r
-    "x": 4713.633987426758,\r
-    "y": 2713.4570922851562,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4757.633987426758,\r
+    "y": 2713.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d8d22b92.e3f9c8",\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": 4807.016830444336,\r
-    "y": 2349.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4851.016830444336,\r
+    "y": 2348.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8d5de697.738fb"\r
+        "97206b42.8c742"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f5f74636.92701",\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": 4409.016830444336,\r
-    "y": 2345.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4453.016830444336,\r
+    "y": 2344.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "458de584.eb17d4"\r
+        "3bc9e41b.32e2f4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "458de584.eb17d4",\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": 4604.016830444336,\r
-    "y": 2345.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4648.016830444336,\r
+    "y": 2344.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d8d22b92.e3f9c8",\r
-        "aa17b1cc.ebb808"\r
+        "b23c99bf.cf2e8",\r
+        "c333a868.fb119"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "aa17b1cc.ebb808",\r
+    "id": "c333a868.fb119",\r
     "type": "outcome",\r
     "name": "network-resource",\r
     "xml": "<outcome value='network-resource'>",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4809.016830444336,\r
-    "y": 2422.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4853.016830444336,\r
+    "y": 2421.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "74ed71f8.f337d8"\r
+        "bd453b0b.71f93"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9a6ae8ae.1adf3",\r
+    "id": "824c0ca3.93f64",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4938.633987426758,\r
-    "y": 2670.4570922851562,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4982.633987426758,\r
+    "y": 2670.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "48cbb65c.c75f18"\r
+        "95206ee6.94dd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "48cbb65c.c75f18",\r
+    "id": "95206ee6.94dd",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5096.633987426758,\r
-    "y": 2670.4570922851562,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5140.633987426758,\r
+    "y": 2670.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5d1f9a1.a44f9e4"\r
+        "a1087d28.90e2f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5d1f9a1.a44f9e4",\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": 5303.633987426758,\r
-    "y": 2670.4570922851562,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5347.633987426758,\r
+    "y": 2670.0237579345703,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8d5de697.738fb",\r
+    "id": "97206b42.8c742",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4984.016830444336,\r
-    "y": 2341.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5028.016830444336,\r
+    "y": 2340.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "557f2b2a.e4488c",\r
-        "b7eb9cb4.7bd228"\r
+        "4cfed3d4.2e715c",\r
+        "b3c82e8a.c152c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b7eb9cb4.7bd228",\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": 5192.016830444336,\r
-    "y": 2348.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5236.016830444336,\r
+    "y": 2347.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2cc0f80f.8e664",\r
-        "e33c4c36.9c6408",\r
-        "decf6255.02de4"\r
+        "c3765dd7.98e19",\r
+        "82480139.31c848",\r
+        "da19380a.5cc67"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "74ed71f8.f337d8",\r
+    "id": "bd453b0b.71f93",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4986.016830444336,\r
-    "y": 2414.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5030.016830444336,\r
+    "y": 2413.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ddc00f08.8fee3"\r
+        "14471967.2bb00f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "557f2b2a.e4488c",\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": 5222.016830444336,\r
-    "y": 2296.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5266.016830444336,\r
+    "y": 2295.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ddc00f08.8fee3",\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": 5221.016830444336,\r
-    "y": 2538.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5265.016830444336,\r
+    "y": 2537.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2cc0f80f.8e664",\r
+    "id": "c3765dd7.98e19",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5402.016830444336,\r
-    "y": 2339.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5446.016830444336,\r
+    "y": 2338.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "aada8b04.37bbe"\r
+        "eb76aab.05915d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e33c4c36.9c6408",\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": 5394.016830444336,\r
-    "y": 2394.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5438.016830444336,\r
+    "y": 2393.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "52b0fc34.6385e4"\r
+        "3c8ef50f.dc9d5a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "decf6255.02de4",\r
+    "id": "da19380a.5cc67",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5399.016830444336,\r
-    "y": 2451.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5443.016830444336,\r
+    "y": 2450.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1d0f9aee.0f2085"\r
+        "11ed4dc4.069aca"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1d0f9aee.0f2085",\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": 5551.016830444336,\r
-    "y": 2452.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5595.016830444336,\r
+    "y": 2451.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "52b0fc34.6385e4",\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": 5562.016830444336,\r
-    "y": 2397.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5606.016830444336,\r
+    "y": 2396.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "aada8b04.37bbe",\r
+    "id": "eb76aab.05915d8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5546.399154663086,\r
-    "y": 2336.7724609375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5590.399154663086,\r
+    "y": 2336.339126586914,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b0a8403b.df77f8"\r
+        "57675f66.16eb5"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b0a8403b.df77f8",\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": 5761.016830444336,\r
-    "y": 2333.1167907714844,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5805.016830444336,\r
+    "y": 2332.6834564208984,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8b07e19d.5f94",\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": 3274.683334350586,\r
-    "y": 806.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3318.683334350586,\r
+    "y": 805.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "ba76d6d3.05fe9",\r
-        "fe627d30.e07a9"\r
+        "ee3317c4.be6f98",\r
+        "785558d0.46aa7"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ba76d6d3.05fe9",\r
+    "id": "ee3317c4.be6f98",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3396.683364868164,\r
-    "y": 751.11669921875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3440.683364868164,\r
+    "y": 750.6833648681641,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "aae22e84.83191"\r
+        "b70329ff.3ba71"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fe627d30.e07a9",\r
+    "id": "785558d0.46aa7",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3383.683364868164,\r
-    "y": 860.11669921875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3427.683364868164,\r
+    "y": 859.6833648681641,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "652bcf4e.b1513"\r
+        "e7d34a7a.6aac6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "aae22e84.83191",\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": 3611.683334350586,\r
-    "y": 588.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3655.683334350586,\r
+    "y": 587.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "652bcf4e.b1513",\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": 3607.683334350586,\r
-    "y": 632.1166687011719,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3651.683334350586,\r
+    "y": 631.6833343505859,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8877dbf4.9fef7",\r
+    "id": "3cc87f7.3864a",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3804.683364868164,\r
-    "y": 3532.11669921875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3848.683364868164,\r
+    "y": 3531.683364868164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "8a807ecd.e2d688"\r
+        "f7171cc6.827928"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8a807ecd.e2d688",\r
+    "id": "f7171cc6.827928",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3995.683364868164,\r
-    "y": 3536.11669921875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4039.683364868164,\r
+    "y": 3535.683364868164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "157127d1.cb4078"\r
+        "27271b87.886184"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "157127d1.cb4078",\r
+    "id": "27271b87.886184",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4122.683364868164,\r
-    "y": 3535.11669921875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4166.683364868164,\r
+    "y": 3534.683364868164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "75df7ed7.bf083",\r
-        "34e17ebd.74d332"\r
+        "90e47ea0.ecee8",\r
+        "8a6c8ced.8f741"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "34e17ebd.74d332",\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": 4344.683364868164,\r
-    "y": 3424.11669921875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4388.683364868164,\r
+    "y": 3423.683364868164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "877b276.88c73d8",\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": 3349.566665649414,\r
-    "y": 464,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3393.566665649414,\r
+    "y": 463.56666564941406,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "75df7ed7.bf083",\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": 4340.566665649414,\r
-    "y": 3483,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4384.566665649414,\r
+    "y": 3482.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "298158e5.1b02b8",\r
-        "8816a027.c5ad7"\r
+        "61b6ba56.719bdc",\r
+        "226a53c4.28be4c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "298158e5.1b02b8",\r
+    "id": "61b6ba56.719bdc",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4550.566665649414,\r
-    "y": 3460,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4594.566665649414,\r
+    "y": 3459.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2754d16a.8d72ae"\r
+        "3f2dca65.c993b6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2754d16a.8d72ae",\r
+    "id": "3f2dca65.c993b6",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4676.566665649414,\r
-    "y": 3460,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4720.566665649414,\r
+    "y": 3459.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1ec26074.15dbf"\r
+        "812380f1.94aae8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7bc2899d.3cc8d",\r
+    "id": "32cc56e4.b47402",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4681.566665649414,\r
-    "y": 3509,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4725.566665649414,\r
+    "y": 3508.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "4336d7d0.b3e05",\r
-        "60df6ba0.591fdc",\r
-        "73d9646c.b91d7c",\r
-        "81cba3c.9ee8de"\r
+        "7de42311.cfc97c",\r
+        "94a4f684.655798",\r
+        "9102db37.03feb",\r
+        "168bc7a3.f57628"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8816a027.c5ad7",\r
+    "id": "226a53c4.28be4c",\r
     "type": "outcomeTrue",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4555.566665649414,\r
-    "y": 3509,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4599.566665649414,\r
+    "y": 3508.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7bc2899d.3cc8d"\r
+        "32cc56e4.b47402"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1ec26074.15dbf",\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": 5004.566665649414,\r
-    "y": 3457,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5048.566665649414,\r
+    "y": 3456.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4336d7d0.b3e05",\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": 4957.566665649414,\r
-    "y": 3548,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5001.566665649414,\r
+    "y": 3547.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "60df6ba0.591fdc",\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
+    "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": 4905.566665649414,\r
-    "y": 3590,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4949.566665649414,\r
+    "y": 3589.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "73d9646c.b91d7c",\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": 5034.566665649414,\r
-    "y": 3632,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5078.566665649414,\r
+    "y": 3631.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "63767aff.e83474",\r
+    "id": "3c0b7ceb.8c4ecc",\r
     "type": "comment",\r
     "name": "Create SECONDARY-ROOT connectivity",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4920.566665649414,\r
-    "y": 3505,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4964.566665649414,\r
+    "y": 3504.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "81cba3c.9ee8de",\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": 5012.566665649414,\r
-    "y": 3680,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5056.566665649414,\r
+    "y": 3679.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "238550a0.c6cd18",\r
+    "id": "54d0b322.54c85c",\r
     "type": "comment",\r
     "name": "Create SECONDARY-ROOT UNI",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3832.566665649414,\r
-    "y": 3483,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3876.566665649414,\r
+    "y": 3482.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "374b533b.d2c934",\r
+    "id": "5fefabc6.f62f5c",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3807.566665649414,\r
-    "y": 4154,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3851.566665649414,\r
+    "y": 4153.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "42d7b44a.367424"\r
+        "b4ef06b7.1fe62"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "42d7b44a.367424",\r
+    "id": "b4ef06b7.1fe62",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3999.566665649414,\r
-    "y": 4149,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4043.566665649414,\r
+    "y": 4148.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "aa122d60.47dec8"\r
+        "815df3f1.7eb0f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "aa122d60.47dec8",\r
+    "id": "815df3f1.7eb0f",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4128.566665649414,\r
-    "y": 4149,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4172.566665649414,\r
+    "y": 4148.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "bc496cc4.1ac428"\r
+        "67264e9c.83602"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bc496cc4.1ac428",\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": 4460.566665649414,\r
-    "y": 4147,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4504.566665649414,\r
+    "y": 4146.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "e008f489.a45f08",\r
+    "id": "dbd95dbb.cf097",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3795.566665649414,\r
-    "y": 4378,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3839.566665649414,\r
+    "y": 4377.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "7e1de7f3.95bcb"\r
+        "aef64578.f3199"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7e1de7f3.95bcb",\r
+    "id": "aef64578.f3199",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3975.566665649414,\r
-    "y": 4377,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4019.566665649414,\r
+    "y": 4376.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5cd7b855.2a4ef"\r
+        "9830e38b.25b19"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5cd7b855.2a4ef",\r
+    "id": "9830e38b.25b19",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4104.566665649414,\r
-    "y": 4377,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4148.566665649414,\r
+    "y": 4376.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "e3d19dba.c0bd7"\r
+        "7d4e5c3a.fc6a0c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e3d19dba.c0bd7",\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": 4322.449966430664,\r
-    "y": 4375.88330078125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4366.449966430664,\r
+    "y": 4375.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "53c7d161.8eb9"\r
+        "1e59b518.b0bee3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "53c7d161.8eb9",\r
+    "id": "1e59b518.b0bee3",\r
     "type": "outcomeTrue",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4537.449966430664,\r
-    "y": 4375.88330078125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4581.449966430664,\r
+    "y": 4375.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "fbe01cc.5b1afe"\r
+        "40af1183.5043e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fbe01cc.5b1afe",\r
+    "id": "40af1183.5043e",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4669.449966430664,\r
-    "y": 4375.88330078125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4713.449966430664,\r
+    "y": 4375.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2bf4a87a.e670f8"\r
+        "9532f45e.79d66"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2bf4a87a.e670f8",\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": 5033.566665649414,\r
-    "y": 4375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5077.566665649414,\r
+    "y": 4374.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1e2222c.7b917dd",\r
+    "id": "147222b6.72d4a5",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3470.566665649414,\r
-    "y": 4633,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3514.566665649414,\r
+    "y": 4632.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "99a3a0e8.0b0e08"\r
+        "adad110b.2a8008"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "99a3a0e8.0b0e08",\r
+    "id": "adad110b.2a8008",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3650.566665649414,\r
-    "y": 4632,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3694.566665649414,\r
+    "y": 4631.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "34a5a7ab.8782f"\r
+        "b9b6357c.7dc958"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "34a5a7ab.8782f",\r
+    "id": "b9b6357c.7dc958",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3779.566665649414,\r
-    "y": 4632,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3823.566665649414,\r
+    "y": 4631.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "41dd40eb.c66e7"\r
+        "883d53e4.0057c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1e73a5a2.1f85da",\r
+    "id": "8f1b73bf.36d998",\r
     "type": "comment",\r
     "name": "Update SECONDARY-ROOT UNI's bw",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3515.566665649414,\r
-    "y": 4691,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3559.566665649414,\r
+    "y": 4690.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d18a7342.6feac8",\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": 4081.566665649414,\r
-    "y": 4790,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4125.566665649414,\r
+    "y": 4789.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "41dd40eb.c66e7",\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": 3545.566665649414,\r
-    "y": 4724,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3589.566665649414,\r
+    "y": 4723.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "f4cc70f5.9b6bc",\r
-        "ce8af9cd.332b9",\r
-        "130dfbc3.4a6c5c"\r
+        "a081e505.7d3b8",\r
+        "370b0cd4.1d67f4",\r
+        "3bb246d3.6b0eb2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ce8af9cd.332b9",\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": 3727.057632446289,\r
-    "y": 4701.57421875,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3771.057632446289,\r
+    "y": 4701.140884399414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "3c80b807.6a4d88"\r
+        "21a39fa9.8cdbc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "130dfbc3.4a6c5c",\r
+    "id": "3bb246d3.6b0eb2",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3715.566665649414,\r
-    "y": 4741,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3759.566665649414,\r
+    "y": 4740.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c80f59b7.c8277"\r
+        "3acf6433.2f683c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3c80b807.6a4d88",\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": 3886.629165649414,\r
-    "y": 4699.85986328125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3930.629165649414,\r
+    "y": 4699.426528930664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c80f59b7.c8277",\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": 3876.566665649414,\r
-    "y": 4742,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3920.566665649414,\r
+    "y": 4741.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "96ee8bec.e5c4a8",\r
+    "id": "c435208e.fb61a8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3878.566665649414,\r
-    "y": 4786,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3922.566665649414,\r
+    "y": 4785.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "60b9b66c.eef658",\r
-        "d18a7342.6feac8"\r
+        "6438caae.bf37d4",\r
+        "f9162d4b.d76cb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f4cc70f5.9b6bc",\r
+    "id": "a081e505.7d3b8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3720.566665649414,\r
-    "y": 4778,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3764.566665649414,\r
+    "y": 4777.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "96ee8bec.e5c4a8"\r
+        "c435208e.fb61a8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "60b9b66c.eef658",\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": 4039.566665649414,\r
-    "y": 4718,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4083.566665649414,\r
+    "y": 4717.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "eedd5a70.956fd8",\r
+    "id": "3f5c519e.52fcfe",\r
     "type": "comment",\r
     "name": "populate connectivity-C variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4405.566665649414,\r
-    "y": 5286,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4449.566665649414,\r
+    "y": 5285.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "76d94500.85b34c",\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": 4560.566665649414,\r
-    "y": 5327,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4604.566665649414,\r
+    "y": 5326.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5f94b51d.236064",\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": 5003.566665649414,\r
-    "y": 5375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5047.566665649414,\r
+    "y": 5374.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "66bf889f.a4f118",\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": 4376.566665649414,\r
-    "y": 5385,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4420.566665649414,\r
+    "y": 5384.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "b509f4ce.23c808",\r
-        "425be1a9.ccccd8"\r
+        "6c93874b.ea46a8",\r
+        "a48ce649.08b9f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b509f4ce.23c808",\r
+    "id": "6c93874b.ea46a8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4612.566665649414,\r
-    "y": 5369,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4656.566665649414,\r
+    "y": 5368.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1cce9d9d.44252a"\r
+        "2bac874c.98bee"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1cce9d9d.44252a",\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": 4756.566665649414,\r
-    "y": 5371,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4800.566665649414,\r
+    "y": 5370.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "5f94b51d.236064",\r
-        "efe8a2f7.303938",\r
-        "b992a481.10f3f"\r
+        "ef90095c.80a978",\r
+        "900ede93.5cfd68",\r
+        "c9e4ee74.f1da1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "425be1a9.ccccd8",\r
+    "id": "a48ce649.08b9f8",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4611.566665649414,\r
-    "y": 5417,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4655.566665649414,\r
+    "y": 5416.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "efe8a2f7.303938",\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": 5124.566665649414,\r
-    "y": 5422,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5168.566665649414,\r
+    "y": 5421.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "b992a481.10f3f",\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": 5006.233657836914,\r
-    "y": 5507.08349609375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5050.233657836914,\r
+    "y": 5506.650161743164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "3dbfccd3.2b6904",\r
+    "id": "80a5d0bc.394668",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5007.450454711914,\r
-    "y": 5465.88330078125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5051.450454711914,\r
+    "y": 5465.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c4e3627c.f5b198",\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": 5538.566665649414,\r
-    "y": 5854,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5582.566665649414,\r
+    "y": 5853.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "316a2790.87ce5",\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": 4911.566665649414,\r
-    "y": 5864,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4955.566665649414,\r
+    "y": 5863.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "2b91cb0d.4b878c",\r
-        "b9e860d6.0863a"\r
+        "c8852cc.de0315",\r
+        "d3e42d04.fd0a28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2b91cb0d.4b878c",\r
+    "id": "c8852cc.de0315",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5144.566665649414,\r
-    "y": 5858,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5188.566665649414,\r
+    "y": 5857.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "617327bf.d18368"\r
+        "3860ec82.4027f4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "617327bf.d18368",\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": 5291.566665649414,\r
-    "y": 5866,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5335.566665649414,\r
+    "y": 5865.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "c4e3627c.f5b198",\r
-        "7767e038.8b5bf",\r
-        "5189b1c7.a8726"\r
+        "7af1ce17.a2c558",\r
+        "cf788720.b865d8",\r
+        "78c6b3da.3a0f94"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b9e860d6.0863a",\r
+    "id": "d3e42d04.fd0a28",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5145.566665649414,\r
-    "y": 5908,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5189.566665649414,\r
+    "y": 5907.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7767e038.8b5bf",\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": 5659.566665649414,\r
-    "y": 5901,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5703.566665649414,\r
+    "y": 5900.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "5189b1c7.a8726",\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": 5541.233657836914,\r
-    "y": 5986.08349609375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5585.233657836914,\r
+    "y": 5985.650161743164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "be3f8000.1758f8",\r
+    "id": "187aa522.975483",\r
     "type": "comment",\r
     "name": "Update connectivity status to modified",\r
     "info": "",\r
     "comments": "",\r
-    "x": 5542.450454711914,\r
-    "y": 5944.88330078125,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5586.450454711914,\r
+    "y": 5944.449966430664,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "5021b590.5d75e4",\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": 5072.566665649414,\r
-    "y": 5814,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 5116.566665649414,\r
+    "y": 5813.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "92959871.fa0e08",\r
+    "id": "1eb398cf.3d4a57",\r
     "type": "comment",\r
     "name": "populate connectivity-C variable in the context map",\r
     "info": "",\r
     "comments": "",\r
-    "x": 4906.566665649414,\r
-    "y": 5775,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4950.566665649414,\r
+    "y": 5774.566665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": []\r
   },\r
   {\r
-    "id": "899de386.880988",\r
+    "id": "629500a0.f350c",\r
     "type": "switchNode",\r
     "name": "switch $hasSecondary",\r
     "xml": "<switch test='`$hasSecondary`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3233.816665649414,\r
-    "y": 6384.25,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3277.816665649414,\r
+    "y": 6383.816665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1f7a42c6.29cf15",\r
-        "5608d8df.18871"\r
+        "9cad2425.bfa4",\r
+        "5e118a1d.622834"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1f7a42c6.29cf15",\r
+    "id": "9cad2425.bfa4",\r
     "type": "outcomeTrue",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3424.816665649414,\r
-    "y": 6388.25,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3468.816665649414,\r
+    "y": 6387.816665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "d6990f3f.a131a8"\r
+        "eaa9d7ab.22184"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d6990f3f.a131a8",\r
+    "id": "eaa9d7ab.22184",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3551.816665649414,\r
-    "y": 6387.25,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3595.816665649414,\r
+    "y": 6386.816665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "1cb779c6.3641ce"\r
+        "517fe5d1.d6143c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5608d8df.18871",\r
+    "id": "5e118a1d.622834",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3420.816665649414,\r
-    "y": 6458.25,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3464.816665649414,\r
+    "y": 6457.816665649414,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "9d5d9d30.3fbe28"\r
+        "3146887c.847d98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "60292317.f03774",\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": 3970.316665649414,\r
-    "y": 6457.33349609375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 4014.316665649414,\r
+    "y": 6456.900161743164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "9d5d9d30.3fbe28",\r
+    "id": "3146887c.847d98",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3554.316665649414,\r
-    "y": 6460.33349609375,\r
-    "z": "8bc654d2.f0dde",\r
+    "x": 3598.316665649414,\r
+    "y": 6459.900161743164,\r
+    "z": "c7b9cd35.bfac88",\r
     "wires": [\r
       [\r
-        "60292317.f03774"\r
+        "9e160da7.86044"\r
       ]\r
     ]\r
   }\r