X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json;h=f834a97350661ff85d485589afb174d3800a3dbc;hb=645b21298c9a4aff5f3f625eabb586fff40db732;hp=2fc491a793717fb8899d990d20fac74468e3459e;hpb=a6c6776d93ee0ec6bd8aefa23ac107262cf93154;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
index 2fc491a7..f834a973 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "934a37b5.570538",
+    "id": "760c3032.024ec8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 132.56666564941406,
-    "y": 130,
-    "z": "8bc654d2.f0dde",
+    "x": 176.56666564941406,
+    "y": 129.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "56cf7e3f.c20408"
+        "5c65c97e.4fcce"
       ]
     ]
   },
   {
-    "id": "56cf7e3f.c20408",
+    "id": "5c65c97e.4fcce",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,7886 +22,7886 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 416.85235595703125,
-    "y": 191.23810863494873,
-    "z": "8bc654d2.f0dde",
+    "x": 460.85235595703125,
+    "y": 190.8047742843628,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9d6f7a83.dd2e58"
+        "f52e4a2.8e9b7b8"
       ]
     ]
   },
   {
-    "id": "9d6f7a83.dd2e58",
+    "id": "f52e4a2.8e9b7b8",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-create-clean",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-create-clean' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 422.9952697753906,
-    "y": 276.0000305175781,
-    "z": "8bc654d2.f0dde",
+    "x": 466.9952697753906,
+    "y": 275.5666961669922,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "69ada9d9.f9e3c"
+        "f52145b6.00f26"
       ]
     ]
   },
   {
-    "id": "69ada9d9.f9e3c",
+    "id": "f52145b6.00f26",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 772.5666656494141,
-    "y": 335,
-    "z": "8bc654d2.f0dde",
+    "x": 816.5666656494141,
+    "y": 334.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8dd82f3b.b9fa5",
-        "304cbf07.b12f58",
-        "1a3f65b2.521b1a"
+        "b781570d.1bdc6",
+        "a3b9d436.7cd37",
+        "916ad2e4.da3bd"
       ]
     ]
   },
   {
-    "id": "8dd82f3b.b9fa5",
+    "id": "b781570d.1bdc6",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 1073.900161743164,
-    "y": 605.9302978515625,
-    "z": "8bc654d2.f0dde",
+    "x": 1117.900161743164,
+    "y": 605.4969635009766,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "304cbf07.b12f58",
+    "id": "a3b9d436.7cd37",
     "type": "save",
     "name": "get service-instance from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
     "comments": "",
     "outputs": 1,
-    "x": 1095.328628540039,
-    "y": 308.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1139.328628540039,
+    "y": 307.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c42506f9.b054",
-        "15d85509.bac5fb",
-        "c693218f.780828"
+        "a44b76d8.232f78",
+        "2fc87770.5a98b8",
+        "d48f40d3.37656"
       ]
     ]
   },
   {
-    "id": "c42506f9.b054",
+    "id": "a44b76d8.232f78",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1320.328628540039,
-    "y": 166.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1364.328628540039,
+    "y": 165.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c432fa86.b14b18"
+        "a9f7ac5b.dc2e28"
       ]
     ]
   },
   {
-    "id": "15d85509.bac5fb",
+    "id": "2fc87770.5a98b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1315.819595336914,
-    "y": 235.9073486328125,
-    "z": "8bc654d2.f0dde",
+    "x": 1359.819595336914,
+    "y": 235.47401428222656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c16eebd5.51383"
+        "87351fcb.5849e"
       ]
     ]
   },
   {
-    "id": "c693218f.780828",
+    "id": "d48f40d3.37656",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1304.328628540039,
-    "y": 282.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1348.328628540039,
+    "y": 281.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3a0cbeb0.e80882"
+        "81b461.b8b3eba"
       ]
     ]
   },
   {
-    "id": "2b8d35c8.ebc05a",
+    "id": "ed4dfd16.f55a8",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1074.328628540039,
-    "y": 196.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1118.328628540039,
+    "y": 195.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1a3f65b2.521b1a",
+    "id": "916ad2e4.da3bd",
     "type": "execute",
     "name": "execute properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
     "comments": "",
     "outputs": 1,
-    "x": 1062.328628540039,
-    "y": 248.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1106.328628540039,
+    "y": 247.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c432fa86.b14b18",
+    "id": "a9f7ac5b.dc2e28",
     "type": "switchNode",
     "name": "switch allotted-resources_length != 0",
     "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1560.566665649414,
-    "y": 163,
-    "z": "8bc654d2.f0dde",
+    "x": 1604.566665649414,
+    "y": 162.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1d921b54.6d01cd",
-        "4b7292d8.462d44"
+        "9413aaeb.d092f",
+        "4243f2e3.377954"
       ]
     ]
   },
   {
-    "id": "c16eebd5.51383",
+    "id": "87351fcb.5849e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 1470.6290435791016,
-    "y": 238.85977172851562,
-    "z": "8bc654d2.f0dde",
+    "x": 1514.6290435791016,
+    "y": 238.4264373779297,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3a0cbeb0.e80882",
+    "id": "81b461.b8b3eba",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1474.566665649414,
-    "y": 283,
-    "z": "8bc654d2.f0dde",
+    "x": 1518.566665649414,
+    "y": 282.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1d921b54.6d01cd",
+    "id": "9413aaeb.d092f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1765.566665649414,
-    "y": 200,
-    "z": "8bc654d2.f0dde",
+    "x": 1809.566665649414,
+    "y": 199.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e73b29c9.cbd5e8"
+        "41ee935e.7af694"
       ]
     ]
   },
   {
-    "id": "4b7292d8.462d44",
+    "id": "4243f2e3.377954",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1775.566665649414,
-    "y": 127,
-    "z": "8bc654d2.f0dde",
+    "x": 1819.566665649414,
+    "y": 126.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e73b29c9.cbd5e8",
+    "id": "41ee935e.7af694",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1758.566665649414,
-    "y": 275,
-    "z": "8bc654d2.f0dde",
+    "x": 1802.566665649414,
+    "y": 274.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d6fcbbd7.6468b8",
-        "8f5c7a9a.326598",
-        "cd48af2d.929d6",
-        "528e88db.403fc",
-        "899de386.880988"
+        "48c9f8b7.accfc",
+        "4b70868c.ca77",
+        "33568fb6.bac76",
+        "ed1c5832.299138",
+        "629500a0.f350c"
       ]
     ]
   },
   {
-    "id": "1f336392.1dac3c",
+    "id": "911385ff.dcfb6",
     "type": "save",
     "name": "get allotted-resource from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2244.566665649414,
-    "y": 326,
-    "z": "8bc654d2.f0dde",
+    "x": 2288.566665649414,
+    "y": 325.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "923c23f1.638a98",
-        "ba451af8.67c9c8",
-        "2ed7be49.0a7032"
+        "7bf84f8a.19dac",
+        "e93a24fd.89bb98",
+        "b3019feb.2307b"
       ]
     ]
   },
   {
-    "id": "923c23f1.638a98",
+    "id": "7bf84f8a.19dac",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2460.566665649414,
-    "y": 393,
-    "z": "8bc654d2.f0dde",
+    "x": 2504.566665649414,
+    "y": 392.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c090e3a4.ec2058"
+        "28ff285d.675018"
       ]
     ]
   },
   {
-    "id": "ba451af8.67c9c8",
+    "id": "e93a24fd.89bb98",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2461.057632446289,
-    "y": 292.573974609375,
-    "z": "8bc654d2.f0dde",
+    "x": 2505.057632446289,
+    "y": 292.14064025878906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4c29ba0c.292a6c"
+        "4ef0e01e.f3cdf"
       ]
     ]
   },
   {
-    "id": "2ed7be49.0a7032",
+    "id": "b3019feb.2307b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2456.566665649414,
-    "y": 342,
-    "z": "8bc654d2.f0dde",
+    "x": 2500.566665649414,
+    "y": 341.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f2cd659.3fc4898"
+        "2913a1dc.ae6786"
       ]
     ]
   },
   {
-    "id": "d6fcbbd7.6468b8",
+    "id": "48c9f8b7.accfc",
     "type": "for",
     "name": "for each allotted-resource",
     "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1961.566665649414,
-    "y": 307,
-    "z": "8bc654d2.f0dde",
+    "x": 2005.566665649414,
+    "y": 306.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "419d8708.3b9078",
-        "1f336392.1dac3c",
-        "90827cac.7f3cc8",
-        "e557ce2.09f823"
+        "8b66b4b0.d208d8",
+        "911385ff.dcfb6",
+        "79257077.5f1ff8",
+        "8a55fb57.dfc438"
       ]
     ]
   },
   {
-    "id": "419d8708.3b9078",
+    "id": "8b66b4b0.d208d8",
     "type": "set",
     "name": "set the current allotted-resource-id",
     "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
     "comments": "",
-    "x": 2241.566665649414,
-    "y": 245,
-    "z": "8bc654d2.f0dde",
+    "x": 2285.566665649414,
+    "y": 244.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "528e88db.403fc",
+    "id": "ed1c5832.299138",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
     "comments": "",
-    "x": 1935.566665649414,
-    "y": 257,
-    "z": "8bc654d2.f0dde",
+    "x": 1979.566665649414,
+    "y": 256.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8f5c7a9a.326598",
+    "id": "4b70868c.ca77",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1978.566665649414,
-    "y": 116,
-    "z": "8bc654d2.f0dde",
+    "x": 2022.566665649414,
+    "y": 115.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "cd48af2d.929d6",
+    "id": "33568fb6.bac76",
     "type": "get-resource",
     "name": "get-resource logical-links",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1990.566665649414,
-    "y": 157,
-    "z": "8bc654d2.f0dde",
+    "x": 2034.566665649414,
+    "y": 156.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "73efca11.a03e0c",
+    "id": "2a477cee.98364c",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2015.566665649414,
-    "y": 69,
-    "z": "8bc654d2.f0dde",
+    "x": 2059.566665649414,
+    "y": 68.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "19fb453a.d497cb",
+    "id": "11e969ea.04e966",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
     "comments": "",
-    "x": 1935.566665649414,
-    "y": 203,
-    "z": "8bc654d2.f0dde",
+    "x": 1979.566665649414,
+    "y": 202.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4c29ba0c.292a6c",
+    "id": "4ef0e01e.f3cdf",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 2639.566665649414,
-    "y": 295,
-    "z": "8bc654d2.f0dde",
+    "x": 2683.566665649414,
+    "y": 294.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f2cd659.3fc4898",
+    "id": "2913a1dc.ae6786",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2639.504165649414,
-    "y": 344.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 2683.504165649414,
+    "y": 343.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c090e3a4.ec2058",
+    "id": "28ff285d.675018",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2641.504165649414,
-    "y": 395.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 2685.504165649414,
+    "y": 394.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "383f413.f1d10be"
+        "ef99d74f.4057d"
       ]
     ]
   },
   {
-    "id": "383f413.f1d10be",
+    "id": "ef99d74f.4057d",
     "type": "save",
     "name": "get allotted-resource relationship from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2934.504165649414,
-    "y": 342.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 2978.504165649414,
+    "y": 341.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7f2204ba.ff0eac",
-        "6593ad3c.c3a94c",
-        "91d5dd73.0552a8"
+        "e456d5f.a155828",
+        "7848fc63.19f06c",
+        "64a94fba.40e7a"
       ]
     ]
   },
   {
-    "id": "6593ad3c.c3a94c",
+    "id": "7848fc63.19f06c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3237.995101928711,
-    "y": 74.7142333984375,
-    "z": "8bc654d2.f0dde",
+    "x": 3281.995101928711,
+    "y": 74.28089904785156,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "578e5a01.301d74"
+        "afcd1c40.b768f"
       ]
     ]
   },
   {
-    "id": "578e5a01.301d74",
+    "id": "afcd1c40.b768f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3415.566635131836,
-    "y": 75,
-    "z": "8bc654d2.f0dde",
+    "x": 3459.566635131836,
+    "y": 74.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "91d5dd73.0552a8",
+    "id": "64a94fba.40e7a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3233.504135131836,
-    "y": 124.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3277.504135131836,
+    "y": 123.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3a340bd0.83bde4"
+        "9649b9cd.238c78"
       ]
     ]
   },
   {
-    "id": "3a340bd0.83bde4",
+    "id": "9649b9cd.238c78",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3415.504135131836,
-    "y": 124.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3459.504135131836,
+    "y": 123.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7f2204ba.ff0eac",
+    "id": "e456d5f.a155828",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3237.504135131836,
-    "y": 175.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3281.504135131836,
+    "y": 174.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5f6b46f2.1bbc28"
+        "8fd753ef.f9f648"
       ]
     ]
   },
   {
-    "id": "5f6b46f2.1bbc28",
+    "id": "8fd753ef.f9f648",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3417.504135131836,
-    "y": 175.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3461.504135131836,
+    "y": 174.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "432203ff.80791c"
+        "f37cd8dc.622f28"
       ]
     ]
   },
   {
-    "id": "432203ff.80791c",
+    "id": "f37cd8dc.622f28",
     "type": "switchNode",
     "name": "switch allotted-resource.relationship-list not empty",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2953.566665649414,
-    "y": 470,
-    "z": "8bc654d2.f0dde",
+    "x": 2997.566665649414,
+    "y": 469.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "25bf5884.d1bc1",
-        "68d7ca3f.b9c4a4"
+        "d8de60b.2b55ea",
+        "6b2e15a0.33589c"
       ]
     ]
   },
   {
-    "id": "68d7ca3f.b9c4a4",
+    "id": "6b2e15a0.33589c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3293.566635131836,
-    "y": 317,
-    "z": "8bc654d2.f0dde",
+    "x": 3337.566635131836,
+    "y": 316.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "25bf5884.d1bc1",
+    "id": "d8de60b.2b55ea",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3292.566635131836,
-    "y": 371,
-    "z": "8bc654d2.f0dde",
+    "x": 3336.566635131836,
+    "y": 370.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a4256717.8bdab"
+        "41425976.6167f8"
       ]
     ]
   },
   {
-    "id": "dc3dd60e.e6fb58",
+    "id": "d54e5594.aff43",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4037.566635131836,
-    "y": 325,
-    "z": "8bc654d2.f0dde",
+    "x": 4081.566635131836,
+    "y": 324.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7a99d9c1.cc807"
+        "20569ac4.3ebdd6"
       ]
     ]
   },
   {
-    "id": "7a99d9c1.cc807",
+    "id": "20569ac4.3ebdd6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4214.566513061523,
-    "y": 317.9998779296875,
-    "z": "8bc654d2.f0dde",
+    "x": 4258.566513061523,
+    "y": 317.56654357910156,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "54329230.9376a4",
-        "e44ffd73.3caae8"
+        "f7578f2.98aaff",
+        "fec27249.f43818"
       ]
     ]
   },
   {
-    "id": "a4256717.8bdab",
+    "id": "41425976.6167f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3456.566635131836,
-    "y": 297,
-    "z": "8bc654d2.f0dde",
+    "x": 3500.566635131836,
+    "y": 296.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ab8d2f4.fb7de5",
-        "6cd92abd.ea602c"
+        "bf1caed6.dba4d",
+        "7892547.06584ac"
       ]
     ]
   },
   {
-    "id": "ab8d2f4.fb7de5",
+    "id": "bf1caed6.dba4d",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3737.566635131836,
-    "y": 253,
-    "z": "8bc654d2.f0dde",
+    "x": 3781.566635131836,
+    "y": 252.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d2f6d2c1.0cd0b8"
+        "37857fb8.f82a48"
       ]
     ]
   },
   {
-    "id": "d2f6d2c1.0cd0b8",
+    "id": "37857fb8.f82a48",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3999.566635131836,
-    "y": 253,
-    "z": "8bc654d2.f0dde",
+    "x": 4043.566635131836,
+    "y": 252.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dc3dd60e.e6fb58"
+        "d54e5594.aff43"
       ]
     ]
   },
   {
-    "id": "54329230.9376a4",
+    "id": "f7578f2.98aaff",
     "type": "set",
     "name": "set the 1st network-policy-id",
     "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 4457.566513061523,
-    "y": 274.9998779296875,
-    "z": "8bc654d2.f0dde",
+    "x": 4501.566513061523,
+    "y": 274.56654357910156,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e44ffd73.3caae8",
+    "id": "fec27249.f43818",
     "type": "save",
     "name": "get network-policy from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
     "comments": "",
     "outputs": 1,
-    "x": 4446.566513061523,
-    "y": 329.9998779296875,
-    "z": "8bc654d2.f0dde",
+    "x": 4490.566513061523,
+    "y": 329.56654357910156,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9db3143c.c20748",
-        "3f90e90d.8c4416",
-        "767c00f3.c60f18"
+        "7d11439b.9c402c",
+        "1159889c.e4b977",
+        "672fe755.7cac68"
       ]
     ]
   },
   {
-    "id": "767c00f3.c60f18",
+    "id": "672fe755.7cac68",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4697.566879272461,
-    "y": 271,
-    "z": "8bc654d2.f0dde",
+    "x": 4741.566879272461,
+    "y": 270.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "eb2a7a65.4a99c"
+        "8e6a85a9.42bd58"
       ]
     ]
   },
   {
-    "id": "eb2a7a65.4a99c",
+    "id": "8e6a85a9.42bd58",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4846.138412475586,
-    "y": 271.2857666015625,
-    "z": "8bc654d2.f0dde",
+    "x": 4890.138412475586,
+    "y": 270.85243225097656,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1d4fa709.d3c2b1",
+    "id": "d22f2789.6a3cb",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4845.075912475586,
-    "y": 315.426025390625,
-    "z": "8bc654d2.f0dde",
+    "x": 4889.075912475586,
+    "y": 314.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3f90e90d.8c4416",
+    "id": "1159889c.e4b977",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4686.075912475586,
-    "y": 315.426025390625,
-    "z": "8bc654d2.f0dde",
+    "x": 4730.075912475586,
+    "y": 314.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1d4fa709.d3c2b1"
+        "d22f2789.6a3cb"
       ]
     ]
   },
   {
-    "id": "9db3143c.c20748",
+    "id": "7d11439b.9c402c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4693.075912475586,
-    "y": 394.426025390625,
-    "z": "8bc654d2.f0dde",
+    "x": 4737.075912475586,
+    "y": 393.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d725abd1.c0b928"
+        "1927fc16.6351c4"
       ]
     ]
   },
   {
-    "id": "d725abd1.c0b928",
+    "id": "1927fc16.6351c4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4832.075912475586,
-    "y": 394.426025390625,
-    "z": "8bc654d2.f0dde",
+    "x": 4876.075912475586,
+    "y": 393.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "561b0f6d.fce1f8",
-        "8702a1ee.cea5e8"
+        "4ec1a8d7.67b3c8",
+        "4af48fa4.c20fa"
       ]
     ]
   },
   {
-    "id": "561b0f6d.fce1f8",
+    "id": "4ec1a8d7.67b3c8",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5037.566879272461,
-    "y": 392,
-    "z": "8bc654d2.f0dde",
+    "x": 5081.566879272461,
+    "y": 391.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8702a1ee.cea5e8",
+    "id": "4af48fa4.c20fa",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5036.566879272461,
-    "y": 438,
-    "z": "8bc654d2.f0dde",
+    "x": 5080.566879272461,
+    "y": 437.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6cd92abd.ea602c",
+    "id": "7892547.06584ac",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3554.566635131836,
-    "y": 369,
-    "z": "8bc654d2.f0dde",
+    "x": 3598.566635131836,
+    "y": 368.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dd91e386.997658"
+        "ea9b4d5b.2a42f8"
       ]
     ]
   },
   {
-    "id": "dd91e386.997658",
+    "id": "ea9b4d5b.2a42f8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3834.566635131836,
-    "y": 369,
-    "z": "8bc654d2.f0dde",
+    "x": 3878.566635131836,
+    "y": 368.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d0b5ecff.91d928"
+        "476ea684.13443"
       ]
     ]
   },
   {
-    "id": "d0b5ecff.91d928",
+    "id": "476ea684.13443",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2217.5667877197266,
-    "y": 782.0001220703125,
-    "z": "8bc654d2.f0dde",
+    "x": 2261.5667877197266,
+    "y": 781.5667877197266,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3175715f.1727f6"
+        "c7ca0b2.bde93f8"
       ]
     ]
   },
   {
-    "id": "3175715f.1727f6",
+    "id": "c7ca0b2.bde93f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2394.566665649414,
-    "y": 775,
-    "z": "8bc654d2.f0dde",
+    "x": 2438.566665649414,
+    "y": 774.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e36efc83.994d78",
-        "41c74306.d5cc9c"
+        "86b11ccc.07eb1",
+        "5c684ea4.22866"
       ]
     ]
   },
   {
-    "id": "e36efc83.994d78",
+    "id": "86b11ccc.07eb1",
     "type": "set",
     "name": "set the current logical-link-name",
     "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 2637.566665649414,
-    "y": 732,
-    "z": "8bc654d2.f0dde",
+    "x": 2681.566665649414,
+    "y": 731.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "41c74306.d5cc9c",
+    "id": "5c684ea4.22866",
     "type": "save",
     "name": "get logical-link from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
     "comments": "",
     "outputs": 1,
-    "x": 2626.566665649414,
-    "y": 787,
-    "z": "8bc654d2.f0dde",
+    "x": 2670.566665649414,
+    "y": 786.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9d68f10f.bd8b8",
-        "dffb55fa.85b55",
-        "c53e6e84.05ac9"
+        "2c2754a5.0b7c2c",
+        "9ab044d8.9332",
+        "6aa476a7.c1db08"
       ]
     ]
   },
   {
-    "id": "9d68f10f.bd8b8",
+    "id": "2c2754a5.0b7c2c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2918.057632446289,
-    "y": 765.573974609375,
-    "z": "8bc654d2.f0dde",
+    "x": 2962.057632446289,
+    "y": 765.1406402587891,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b9d2eb35.931cc8"
+        "606104a3.7d17dc"
       ]
     ]
   },
   {
-    "id": "dffb55fa.85b55",
+    "id": "9ab044d8.9332",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2906.566665649414,
-    "y": 810,
-    "z": "8bc654d2.f0dde",
+    "x": 2950.566665649414,
+    "y": 809.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e6924452.e6205"
+        "187a718c.4bcdf6"
       ]
     ]
   },
   {
-    "id": "b9d2eb35.931cc8",
+    "id": "606104a3.7d17dc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3066.629165649414,
-    "y": 765.8597412109375,
-    "z": "8bc654d2.f0dde",
+    "x": 3110.629165649414,
+    "y": 765.4264068603516,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e6924452.e6205",
+    "id": "187a718c.4bcdf6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3065.566665649414,
-    "y": 810,
-    "z": "8bc654d2.f0dde",
+    "x": 3109.566665649414,
+    "y": 809.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c53e6e84.05ac9",
+    "id": "6aa476a7.c1db08",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2913.566665649414,
-    "y": 889,
-    "z": "8bc654d2.f0dde",
+    "x": 2957.566665649414,
+    "y": 888.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "361f88a3.058c08"
+        "9fd32ca0.d84048"
       ]
     ]
   },
   {
-    "id": "361f88a3.058c08",
+    "id": "9fd32ca0.d84048",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3052.566665649414,
-    "y": 889,
-    "z": "8bc654d2.f0dde",
+    "x": 3096.566665649414,
+    "y": 888.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "936c7f50.057838",
-        "fff97b6b.1650f8",
-        "40c59221.de8304",
-        "da2087d.3780d78",
-        "db5a893f.6acb2",
-        "855375ef.856b78",
-        "bd585daa.5b0d3",
-        "d3754757.4f2538",
-        "dd28e890.6f37f",
-        "10147ab3.fed6fd",
-        "425867c4.b0a9",
-        "e3e1a44c.9927b8",
-        "4a62d4e.fca9aac",
-        "2ae40328.466974",
-        "f71bee39.3d2f68",
-        "6cb3b80a.d81b1",
-        "7411f30.15b1c8c",
-        "59ced5c4.1cbb54",
-        "b2338e3d.f752e8",
-        "8b07e19d.5f94",
-        "877b276.88c73d8"
+        "7a7db7d4.95d8d",
+        "95e88e5b.59dc68",
+        "ccbad682.f9f6e",
+        "51c5f691.62046",
+        "c524ae07.05ca4",
+        "573995f0.c3e824",
+        "40c97410.34efdc",
+        "3ceacdf9.dad772",
+        "37ff3aef.9a54ee",
+        "a62852b2.29136",
+        "e4c9b14e.e493e",
+        "a5e91f89.51e28",
+        "6a1545ce.c6f074",
+        "fcc163b9.6d6e2",
+        "c9e93381.966988",
+        "5fc9799.82ba788",
+        "7ebd6769.0b5428",
+        "9fbb56ee.c43378",
+        "387e5bde.fd50e4",
+        "a78822a6.5321b",
+        "a4c94b0b.1b4718"
       ]
     ]
   },
   {
-    "id": "b5bad4b9.685ad8",
+    "id": "8a5fb9f9.eee92",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3401.566665649414,
-    "y": 422.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3445.566665649414,
+    "y": 422.56663513183594,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "936c7f50.057838",
+    "id": "7a7db7d4.95d8d",
     "type": "execute",
     "name": "execute UUID generator for otn-tunnel-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3382.566604614258,
-    "y": 501.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3426.566604614258,
+    "y": 501.56663513183594,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "2ae40328.466974",
+    "id": "fcc163b9.6d6e2",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 3339.566604614258,
-    "y": 546.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3383.566604614258,
+    "y": 546.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fff97b6b.1650f8",
+    "id": "95e88e5b.59dc68",
     "type": "set",
     "name": "set network-route-one",
     "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
     "comments": "",
-    "x": 3304.566635131836,
-    "y": 600.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3348.566635131836,
+    "y": 600.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "40c59221.de8304",
+    "id": "ccbad682.f9f6e",
     "type": "set",
     "name": "set network-route-two",
     "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
     "comments": "",
-    "x": 3305.566635131836,
-    "y": 655.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3349.566635131836,
+    "y": 655.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "da2087d.3780d78",
+    "id": "51c5f691.62046",
     "type": "save",
     "name": "get network-route-one from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
     "comments": "",
     "outputs": 1,
-    "x": 3303.566635131836,
-    "y": 919.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3347.566635131836,
+    "y": 919.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "969278b.6dcd308",
-        "8ef50320.33a2f",
-        "bc9f501b.616458"
+        "ab7d525c.39024",
+        "e9514e17.b4663",
+        "e95aa54a.0cb1c8"
       ]
     ]
   },
   {
-    "id": "db5a893f.6acb2",
+    "id": "c524ae07.05ca4",
     "type": "save",
     "name": "get network-route-two from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
     "comments": "",
     "outputs": 1,
-    "x": 3298.566635131836,
-    "y": 980.9998474121094,
-    "z": "8bc654d2.f0dde",
+    "x": 3342.566635131836,
+    "y": 980.5665130615234,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3f6dc76b.2c189",
-        "8fe533b.8ccffd",
-        "17823dcb.715f8a"
+        "ba38cd77.3ddd8",
+        "3fe85825.5036d",
+        "4b77c928.b0503"
       ]
     ]
   },
   {
-    "id": "969278b.6dcd308",
+    "id": "ab7d525c.39024",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3614.566635131836,
-    "y": 690.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3658.566635131836,
+    "y": 690.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9ca5fa1b.024df8"
+        "a41dfa2.144c608"
       ]
     ]
   },
   {
-    "id": "8ef50320.33a2f",
+    "id": "e9514e17.b4663",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3610.075668334961,
-    "y": 740.4259948730469,
-    "z": "8bc654d2.f0dde",
+    "x": 3654.075668334961,
+    "y": 739.9926605224609,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e39d355.b4f33c8"
+        "88fea61b.80803"
       ]
     ]
   },
   {
-    "id": "bc9f501b.616458",
+    "id": "e95aa54a.0cb1c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3614.075668334961,
-    "y": 793.4259948730469,
-    "z": "8bc654d2.f0dde",
+    "x": 3658.075668334961,
+    "y": 792.9926605224609,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e84899ba.db50e8"
+        "5f495b77.8e475c"
       ]
     ]
   },
   {
-    "id": "9ca5fa1b.024df8",
+    "id": "a41dfa2.144c608",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3763.138168334961,
-    "y": 690.2857360839844,
-    "z": "8bc654d2.f0dde",
+    "x": 3807.138168334961,
+    "y": 689.8524017333984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e39d355.b4f33c8",
+    "id": "88fea61b.80803",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3753.075668334961,
-    "y": 740.4259948730469,
-    "z": "8bc654d2.f0dde",
+    "x": 3797.075668334961,
+    "y": 739.9926605224609,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3f6dc76b.2c189",
+    "id": "ba38cd77.3ddd8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3576.566604614258,
-    "y": 880.9998168945312,
-    "z": "8bc654d2.f0dde",
+    "x": 3620.566604614258,
+    "y": 880.5664825439453,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "62e0b7bc.37a4e"
+        "5d8c160b.0c4ea8"
       ]
     ]
   },
   {
-    "id": "8fe533b.8ccffd",
+    "id": "3fe85825.5036d",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3572.075668334961,
-    "y": 923.4258728027344,
-    "z": "8bc654d2.f0dde",
+    "x": 3616.075668334961,
+    "y": 922.9925384521484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ac864505.12601"
+        "b6433621.de36a"
       ]
     ]
   },
   {
-    "id": "17823dcb.715f8a",
+    "id": "4b77c928.b0503",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3573.075668334961,
-    "y": 976.4258728027344,
-    "z": "8bc654d2.f0dde",
+    "x": 3617.075668334961,
+    "y": 975.9925384521484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bed44813.048dd"
+        "999aafa8.043a8"
       ]
     ]
   },
   {
-    "id": "62e0b7bc.37a4e",
+    "id": "5d8c160b.0c4ea8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3725.138137817383,
-    "y": 880.2855834960938,
-    "z": "8bc654d2.f0dde",
+    "x": 3769.138137817383,
+    "y": 879.8522491455078,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ac864505.12601",
+    "id": "b6433621.de36a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3715.075668334961,
-    "y": 923.4258728027344,
-    "z": "8bc654d2.f0dde",
+    "x": 3759.075668334961,
+    "y": 922.9925384521484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e84899ba.db50e8",
+    "id": "5f495b77.8e475c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3775.566635131836,
-    "y": 792.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3819.566635131836,
+    "y": 792.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f9db2337.8fb9d"
+        "f4d50ce3.687d98"
       ]
     ]
   },
   {
-    "id": "bed44813.048dd",
+    "id": "999aafa8.043a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3726.566635131836,
-    "y": 975.9998474121094,
-    "z": "8bc654d2.f0dde",
+    "x": 3770.566635131836,
+    "y": 975.5665130615234,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "423a02cf.14e434"
+        "6c0d4a32.4f3524"
       ]
     ]
   },
   {
-    "id": "f9db2337.8fb9d",
+    "id": "f4d50ce3.687d98",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3950.566635131836,
-    "y": 766.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3994.566635131836,
+    "y": 766.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2c035f93.775ae8",
-        "a1971f98.6ccb48",
-        "dd62b4eb.26fb1"
+        "e8eddbb7.6cfbd",
+        "54846c0d.33a74c",
+        "b03ebc69.8e68d8"
       ]
     ]
   },
   {
-    "id": "423a02cf.14e434",
+    "id": "6c0d4a32.4f3524",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3910.566635131836,
-    "y": 883.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3954.566635131836,
+    "y": 883.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9f546ca0.9d33e8",
-        "2ec96d4e.1ca132",
-        "cb966d3f.bcf358"
+        "4f37a3d1.2e362c",
+        "efd815b8.8e6db8",
+        "65095290.735c7c"
       ]
     ]
   },
   {
-    "id": "2c035f93.775ae8",
+    "id": "e8eddbb7.6cfbd",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4072.566635131836,
-    "y": 551.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4116.566635131836,
+    "y": 551.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6429cd23.35e7c4"
+        "c7edad0e.b216"
       ]
     ]
   },
   {
-    "id": "a1971f98.6ccb48",
+    "id": "54846c0d.33a74c",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4074.566635131836,
-    "y": 605.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4118.566635131836,
+    "y": 605.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "17c9fbf5.2a0a34"
+        "d5f61daa.4b4388"
       ]
     ]
   },
   {
-    "id": "9f546ca0.9d33e8",
+    "id": "4f37a3d1.2e362c",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4091.566665649414,
-    "y": 822,
-    "z": "8bc654d2.f0dde",
+    "x": 4135.566665649414,
+    "y": 821.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "22d232ad.fa9d6e"
+        "81e90993.f1d9a8"
       ]
     ]
   },
   {
-    "id": "2ec96d4e.1ca132",
+    "id": "efd815b8.8e6db8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4093.566665649414,
-    "y": 876,
-    "z": "8bc654d2.f0dde",
+    "x": 4137.566665649414,
+    "y": 875.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5c001c7.14606e4"
+        "da2103e1.15169"
       ]
     ]
   },
   {
-    "id": "d98ccbbe.37e04",
+    "id": "f5d37541.2d47c8",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4382.566635131836,
-    "y": 503.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4426.566635131836,
+    "y": 503.56663513183594,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "449eb720.722948",
+    "id": "2bfe954c.51473a",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4375.566635131836,
-    "y": 601.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4419.566635131836,
+    "y": 601.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "83bfbc5.ae6994",
+    "id": "9391f162.46d07",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4393.566665649414,
-    "y": 795,
-    "z": "8bc654d2.f0dde",
+    "x": 4437.566665649414,
+    "y": 794.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5244a859.c728e8",
+    "id": "8da0410.b4be6c",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4397.566665649414,
-    "y": 888,
-    "z": "8bc654d2.f0dde",
+    "x": 4441.566665649414,
+    "y": 887.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6ca3f458.2d99d4",
+    "id": "c685a00a.7f3668",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3540.566665649414,
-    "y": 1560,
-    "z": "8bc654d2.f0dde",
+    "x": 3584.566665649414,
+    "y": 1559.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3eea4372.1c5814"
+        "3e8c64de.c5d6ac"
       ]
     ]
   },
   {
-    "id": "662947db.2b96e8",
+    "id": "c307eb50.c4efc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3550.057632446289,
-    "y": 1602.5740356445312,
-    "z": "8bc654d2.f0dde",
+    "x": 3594.057632446289,
+    "y": 1602.1407012939453,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f28295e0.d2c148"
+        "a457c21e.dc24c"
       ]
     ]
   },
   {
-    "id": "5677884d.d93c78",
+    "id": "fe413554.38fd68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3538.566665649414,
-    "y": 1649,
-    "z": "8bc654d2.f0dde",
+    "x": 3582.566665649414,
+    "y": 1648.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f900f622.22fda"
+        "f7393df4.54a488"
       ]
     ]
   },
   {
-    "id": "eddb7de7.123d5",
+    "id": "940c17a9.af2df",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3240.566665649414,
-    "y": 1522,
-    "z": "8bc654d2.f0dde",
+    "x": 3284.566665649414,
+    "y": 1521.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bd585daa.5b0d3",
+    "id": "40c97410.34efdc",
     "type": "save",
     "name": "get p-interface-src from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3283.566665649414,
-    "y": 1587,
-    "z": "8bc654d2.f0dde",
+    "x": 3327.566665649414,
+    "y": 1586.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6ca3f458.2d99d4",
-        "662947db.2b96e8",
-        "5677884d.d93c78"
+        "c685a00a.7f3668",
+        "c307eb50.c4efc",
+        "fe413554.38fd68"
       ]
     ]
   },
   {
-    "id": "855375ef.856b78",
+    "id": "573995f0.c3e824",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3284.566665649414,
-    "y": 1257,
-    "z": "8bc654d2.f0dde",
+    "x": 3328.566665649414,
+    "y": 1256.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "74d070ad.2d8b38",
-        "f1856675.64f168"
+        "ce053797.967e5",
+        "1d8318a4.118f1f"
       ]
     ]
   },
   {
-    "id": "f1856675.64f168",
+    "id": "1d8318a4.118f1f",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3505.566635131836,
-    "y": 1309.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3549.566635131836,
+    "y": 1309.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "77f0bbcf.b75e0c"
+        "d7acba72.b8d088"
       ]
     ]
   },
   {
-    "id": "74d070ad.2d8b38",
+    "id": "ce053797.967e5",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3507.566635131836,
-    "y": 1342.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3551.566635131836,
+    "y": 1342.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6e268d43.53f934"
+        "b936608f.415c9"
       ]
     ]
   },
   {
-    "id": "3eea4372.1c5814",
+    "id": "3e8c64de.c5d6ac",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3713.233169555664,
-    "y": 1559,
-    "z": "8bc654d2.f0dde",
+    "x": 3757.233169555664,
+    "y": 1558.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f48e6ddf.17618",
-        "cc30c632.26f008"
+        "61a62886.979d9",
+        "69747a1f.4d36a4"
       ]
     ]
   },
   {
-    "id": "f28295e0.d2c148",
+    "id": "a457c21e.dc24c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3703.6290435791016,
-    "y": 1605.8597717285156,
-    "z": "8bc654d2.f0dde",
+    "x": 3747.6290435791016,
+    "y": 1605.4264373779297,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f900f622.22fda",
+    "id": "f7393df4.54a488",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3707.566665649414,
-    "y": 1650,
-    "z": "8bc654d2.f0dde",
+    "x": 3751.566665649414,
+    "y": 1649.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f48e6ddf.17618",
+    "id": "61a62886.979d9",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3977.566665649414,
-    "y": 1543,
-    "z": "8bc654d2.f0dde",
+    "x": 4021.566665649414,
+    "y": 1542.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c31fbd4a.4c152",
-        "ca57bc98.e008f"
+        "d27c3919.e4f1e8",
+        "744ce69a.cd2cd"
       ]
     ]
   },
   {
-    "id": "ca57bc98.e008f",
+    "id": "744ce69a.cd2cd",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4200.566665649414,
-    "y": 1498,
-    "z": "8bc654d2.f0dde",
+    "x": 4244.566665649414,
+    "y": 1497.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ae27226e.c1211"
+        "d24d75df.899958"
       ]
     ]
   },
   {
-    "id": "c31fbd4a.4c152",
+    "id": "d27c3919.e4f1e8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4202.566665649414,
-    "y": 1562,
-    "z": "8bc654d2.f0dde",
+    "x": 4246.566665649414,
+    "y": 1561.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "48b6888c.1688c8"
+        "195cae09.6a270a"
       ]
     ]
   },
   {
-    "id": "48b6888c.1688c8",
+    "id": "195cae09.6a270a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4364.566665649414,
-    "y": 1558,
-    "z": "8bc654d2.f0dde",
+    "x": 4408.566665649414,
+    "y": 1557.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ae27226e.c1211",
+    "id": "d24d75df.899958",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4365.566665649414,
-    "y": 1495,
-    "z": "8bc654d2.f0dde",
+    "x": 4409.566665649414,
+    "y": 1494.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dc9805ea.b1d968",
-        "e17a88a7.3a0c68"
+        "64761578.742944",
+        "545ae19b.2a1238"
       ]
     ]
   },
   {
-    "id": "6e268d43.53f934",
+    "id": "b936608f.415c9",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3650.566635131836,
-    "y": 1339.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3694.566635131836,
+    "y": 1339.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "77f0bbcf.b75e0c",
+    "id": "d7acba72.b8d088",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3653.566635131836,
-    "y": 1302.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3697.566635131836,
+    "y": 1302.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6b41cb54.146c7c",
-        "2227088d.da8978"
+        "66afead4.578fec",
+        "d914a00d.43d42"
       ]
     ]
   },
   {
-    "id": "6b41cb54.146c7c",
+    "id": "66afead4.578fec",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3827.566635131836,
-    "y": 1258.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3871.566635131836,
+    "y": 1258.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cc30c632.26f008",
+    "id": "69747a1f.4d36a4",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3926.566635131836,
-    "y": 1652.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3970.566635131836,
+    "y": 1652.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4c51d8d9.7e50e"
+        "6692ad9d.63a244"
       ]
     ]
   },
   {
-    "id": "4c51d8d9.7e50e",
+    "id": "6692ad9d.63a244",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4132.566635131836,
-    "y": 1652.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4176.566635131836,
+    "y": 1652.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ea6dd5aa.f54cc"
+        "efeaf290.376e48"
       ]
     ]
   },
   {
-    "id": "ea6dd5aa.f54cc",
+    "id": "efeaf290.376e48",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4347.852279663086,
-    "y": 1652.8217468261719,
-    "z": "8bc654d2.f0dde",
+    "x": 4391.852279663086,
+    "y": 1652.388412475586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "878f0a88.cc7f28"
+        "9388038d.e5f508"
       ]
     ]
   },
   {
-    "id": "2227088d.da8978",
+    "id": "d914a00d.43d42",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3842.566635131836,
-    "y": 1369.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3886.566635131836,
+    "y": 1369.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a1b22fed.dd46f",
-        "39006ff3.e4d42",
-        "90a88d63.a0deb"
+        "3150a2ed.678f16",
+        "5769f8b6.da962",
+        "c8b63edf.598bb8"
       ]
     ]
   },
   {
-    "id": "a1b22fed.dd46f",
+    "id": "3150a2ed.678f16",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4038.0667572021484,
-    "y": 1321.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4082.0667572021484,
+    "y": 1321.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "11cc8b93.732e94"
+        "47f6939a.0cca7c"
       ]
     ]
   },
   {
-    "id": "39006ff3.e4d42",
+    "id": "5769f8b6.da962",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4030.0667572021484,
-    "y": 1376.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4074.0667572021484,
+    "y": 1376.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dc84c818.c1238"
+        "dfce5624.4d0e8"
       ]
     ]
   },
   {
-    "id": "90a88d63.a0deb",
+    "id": "c8b63edf.598bb8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4035.0667572021484,
-    "y": 1433.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4079.0667572021484,
+    "y": 1433.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5b4aec5c.78ea6c"
+        "16d53904.a69817"
       ]
     ]
   },
   {
-    "id": "5b4aec5c.78ea6c",
+    "id": "16d53904.a69817",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4187.066757202148,
-    "y": 1434.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4231.066757202148,
+    "y": 1434.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "dc84c818.c1238",
+    "id": "dfce5624.4d0e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4198.066757202148,
-    "y": 1379.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4242.066757202148,
+    "y": 1379.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "11cc8b93.732e94",
+    "id": "47f6939a.0cca7c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4182.449081420898,
-    "y": 1319.6556396484375,
-    "z": "8bc654d2.f0dde",
+    "x": 4226.449081420898,
+    "y": 1319.2223052978516,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3dd6ac8d.e6d824"
+        "57719ed2.829e5"
       ]
     ]
   },
   {
-    "id": "3dd6ac8d.e6d824",
+    "id": "57719ed2.829e5",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4366.566635131836,
-    "y": 1333.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4410.566635131836,
+    "y": 1333.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2c6d0561.1001da"
+        "8b55301b.b943a8"
       ]
     ]
   },
   {
-    "id": "e17a88a7.3a0c68",
+    "id": "545ae19b.2a1238",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
     "comments": "",
-    "x": 4535.566665649414,
-    "y": 1453,
-    "z": "8bc654d2.f0dde",
+    "x": 4579.566665649414,
+    "y": 1452.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "dc9805ea.b1d968",
+    "id": "64761578.742944",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
     "comments": "",
-    "x": 4536.566665649414,
-    "y": 1561,
-    "z": "8bc654d2.f0dde",
+    "x": 4580.566665649414,
+    "y": 1560.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4eccdb3c.a00b8c",
+    "id": "3bbb3a78.1e825e",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4537.566665649414,
-    "y": 1510,
-    "z": "8bc654d2.f0dde",
+    "x": 4581.566665649414,
+    "y": 1509.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "878f0a88.cc7f28",
+    "id": "9388038d.e5f508",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4554.683822631836,
-    "y": 1653.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4598.683822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a6df4a7c.6d4298",
-        "e55c6491.d1cf5",
-        "7eb455b8.997c94"
+        "13805827.ade3d",
+        "a9502d93.1e2b78",
+        "a1b1941b.f9c738"
       ]
     ]
   },
   {
-    "id": "a6df4a7c.6d4298",
+    "id": "13805827.ade3d",
     "type": "set",
     "name": "set source ttp-id",
     "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4769.683822631836,
-    "y": 1615.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4813.683822631836,
+    "y": 1614.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e55c6491.d1cf5",
+    "id": "a9502d93.1e2b78",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4766.683822631836,
-    "y": 1654.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4810.683822631836,
+    "y": 1653.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5121fcc7.d1555c"
+        "b0dee9b7.4f5918"
       ]
     ]
   },
   {
-    "id": "7eb455b8.997c94",
+    "id": "a1b1941b.f9c738",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4722.183822631836,
-    "y": 1696.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4766.183822631836,
+    "y": 1695.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5121fcc7.d1555c",
+    "id": "b0dee9b7.4f5918",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4947.183822631836,
-    "y": 1653.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4991.183822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dcdffb31.a68748"
+        "915aa3e1.c4697"
       ]
     ]
   },
   {
-    "id": "ee290dd7.3447b8",
+    "id": "25f4a2bf.12e7a6",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4766.566665649414,
-    "y": 1271,
-    "z": "8bc654d2.f0dde",
+    "x": 4810.566665649414,
+    "y": 1270.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f5c3f7a5.0472d8"
+        "5118de9a.01dd88"
       ]
     ]
   },
   {
-    "id": "f5c3f7a5.0472d8",
+    "id": "5118de9a.01dd88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4943.566665649414,
-    "y": 1263,
-    "z": "8bc654d2.f0dde",
+    "x": 4987.566665649414,
+    "y": 1262.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "92327400.5b0ea",
-        "7dac197a.3be828"
+        "94a9a0f9.c59e58",
+        "85408268.2c3368"
       ]
     ]
   },
   {
-    "id": "2c6d0561.1001da",
+    "id": "8b55301b.b943a8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4561.566635131836,
-    "y": 1333.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4605.566635131836,
+    "y": 1333.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ee290dd7.3447b8",
-        "97637af.969a388"
+        "25f4a2bf.12e7a6",
+        "95e8d812.cc8ca8"
       ]
     ]
   },
   {
-    "id": "97637af.969a388",
+    "id": "95e8d812.cc8ca8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4769.566665649414,
-    "y": 1345,
-    "z": "8bc654d2.f0dde",
+    "x": 4813.566665649414,
+    "y": 1344.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2b94ab82.f6af74"
+        "f38eef5.12b7d1"
       ]
     ]
   },
   {
-    "id": "2b94ab82.f6af74",
+    "id": "f38eef5.12b7d1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4946.566665649414,
-    "y": 1337,
-    "z": "8bc654d2.f0dde",
+    "x": 4990.566665649414,
+    "y": 1336.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a745e5da.a32578"
+        "c816565f.10d5d"
       ]
     ]
   },
   {
-    "id": "dcdffb31.a68748",
+    "id": "915aa3e1.c4697",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5105.183822631836,
-    "y": 1653.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 5149.183822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f0d23e06.a32c6"
+        "6c003d6.b17f944"
       ]
     ]
   },
   {
-    "id": "f0d23e06.a32c6",
+    "id": "6c003d6.b17f944",
     "type": "set",
     "name": "set source tunnel tp ip",
     "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5312.183822631836,
-    "y": 1653.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 5356.183822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7dac197a.3be828",
+    "id": "85408268.2c3368",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5151.566665649414,
-    "y": 1270,
-    "z": "8bc654d2.f0dde",
+    "x": 5195.566665649414,
+    "y": 1269.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "36ef2efb.214b2a",
-        "a6a3aa1c.6f7288",
-        "f4089fab.088a2"
+        "53b236d8.1b02c",
+        "4083b24b.fff034",
+        "39446af.e663d96"
       ]
     ]
   },
   {
-    "id": "92327400.5b0ea",
+    "id": "94a9a0f9.c59e58",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainA id",
     "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5181.566665649414,
-    "y": 1218,
-    "z": "8bc654d2.f0dde",
+    "x": 5225.566665649414,
+    "y": 1217.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "36ef2efb.214b2a",
+    "id": "53b236d8.1b02c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5361.566665649414,
-    "y": 1261,
-    "z": "8bc654d2.f0dde",
+    "x": 5405.566665649414,
+    "y": 1260.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8d49602b.5cbbb8"
+        "85a67c1c.71be78"
       ]
     ]
   },
   {
-    "id": "a6a3aa1c.6f7288",
+    "id": "4083b24b.fff034",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5353.566665649414,
-    "y": 1316,
-    "z": "8bc654d2.f0dde",
+    "x": 5397.566665649414,
+    "y": 1315.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2502bb8.26e4744"
+        "ef1cd568.ee18"
       ]
     ]
   },
   {
-    "id": "f4089fab.088a2",
+    "id": "39446af.e663d96",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5358.566665649414,
-    "y": 1373,
-    "z": "8bc654d2.f0dde",
+    "x": 5402.566665649414,
+    "y": 1372.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "192598bd.b5d887"
+        "9b4ff565.a53cd"
       ]
     ]
   },
   {
-    "id": "192598bd.b5d887",
+    "id": "9b4ff565.a53cd",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5510.566665649414,
-    "y": 1374,
-    "z": "8bc654d2.f0dde",
+    "x": 5554.566665649414,
+    "y": 1373.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2502bb8.26e4744",
+    "id": "ef1cd568.ee18",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5521.566665649414,
-    "y": 1319,
-    "z": "8bc654d2.f0dde",
+    "x": 5565.566665649414,
+    "y": 1318.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8d49602b.5cbbb8",
+    "id": "85a67c1c.71be78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5505.948989868164,
-    "y": 1258.6556701660156,
-    "z": "8bc654d2.f0dde",
+    "x": 5549.948989868164,
+    "y": 1258.2223358154297,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "34dd56c8.a561f2"
+        "53e9aeb2.242928"
       ]
     ]
   },
   {
-    "id": "a745e5da.a32578",
+    "id": "c816565f.10d5d",
     "type": "set",
     "name": "set domainA ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5181.566665649414,
-    "y": 1461,
-    "z": "8bc654d2.f0dde",
+    "x": 5225.566665649414,
+    "y": 1460.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "34dd56c8.a561f2",
+    "id": "53e9aeb2.242928",
     "type": "set",
     "name": "set controller domainA data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5720.566665649414,
-    "y": 1255,
-    "z": "8bc654d2.f0dde",
+    "x": 5764.566665649414,
+    "y": 1254.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9cc65469.2e5488",
+    "id": "bd4af2f9.e804e",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4370.566635131836,
-    "y": 539.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4414.566635131836,
+    "y": 539.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bae36160.d0fbc",
+    "id": "ff102e0b.75a238",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4361.566635131836,
-    "y": 637.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4405.566635131836,
+    "y": 637.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6429cd23.35e7c4",
+    "id": "c7edad0e.b216",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4195.566635131836,
-    "y": 545.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4239.566635131836,
+    "y": 545.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d98ccbbe.37e04",
-        "9cc65469.2e5488"
+        "f5d37541.2d47c8",
+        "bd4af2f9.e804e"
       ]
     ]
   },
   {
-    "id": "17c9fbf5.2a0a34",
+    "id": "d5f61daa.4b4388",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4201.566635131836,
-    "y": 609.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4245.566635131836,
+    "y": 609.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "449eb720.722948",
-        "bae36160.d0fbc"
+        "2bfe954c.51473a",
+        "ff102e0b.75a238"
       ]
     ]
   },
   {
-    "id": "22d232ad.fa9d6e",
+    "id": "81e90993.f1d9a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4219.566665649414,
-    "y": 822,
-    "z": "8bc654d2.f0dde",
+    "x": 4263.566665649414,
+    "y": 821.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "83bfbc5.ae6994",
-        "7c60504e.d38f7"
+        "9391f162.46d07",
+        "cb81a4f3.d6156"
       ]
     ]
   },
   {
-    "id": "5c001c7.14606e4",
+    "id": "da2103e1.15169",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4222.566665649414,
-    "y": 875,
-    "z": "8bc654d2.f0dde",
+    "x": 4266.566665649414,
+    "y": 874.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5244a859.c728e8",
-        "9835c9a0.4caf78"
+        "8da0410.b4be6c",
+        "e6103926.96cb88"
       ]
     ]
   },
   {
-    "id": "7c60504e.d38f7",
+    "id": "cb81a4f3.d6156",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4379.566665649414,
-    "y": 835,
-    "z": "8bc654d2.f0dde",
+    "x": 4423.566665649414,
+    "y": 834.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9835c9a0.4caf78",
+    "id": "e6103926.96cb88",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4382.566665649414,
-    "y": 926,
-    "z": "8bc654d2.f0dde",
+    "x": 4426.566665649414,
+    "y": 925.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c2220864.024798",
+    "id": "9fb68dad.7c92d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3674.566635131836,
-    "y": 2052.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3718.566635131836,
+    "y": 2052.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b80ff39a.5788d",
-        "d5ffb970.fa1968"
+        "931d0e50.a84728",
+        "4385be6.d4f41c"
       ]
     ]
   },
   {
-    "id": "db8ae4f9.347f",
+    "id": "62a0ff40.3fa718",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3501.900131225586,
-    "y": 2053.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3545.900131225586,
+    "y": 2053.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c2220864.024798"
+        "9fb68dad.7c92d"
       ]
     ]
   },
   {
-    "id": "4d1c7431.f53f04",
+    "id": "a9db3cf5.8c98a8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3511.391098022461,
-    "y": 2096.574005126953,
-    "z": "8bc654d2.f0dde",
+    "x": 3555.391098022461,
+    "y": 2096.140670776367,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c720d68c.d6ef88"
+        "b1d5af05.b8b6a"
       ]
     ]
   },
   {
-    "id": "f027027b.1605f8",
+    "id": "e64b0ffd.d5764",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3499.900131225586,
-    "y": 2142.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3543.900131225586,
+    "y": 2142.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "174ecc35.cb4194"
+        "c5461a06.0ba95"
       ]
     ]
   },
   {
-    "id": "c720d68c.d6ef88",
+    "id": "b1d5af05.b8b6a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3664.9625091552734,
-    "y": 2099.8597412109375,
-    "z": "8bc654d2.f0dde",
+    "x": 3708.9625091552734,
+    "y": 2099.4264068603516,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "174ecc35.cb4194",
+    "id": "c5461a06.0ba95",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3668.900131225586,
-    "y": 2143.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3712.900131225586,
+    "y": 2143.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b80ff39a.5788d",
+    "id": "931d0e50.a84728",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3960.900131225586,
-    "y": 2057.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4004.900131225586,
+    "y": 2056.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f5a758df.e8e0d8",
-        "83d46017.2ef77"
+        "ff2f7e35.94528",
+        "ccece71a.073de8"
       ]
     ]
   },
   {
-    "id": "83d46017.2ef77",
+    "id": "ccece71a.073de8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4183.900131225586,
-    "y": 2012.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4227.900131225586,
+    "y": 2011.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "128bbd7c.ee7803"
+        "c18c40eb.b59cb8"
       ]
     ]
   },
   {
-    "id": "f5a758df.e8e0d8",
+    "id": "ff2f7e35.94528",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4185.900131225586,
-    "y": 2076.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4229.900131225586,
+    "y": 2075.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7922a686.9432f8"
+        "a47e6ec9.683da"
       ]
     ]
   },
   {
-    "id": "7922a686.9432f8",
+    "id": "a47e6ec9.683da",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4344.900131225586,
-    "y": 2095.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4388.900131225586,
+    "y": 2094.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "128bbd7c.ee7803",
+    "id": "c18c40eb.b59cb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4348.900131225586,
-    "y": 2009.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4392.900131225586,
+    "y": 2008.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ecc94bdb.36f218",
-        "70d8643e.5fc584"
+        "50191e6c.286e58",
+        "e564295c.7502a8"
       ]
     ]
   },
   {
-    "id": "dd28e890.6f37f",
+    "id": "37ff3aef.9a54ee",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3273.900131225586,
-    "y": 2088.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3317.900131225586,
+    "y": 2088.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "db8ae4f9.347f",
-        "4d1c7431.f53f04",
-        "f027027b.1605f8"
+        "62a0ff40.3fa718",
+        "a9db3cf5.8c98a8",
+        "e64b0ffd.d5764"
       ]
     ]
   },
   {
-    "id": "6cb9de7.531902",
+    "id": "e2a5ba2c.d267c",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3234.900131225586,
-    "y": 2032.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3278.900131225586,
+    "y": 2032.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d3754757.4f2538",
+    "id": "3ceacdf9.dad772",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3293.900131225586,
-    "y": 1828.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3337.900131225586,
+    "y": 1828.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c926dd8a.c40d78",
-        "b866a3cd.1307c8"
+        "fc191473.db2cb8",
+        "44d4fd2b.8896cc"
       ]
     ]
   },
   {
-    "id": "b866a3cd.1307c8",
+    "id": "44d4fd2b.8896cc",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3516.900131225586,
-    "y": 1814.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3560.900131225586,
+    "y": 1814.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "963b51c2.5c60a8"
+        "e4dd083d.cd18f8"
       ]
     ]
   },
   {
-    "id": "c926dd8a.c40d78",
+    "id": "fc191473.db2cb8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3518.900131225586,
-    "y": 1847.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3562.900131225586,
+    "y": 1847.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "288c4b3e.38e3ac"
+        "28eac456.f04cbc"
       ]
     ]
   },
   {
-    "id": "288c4b3e.38e3ac",
+    "id": "28eac456.f04cbc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3661.900131225586,
-    "y": 1844.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3705.900131225586,
+    "y": 1844.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "963b51c2.5c60a8",
+    "id": "e4dd083d.cd18f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3664.900131225586,
-    "y": 1807.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3708.900131225586,
+    "y": 1807.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dba238c.ade58c8",
-        "11c5499c.e33516"
+        "c8368cdf.b15f18",
+        "26325ab5.37c516"
       ]
     ]
   },
   {
-    "id": "dba238c.ade58c8",
+    "id": "c8368cdf.b15f18",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3858.900131225586,
-    "y": 1811.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 3902.900131225586,
+    "y": 1810.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d5ffb970.fa1968",
+    "id": "4385be6.d4f41c",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3911.900100708008,
-    "y": 2179.9999389648438,
-    "z": "8bc654d2.f0dde",
+    "x": 3955.900100708008,
+    "y": 2179.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8ab0c323.e760e"
+        "ab5afaa2.b8a2e"
       ]
     ]
   },
   {
-    "id": "8ab0c323.e760e",
+    "id": "ab5afaa2.b8a2e",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4117.900100708008,
-    "y": 2179.9999389648438,
-    "z": "8bc654d2.f0dde",
+    "x": 4161.900100708008,
+    "y": 2179.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ef601430.2ce96"
+        "8b90a37d.df48a8"
       ]
     ]
   },
   {
-    "id": "ef601430.2ce96",
+    "id": "8b90a37d.df48a8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4335.185745239258,
-    "y": 2178.8217163085938,
-    "z": "8bc654d2.f0dde",
+    "x": 4379.185745239258,
+    "y": 2178.388381958008,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e64538ad.e88608"
+        "9497250f.2d9438"
       ]
     ]
   },
   {
-    "id": "11c5499c.e33516",
+    "id": "26325ab5.37c516",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3880.900131225586,
-    "y": 1879.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 3924.900131225586,
+    "y": 1878.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "72da73e.01fae8c",
-        "1bf4f20c.844916",
-        "c2abc766.4ac0f"
+        "572475c6.9df474",
+        "8a4bcee9.a6e838",
+        "52414e68.698aa8"
       ]
     ]
   },
   {
-    "id": "72da73e.01fae8c",
+    "id": "572475c6.9df474",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4076.4002532958984,
-    "y": 1831.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4120.400253295898,
+    "y": 1830.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e5dd1f31.8ac458"
+        "cc04a6ba.577058"
       ]
     ]
   },
   {
-    "id": "1bf4f20c.844916",
+    "id": "8a4bcee9.a6e838",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4068.4002532958984,
-    "y": 1886.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4112.400253295898,
+    "y": 1885.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2c7c5a6c.8f4a66"
+        "5bcad340.b7a94c"
       ]
     ]
   },
   {
-    "id": "c2abc766.4ac0f",
+    "id": "52414e68.698aa8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4073.4002532958984,
-    "y": 1943.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4117.400253295898,
+    "y": 1942.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a0f15b8e.a7ebb"
+        "78c91f5c.6a81a"
       ]
     ]
   },
   {
-    "id": "a0f15b8e.a7ebb",
+    "id": "78c91f5c.6a81a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4225.400253295898,
-    "y": 1944.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4269.400253295898,
+    "y": 1943.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2c7c5a6c.8f4a66",
+    "id": "5bcad340.b7a94c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4236.400253295898,
-    "y": 1889.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4280.400253295898,
+    "y": 1888.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e5dd1f31.8ac458",
+    "id": "cc04a6ba.577058",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4220.782577514648,
-    "y": 1828.65576171875,
-    "z": "8bc654d2.f0dde",
+    "x": 4264.782577514648,
+    "y": 1828.222427368164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5bc7c506.3f7314"
+        "b056f70a.5ef0e"
       ]
     ]
   },
   {
-    "id": "ecc94bdb.36f218",
+    "id": "50191e6c.286e58",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
     "comments": "",
-    "x": 4518.900131225586,
-    "y": 1970.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4562.900131225586,
+    "y": 1969.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "70d8643e.5fc584",
+    "id": "e564295c.7502a8",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
     "comments": "",
-    "x": 4519.900131225586,
-    "y": 2075.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4563.900131225586,
+    "y": 2074.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "75e052b3.6ff0fc",
+    "id": "4a5f1f34.b170c",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4514.900131225586,
-    "y": 2024.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4558.900131225586,
+    "y": 2023.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e64538ad.e88608",
+    "id": "9497250f.2d9438",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4542.017288208008,
-    "y": 2168.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4586.017288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "58b39a0b.a28104",
-        "908d048a.fd0138",
-        "5394d746.97415"
+        "dc5203d6.63ee88",
+        "bfaf928b.d789b",
+        "75ef4dfa.4963fc"
       ]
     ]
   },
   {
-    "id": "58b39a0b.a28104",
+    "id": "dc5203d6.63ee88",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4757.017288208008,
-    "y": 2130.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4801.017288208008,
+    "y": 2129.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "908d048a.fd0138",
+    "id": "bfaf928b.d789b",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4754.017288208008,
-    "y": 2169.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4798.017288208008,
+    "y": 2168.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "160d9213.6a516e"
+        "6dd4b7bc.60078"
       ]
     ]
   },
   {
-    "id": "5394d746.97415",
+    "id": "75ef4dfa.4963fc",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4709.517288208008,
-    "y": 2211.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4753.517288208008,
+    "y": 2210.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "160d9213.6a516e",
+    "id": "6dd4b7bc.60078",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4934.517288208008,
-    "y": 2168.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4978.517288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2403cbf1.90bae4"
+        "f825fb77.fb7bc8"
       ]
     ]
   },
   {
-    "id": "2403cbf1.90bae4",
+    "id": "f825fb77.fb7bc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5092.517288208008,
-    "y": 2168.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 5136.517288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "15dae2c1.fe6bdd"
+        "aa2ab587.72eca"
       ]
     ]
   },
   {
-    "id": "15dae2c1.fe6bdd",
+    "id": "aa2ab587.72eca",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5299.517288208008,
-    "y": 2168.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 5343.517288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e7ce121f.269bb",
+    "id": "5ec77bbd.698654",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4802.900131225586,
-    "y": 1847.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4846.900131225586,
+    "y": 1846.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "30725ca7.222ea4"
+        "ef66532c.d6746"
       ]
     ]
   },
   {
-    "id": "30725ca7.222ea4",
+    "id": "ef66532c.d6746",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4979.900131225586,
-    "y": 1839.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5023.900131225586,
+    "y": 1838.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "82bc9190.99083",
-        "c6a75ef3.9aa488"
+        "f7a2f11b.7a291",
+        "d2b30e12.01e548"
       ]
     ]
   },
   {
-    "id": "5bc7c506.3f7314",
+    "id": "b056f70a.5ef0e",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4404.900131225586,
-    "y": 1843.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4448.900131225586,
+    "y": 1842.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9e2fa3d8.88246"
+        "658c9b9.fce64e4"
       ]
     ]
   },
   {
-    "id": "9e2fa3d8.88246",
+    "id": "658c9b9.fce64e4",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4599.900131225586,
-    "y": 1843.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4643.900131225586,
+    "y": 1842.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e7ce121f.269bb",
-        "87abf2c8.a21648"
+        "5ec77bbd.698654",
+        "d91be682.fd9ed8"
       ]
     ]
   },
   {
-    "id": "c6a75ef3.9aa488",
+    "id": "d2b30e12.01e548",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5187.900131225586,
-    "y": 1846.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5231.900131225586,
+    "y": 1845.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d33681ca.12c55",
-        "54cfcb70.c20a5c",
-        "76901bc2.c646ec"
+        "5cd3941f.991a64",
+        "72be6080.49369",
+        "27b21fad.3c3a98"
       ]
     ]
   },
   {
-    "id": "c7485083.08e3d",
+    "id": "a895224b.6a3d58",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4981.900131225586,
-    "y": 1912.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5025.900131225586,
+    "y": 1911.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9f7ab33f.3d3ee8"
+        "de5c0fa7.2ddfe8"
       ]
     ]
   },
   {
-    "id": "87abf2c8.a21648",
+    "id": "d91be682.fd9ed8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4804.900131225586,
-    "y": 1920.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4848.900131225586,
+    "y": 1919.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c7485083.08e3d"
+        "a895224b.6a3d58"
       ]
     ]
   },
   {
-    "id": "82bc9190.99083",
+    "id": "f7a2f11b.7a291",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainB id",
     "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5217.900131225586,
-    "y": 1794.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5261.900131225586,
+    "y": 1793.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9f7ab33f.3d3ee8",
+    "id": "de5c0fa7.2ddfe8",
     "type": "set",
     "name": "set domainB ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5216.900131225586,
-    "y": 2036.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5260.900131225586,
+    "y": 2035.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d33681ca.12c55",
+    "id": "5cd3941f.991a64",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5397.900131225586,
-    "y": 1837.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5441.900131225586,
+    "y": 1836.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "52bdc174.53236"
+        "2d963acb.7812d6"
       ]
     ]
   },
   {
-    "id": "54cfcb70.c20a5c",
+    "id": "72be6080.49369",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5389.900131225586,
-    "y": 1892.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5433.900131225586,
+    "y": 1891.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "da0362e9.7cf8b8"
+        "7809e6f0.3ba7a"
       ]
     ]
   },
   {
-    "id": "76901bc2.c646ec",
+    "id": "27b21fad.3c3a98",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5394.900131225586,
-    "y": 1949.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5438.900131225586,
+    "y": 1948.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "656ad13e.13aaf8"
+        "76fc1345.ebf534"
       ]
     ]
   },
   {
-    "id": "656ad13e.13aaf8",
+    "id": "76fc1345.ebf534",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5546.900131225586,
-    "y": 1950.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5590.900131225586,
+    "y": 1949.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "da0362e9.7cf8b8",
+    "id": "7809e6f0.3ba7a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5557.900131225586,
-    "y": 1895.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5601.900131225586,
+    "y": 1894.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "52bdc174.53236",
+    "id": "2d963acb.7812d6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5542.282455444336,
-    "y": 1834.65576171875,
-    "z": "8bc654d2.f0dde",
+    "x": 5586.282455444336,
+    "y": 1834.222427368164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2dd4dc53.801b1c"
+        "3e96d581.6be972"
       ]
     ]
   },
   {
-    "id": "2dd4dc53.801b1c",
+    "id": "3e96d581.6be972",
     "type": "set",
     "name": "set controller domainB data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5756.900131225586,
-    "y": 1831.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5800.900131225586,
+    "y": 1830.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "10147ab3.fed6fd",
+    "id": "a62852b2.29136",
     "type": "set",
     "name": "set LEAF stuff",
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
     "comments": "",
-    "x": 3241.566635131836,
-    "y": 1649.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3285.566635131836,
+    "y": 1649.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bb3da11a.4b756",
+    "id": "906a6d5d.cfc198",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4537.566635131836,
-    "y": 623.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4581.566635131836,
+    "y": 623.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "550747e5.fd6e4",
+    "id": "c5fcfc8e.70af78",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4547.566665649414,
-    "y": 820,
-    "z": "8bc654d2.f0dde",
+    "x": 4591.566665649414,
+    "y": 819.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "425867c4.b0a9",
+    "id": "e4c9b14e.e493e",
     "type": "set",
     "name": "set ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
     "comments": "",
-    "x": 3244.566604614258,
-    "y": 2157.9999389648438,
-    "z": "8bc654d2.f0dde",
+    "x": 3288.566604614258,
+    "y": 2157.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e3e1a44c.9927b8",
+    "id": "a5e91f89.51e28",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3381.566665649414,
-    "y": 2814,
-    "z": "8bc654d2.f0dde",
+    "x": 3425.566665649414,
+    "y": 2813.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a62d4e.fca9aac",
+    "id": "6a1545ce.c6f074",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3258.566665649414,
-    "y": 2924,
-    "z": "8bc654d2.f0dde",
+    "x": 3302.566665649414,
+    "y": 2923.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "81493f2.f26234",
-        "6c24115d.c6e7c"
+        "2a58524.cf6ab2e",
+        "b22f43e3.b228e"
       ]
     ]
   },
   {
-    "id": "81493f2.f26234",
+    "id": "2a58524.cf6ab2e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3442.566665649414,
-    "y": 2903,
-    "z": "8bc654d2.f0dde",
+    "x": 3486.566665649414,
+    "y": 2902.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3aff0eaf.ff7b7a"
+        "1fd47368.eaee3d"
       ]
     ]
   },
   {
-    "id": "6c24115d.c6e7c",
+    "id": "b22f43e3.b228e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3334.566665649414,
-    "y": 5081,
-    "z": "8bc654d2.f0dde",
+    "x": 3378.566665649414,
+    "y": 5080.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5bc4950a.db01dc"
+        "bb1800d1.b22838"
       ]
     ]
   },
   {
-    "id": "5bc4950a.db01dc",
+    "id": "bb1800d1.b22838",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3489.566665649414,
-    "y": 5074,
-    "z": "8bc654d2.f0dde",
+    "x": 3533.566665649414,
+    "y": 5073.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2f2701b5.2dac16",
-        "316110e0.e54cc",
-        "b160de6d.e8ced8",
-        "595e7f4b.3b8bd8",
-        "8bf8bc6f.53ce6",
-        "1e2222c.7b917dd"
+        "eb692208.605d48",
+        "fa1a129b.8e1e58",
+        "8f8ab353.277fd8",
+        "e967635e.d5f898",
+        "a7e951fd.34174",
+        "147222b6.72d4a5"
       ]
     ]
   },
   {
-    "id": "3aff0eaf.ff7b7a",
+    "id": "1fd47368.eaee3d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3585.566665649414,
-    "y": 2903,
-    "z": "8bc654d2.f0dde",
+    "x": 3629.566665649414,
+    "y": 2902.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5168a07f.a36df8",
-        "6c599b75.a60fcc",
-        "35850a83.44a89e",
-        "ae160236.4157c8",
-        "b7fd9c88.558b98",
-        "6e041a0e.19b3cc",
-        "612f5852.aaa57",
-        "8d9898f5.dd7e",
-        "638e1104.d7c428",
-        "d797d3a4.8fe9",
-        "ce4e4e08.0ce56",
-        "a4cacc19.7d376",
-        "57e31ea9.c7173",
-        "bf6be8f0.fb6c88",
-        "982a1a56.4966b8",
-        "8feec705.936fd8",
-        "eb6eb29c.21a438",
-        "cad73781.1cf898",
-        "bdd8ea07.2740c",
-        "8877dbf4.9fef7",
-        "374b533b.d2c934",
-        "e008f489.a45f08"
+        "13be4810.27374",
+        "2088078d.cb1e2",
+        "e3bae41.89a4a98",
+        "ed9405a6.bcc818",
+        "fe194fc5.986bf",
+        "c94ba2a6.6d9dc",
+        "49793ec.cd6ce4",
+        "5e8a3143.8db73",
+        "faf103f5.4614f8",
+        "88431892.8e89b8",
+        "cac051ff.1079b",
+        "8ab931f2.10742",
+        "38387e07.eee06a",
+        "c16c558d.bd7fa8",
+        "773efcf1.a16054",
+        "4610b0f7.2e9108",
+        "9860b974.593a3",
+        "e82d41b7.567df",
+        "763bc2b5.d71f9c",
+        "3cc87f7.3864a",
+        "5fefabc6.f62f5c",
+        "dbd95dbb.cf097"
       ]
     ]
   },
   {
-    "id": "638e1104.d7c428",
+    "id": "faf103f5.4614f8",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainB",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3895.566665649414,
-    "y": 3218,
-    "z": "8bc654d2.f0dde",
+    "x": 3939.566665649414,
+    "y": 3217.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "5168a07f.a36df8",
+    "id": "13be4810.27374",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3843.566665649414,
-    "y": 3260,
-    "z": "8bc654d2.f0dde",
+    "x": 3887.566665649414,
+    "y": 3259.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "6c599b75.a60fcc",
+    "id": "2088078d.cb1e2",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3972.566665649414,
-    "y": 3302,
-    "z": "8bc654d2.f0dde",
+    "x": 4016.566665649414,
+    "y": 3301.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e80dd6ae.f178",
+    "id": "c56513f7.9839c8",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 3818.566665649414,
-    "y": 3177,
-    "z": "8bc654d2.f0dde",
+    "x": 3862.566665649414,
+    "y": 3176.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b4b36e39.27fc08",
+    "id": "cb0612e7.fab918",
     "type": "comment",
     "name": "create middle man connectivity and ...",
     "info": "1- create middle man connectivity\n2- create relation with all connectivities\n   in the path\n3- put srcTtp (+dstTtp) somewhere in the\n   vpn-binding -> this is for later on to find\n   which OTN tunnel's bandwidth has to be increased.\n5- create UNIs\n4- create relationship to UNIs",
     "comments": "",
-    "x": 4343.566665649414,
-    "y": 3698,
-    "z": "8bc654d2.f0dde",
+    "x": 4387.566665649414,
+    "y": 3697.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "35850a83.44a89e",
+    "id": "e3bae41.89a4a98",
     "type": "execute",
     "name": "execute UUID generator for connectivity middle-man",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3907.566665649414,
-    "y": 3737,
-    "z": "8bc654d2.f0dde",
+    "x": 3951.566665649414,
+    "y": 3736.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ae160236.4157c8",
+    "id": "ed9405a6.bcc818",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3855.566665649414,
-    "y": 3788,
-    "z": "8bc654d2.f0dde",
+    "x": 3899.566665649414,
+    "y": 3787.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b7fd9c88.558b98",
+    "id": "fe194fc5.986bf",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-middle-man-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-middle-man-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3991.566665649414,
-    "y": 3835,
-    "z": "8bc654d2.f0dde",
+    "x": 4035.566665649414,
+    "y": 3834.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f07a7af4.49b438",
+    "id": "3a844032.bf9ac",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 3848.566665649414,
-    "y": 3697,
-    "z": "8bc654d2.f0dde",
+    "x": 3892.566665649414,
+    "y": 3696.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d7c1d718.25aef8",
+    "id": "debaf07d.db6d5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4278.566665649414,
-    "y": 3894,
-    "z": "8bc654d2.f0dde",
+    "x": 4322.566665649414,
+    "y": 3893.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "6e041a0e.19b3cc",
+    "id": "c94ba2a6.6d9dc",
     "type": "save",
     "name": "get middle-man connectivity from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $prop.connectivity-middle-man-uuid\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"middle-man-conn\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3869.566665649414,
-    "y": 3941,
-    "z": "8bc654d2.f0dde",
+    "x": 3913.566665649414,
+    "y": 3940.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3be15b0.8cc9ea6",
-        "8fcafedd.8f9ff8",
-        "74f3c2d6.5194d4"
+        "34b4bb6d.84f2ec",
+        "39b05e8d.991162",
+        "b7823394.4e1968"
       ]
     ]
   },
   {
-    "id": "3be15b0.8cc9ea6",
+    "id": "34b4bb6d.84f2ec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4116.566665649414,
-    "y": 3895,
-    "z": "8bc654d2.f0dde",
+    "x": 4160.566665649414,
+    "y": 3894.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d7c1d718.25aef8"
+        "debaf07d.db6d5"
       ]
     ]
   },
   {
-    "id": "8fcafedd.8f9ff8",
+    "id": "39b05e8d.991162",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4117.057632446289,
-    "y": 3940.5740356445312,
-    "z": "8bc654d2.f0dde",
+    "x": 4161.057632446289,
+    "y": 3940.1407012939453,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "535b8241.bba134"
+        "483dd1d6.aa392"
       ]
     ]
   },
   {
-    "id": "74f3c2d6.5194d4",
+    "id": "b7823394.4e1968",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4114.566665649414,
-    "y": 3984,
-    "z": "8bc654d2.f0dde",
+    "x": 4158.566665649414,
+    "y": 3983.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4abd8099.5640c"
+        "59b157ce.93edc"
       ]
     ]
   },
   {
-    "id": "535b8241.bba134",
+    "id": "483dd1d6.aa392",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4279.629043579102,
-    "y": 3940.8597717285156,
-    "z": "8bc654d2.f0dde",
+    "x": 4323.629043579102,
+    "y": 3940.4264373779297,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4abd8099.5640c",
+    "id": "59b157ce.93edc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4283.566665649414,
-    "y": 3985,
-    "z": "8bc654d2.f0dde",
+    "x": 4327.566665649414,
+    "y": 3984.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "982a1a56.4966b8",
+    "id": "773efcf1.a16054",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3923.566665649414,
-    "y": 4283,
-    "z": "8bc654d2.f0dde",
+    "x": 3967.566665649414,
+    "y": 4282.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "8feec705.936fd8",
+    "id": "4610b0f7.2e9108",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3926.566665649414,
-    "y": 4328,
-    "z": "8bc654d2.f0dde",
+    "x": 3970.566665649414,
+    "y": 4327.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "cad73781.1cf898",
+    "id": "e82d41b7.567df",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3918.566665649414,
-    "y": 4056,
-    "z": "8bc654d2.f0dde",
+    "x": 3962.566665649414,
+    "y": 4055.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "bdd8ea07.2740c",
+    "id": "763bc2b5.d71f9c",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3920.566665649414,
-    "y": 4103,
-    "z": "8bc654d2.f0dde",
+    "x": 3964.566665649414,
+    "y": 4102.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b21853e4.c6418",
+    "id": "e3efee4c.cbd228",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 3839.566665649414,
-    "y": 4236,
-    "z": "8bc654d2.f0dde",
+    "x": 3883.566665649414,
+    "y": 4235.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f1842c11.743b7",
+    "id": "a86d756f.b96748",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4449.566665649414,
-    "y": 4902,
-    "z": "8bc654d2.f0dde",
+    "x": 4493.566665649414,
+    "y": 4901.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f2701b5.2dac16",
+    "id": "eb692208.605d48",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3704.566665649414,
-    "y": 5055,
-    "z": "8bc654d2.f0dde",
+    "x": 3748.566665649414,
+    "y": 5054.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bb4138b0.4e1d88",
-        "3497566e.93319a"
+        "35961804.034dd",
+        "1c6960fb.af77c7"
       ]
     ]
   },
   {
-    "id": "3497566e.93319a",
+    "id": "1c6960fb.af77c7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3876.566665649414,
-    "y": 5052,
-    "z": "8bc654d2.f0dde",
+    "x": 3920.566665649414,
+    "y": 5051.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c7f4755e.39d608"
+        "44ac8602.f7b438"
       ]
     ]
   },
   {
-    "id": "bb4138b0.4e1d88",
+    "id": "35961804.034dd",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3828.566665649414,
-    "y": 5899,
-    "z": "8bc654d2.f0dde",
+    "x": 3872.566665649414,
+    "y": 5898.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6c4c0ada.7452e4"
+        "e66ef561.f9598"
       ]
     ]
   },
   {
-    "id": "4c3530ee.3fa66",
+    "id": "a7546f8d.e642f8",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3889.566665649414,
-    "y": 5022,
-    "z": "8bc654d2.f0dde",
+    "x": 3933.566665649414,
+    "y": 5021.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "56d0be77.8f738",
+    "id": "7377305c.6344e",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3899.566665649414,
-    "y": 5857,
-    "z": "8bc654d2.f0dde",
+    "x": 3943.566665649414,
+    "y": 5856.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "612f5852.aaa57",
+    "id": "49793ec.cd6ce4",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3922.566665649414,
-    "y": 4431,
-    "z": "8bc654d2.f0dde",
+    "x": 3966.566665649414,
+    "y": 4430.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7f4755e.39d608",
+    "id": "44ac8602.f7b438",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4052.566665649414,
-    "y": 5054,
-    "z": "8bc654d2.f0dde",
+    "x": 4096.566665649414,
+    "y": 5053.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "230e1b13.237ccc",
-        "5181bb49.6fa9a4",
-        "fd0048f2.8665c8",
-        "78647ab5.49b354",
-        "f0982e54.06c37",
-        "828e934c.bce518",
-        "f1842c11.743b7",
-        "76d94500.85b34c",
-        "66bf889f.a4f118"
+        "f2639d5b.9b3268",
+        "eb43383.cb911c8",
+        "b431bc46.f09eb8",
+        "3f007800.f3335",
+        "6651db46.728784",
+        "ec10a332.513d58",
+        "a86d756f.b96748",
+        "128b476.c3c24b9",
+        "b1e27ce1.629f7"
       ]
     ]
   },
   {
-    "id": "ae961dcf.a0b6c",
+    "id": "3a4a9e77.4fc502",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5497.566665649414,
-    "y": 4527,
-    "z": "8bc654d2.f0dde",
+    "x": 5541.566665649414,
+    "y": 4526.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "230e1b13.237ccc",
+    "id": "f2639d5b.9b3268",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4430.566665649414,
-    "y": 5557,
-    "z": "8bc654d2.f0dde",
+    "x": 4474.566665649414,
+    "y": 5556.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "8d9898f5.dd7e",
+    "id": "5e8a3143.8db73",
     "type": "save",
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3901.566665649414,
-    "y": 3431,
-    "z": "8bc654d2.f0dde",
+    "x": 3945.566665649414,
+    "y": 3430.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d797d3a4.8fe9",
+    "id": "88431892.8e89b8",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3899.566665649414,
-    "y": 2888,
-    "z": "8bc654d2.f0dde",
+    "x": 3943.566665649414,
+    "y": 2887.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce4e4e08.0ce56",
+    "id": "cac051ff.1079b",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3847.566665649414,
-    "y": 2936,
-    "z": "8bc654d2.f0dde",
+    "x": 3891.566665649414,
+    "y": 2935.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "a4cacc19.7d376",
+    "id": "8ab931f2.10742",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3975.566665649414,
-    "y": 2983,
-    "z": "8bc654d2.f0dde",
+    "x": 4019.566665649414,
+    "y": 2982.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ae968df.974b9f",
+    "id": "be22c48f.b88288",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 3812.566665649414,
-    "y": 2846,
-    "z": "8bc654d2.f0dde",
+    "x": 3856.566665649414,
+    "y": 2845.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "57e31ea9.c7173",
+    "id": "38387e07.eee06a",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />",
+    "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`' />",
     "comments": "",
     "outputs": 1,
-    "x": 3809.566665649414,
-    "y": 3074,
-    "z": "8bc654d2.f0dde",
+    "x": 3853.566665649414,
+    "y": 3073.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "bf6be8f0.fb6c88",
+    "id": "c16c558d.bd7fa8",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3902.566665649414,
-    "y": 3127,
-    "z": "8bc654d2.f0dde",
+    "x": 3946.566665649414,
+    "y": 3126.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "155d8942.126f0f",
+    "id": "8249248d.fd861",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 3793.566665649414,
-    "y": 3030,
-    "z": "8bc654d2.f0dde",
+    "x": 3837.566665649414,
+    "y": 3029.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "eda430a0.e8a4b8",
+    "id": "8a8f5ba9.d4da6",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3797.566665649414,
-    "y": 3346,
-    "z": "8bc654d2.f0dde",
+    "x": 3841.566665649414,
+    "y": 3345.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "78647ab5.49b354",
+    "id": "3f007800.f3335",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "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",
     "comments": "",
     "outputs": 1,
-    "x": 4366.566665649414,
-    "y": 4535,
-    "z": "8bc654d2.f0dde",
+    "x": 4410.566665649414,
+    "y": 4534.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "db99df8c.8021",
+    "id": "5bce380a.32d878",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4350.566665649414,
-    "y": 4491,
-    "z": "8bc654d2.f0dde",
+    "x": 4394.566665649414,
+    "y": 4490.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fea8fd97.74e2c8",
+    "id": "1b090d31.1314e3",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5097.566665649414,
-    "y": 4522,
-    "z": "8bc654d2.f0dde",
+    "x": 5141.566665649414,
+    "y": 4521.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5a0b429f.b8f42c",
+    "id": "c30363c7.dd0dc",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5184.566665649414,
-    "y": 4564,
-    "z": "8bc654d2.f0dde",
+    "x": 5228.566665649414,
+    "y": 4563.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "5930a956.25a2b",
+    "id": "10271018.94b4f8",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5132.566665649414,
-    "y": 4612,
-    "z": "8bc654d2.f0dde",
+    "x": 5176.566665649414,
+    "y": 4611.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "8f7ba394.827068",
+    "id": "285754a8.44159c",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5260.566665649414,
-    "y": 4659,
-    "z": "8bc654d2.f0dde",
+    "x": 5304.566665649414,
+    "y": 4658.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "828e934c.bce518",
+    "id": "ec10a332.513d58",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4437.566665649414,
-    "y": 4944,
-    "z": "8bc654d2.f0dde",
+    "x": 4481.566665649414,
+    "y": 4943.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "29a2a107.550e86",
+    "id": "572f6814.fa386",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4420.566665649414,
-    "y": 5006,
-    "z": "8bc654d2.f0dde",
+    "x": 4464.566665649414,
+    "y": 5005.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5181bb49.6fa9a4",
+    "id": "eb43383.cb911c8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4531.566665649414,
-    "y": 5048,
-    "z": "8bc654d2.f0dde",
+    "x": 4575.566665649414,
+    "y": 5047.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "a3e1b718.3ad9",
+    "id": "8c58cbc3.7f4b88",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 4979.566665649414,
-    "y": 5101,
-    "z": "8bc654d2.f0dde",
+    "x": 5023.566665649414,
+    "y": 5100.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "778aa80b.aa4e1",
+    "id": "be5aff94.f7d12",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4289.566665649414,
-    "y": 5799,
-    "z": "8bc654d2.f0dde",
+    "x": 4333.566665649414,
+    "y": 5798.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "5829dcc0.7722b4",
+    "id": "526f34d0.18befc",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "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`' />",
     "comments": "",
     "outputs": 1,
-    "x": 4187.566665649414,
-    "y": 5748,
-    "z": "8bc654d2.f0dde",
+    "x": 4231.566665649414,
+    "y": 5747.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e74f47d7.82472",
+    "id": "6826024b.ca723c",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4171.566665649414,
-    "y": 5704,
-    "z": "8bc654d2.f0dde",
+    "x": 4215.566665649414,
+    "y": 5703.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "edf4200a.b4f218",
+    "id": "be0ba193.2dd698",
     "type": "save",
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4957.566665649414,
-    "y": 5961,
-    "z": "8bc654d2.f0dde",
+    "x": 5001.566665649414,
+    "y": 5960.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "fd0048f2.8665c8",
+    "id": "b431bc46.f09eb8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4358.566665649414,
-    "y": 5105,
-    "z": "8bc654d2.f0dde",
+    "x": 4402.566665649414,
+    "y": 5104.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ad0bda8.59e5ba8",
-        "a82a76f3.4e09c"
+        "baf822c4.3f205",
+        "32a48883.ef2b98"
       ]
     ]
   },
   {
-    "id": "ad0bda8.59e5ba8",
+    "id": "baf822c4.3f205",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4569.566665649414,
-    "y": 5105,
-    "z": "8bc654d2.f0dde",
+    "x": 4613.566665649414,
+    "y": 5104.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "85a5596f.5bdcf8"
+        "58c9a296.a42094"
       ]
     ]
   },
   {
-    "id": "85a5596f.5bdcf8",
+    "id": "58c9a296.a42094",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4725.566665649414,
-    "y": 5101,
-    "z": "8bc654d2.f0dde",
+    "x": 4769.566665649414,
+    "y": 5100.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a3e1b718.3ad9",
-        "31466e0d.9a3dba",
-        "19c788e0.a62557"
+        "8c58cbc3.7f4b88",
+        "3aab431e.930194",
+        "c5e59db3.c67ea"
       ]
     ]
   },
   {
-    "id": "a82a76f3.4e09c",
+    "id": "32a48883.ef2b98",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4565.566665649414,
-    "y": 5153,
-    "z": "8bc654d2.f0dde",
+    "x": 4609.566665649414,
+    "y": 5152.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9fc5ee1f.667928"
+        "255e5d4d.31482a"
       ]
     ]
   },
   {
-    "id": "9fc5ee1f.667928",
+    "id": "255e5d4d.31482a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 4713.566665649414,
-    "y": 5148,
-    "z": "8bc654d2.f0dde",
+    "x": 4757.566665649414,
+    "y": 5147.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4161f07f.2b4a78",
+    "id": "3647078f.866d7",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5221.566665649414,
-    "y": 4730,
-    "z": "8bc654d2.f0dde",
+    "x": 5265.566665649414,
+    "y": 4729.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "90827cac.7f3cc8",
+    "id": "79257077.5f1ff8",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2387.566665649414,
-    "y": 141,
-    "z": "8bc654d2.f0dde",
+    "x": 2431.566665649414,
+    "y": 140.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e557ce2.09f823",
+    "id": "8a55fb57.dfc438",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 2321.566665649414,
-    "y": 177,
-    "z": "8bc654d2.f0dde",
+    "x": 2365.566665649414,
+    "y": 176.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "47435c42.bdd92c",
+    "id": "d0423030.a4fb7",
     "type": "comment",
     "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
     "info": "",
     "comments": "",
-    "x": 2506.566665649414,
-    "y": 104,
-    "z": "8bc654d2.f0dde",
+    "x": 2550.566665649414,
+    "y": 103.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b6d8895e.58d1b",
+    "id": "fad64a40.999cd8",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 4256.566665649414,
-    "y": 5865,
-    "z": "8bc654d2.f0dde",
+    "x": 4300.566665649414,
+    "y": 5864.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c1456abb.063048",
+    "id": "1f999717.41db99",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4389.566665649414,
-    "y": 5913,
-    "z": "8bc654d2.f0dde",
+    "x": 4433.566665649414,
+    "y": 5912.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "da4c1b48.fae9f8",
+    "id": "c52167d8.94938",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4208.566665649414,
-    "y": 5971,
-    "z": "8bc654d2.f0dde",
+    "x": 4252.566665649414,
+    "y": 5970.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "86ae7c06.4b48",
-        "7bcdf21f.be49d4"
+        "19e438e0.03d147",
+        "34d88bae.811d0c"
       ]
     ]
   },
   {
-    "id": "86ae7c06.4b48",
+    "id": "19e438e0.03d147",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4401.566665649414,
-    "y": 5972,
-    "z": "8bc654d2.f0dde",
+    "x": 4445.566665649414,
+    "y": 5971.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "97f7b4f.de4c2c8"
+        "41319fcd.d8b348"
       ]
     ]
   },
   {
-    "id": "97f7b4f.de4c2c8",
+    "id": "41319fcd.d8b348",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",
     "comments": "",
-    "x": 4557.566665649414,
-    "y": 5969,
-    "z": "8bc654d2.f0dde",
+    "x": 4601.566665649414,
+    "y": 5968.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7bcdf21f.be49d4",
+    "id": "34d88bae.811d0c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4405.566665649414,
-    "y": 6016,
-    "z": "8bc654d2.f0dde",
+    "x": 4449.566665649414,
+    "y": 6015.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c9f63d74.2677a"
+        "9cc4dc7d.174798"
       ]
     ]
   },
   {
-    "id": "c9f63d74.2677a",
+    "id": "9cc4dc7d.174798",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4544.566665649414,
-    "y": 6011,
-    "z": "8bc654d2.f0dde",
+    "x": 4588.566665649414,
+    "y": 6010.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "edf4200a.b4f218",
-        "684d5c9e.960e44",
-        "fa17bed2.102338",
-        "4394fc56.b0a524",
-        "c58358a8.9796d8",
-        "f1d05d51.ef74a8",
-        "9dd9cb2c.0f6d38",
-        "e3b520b5.76f3e",
-        "1492db48.4787f5",
-        "4433eaac.652284",
-        "5e482e7e.e4be78",
-        "b03c5831.d4c5f"
+        "be0ba193.2dd698",
+        "9b687ead.d5262",
+        "bb8d3610.613d68",
+        "89f249f3.3e5608",
+        "1d656b5f.37186d",
+        "90bf2cc6.ca2d58",
+        "517a964c.5fa06",
+        "c8b3b99a.24ee1",
+        "2487bbac.e2018c",
+        "203e33ee.d272e4",
+        "3c1017d1.449bb",
+        "21e17170.9d1c4e"
       ]
     ]
   },
   {
-    "id": "9dd9cb2c.0f6d38",
+    "id": "517a964c.5fa06",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4741.566665649414,
-    "y": 6690,
-    "z": "8bc654d2.f0dde",
+    "x": 4785.566665649414,
+    "y": 6689.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1b9180c4.9f766f",
-        "3223a99b.bae36e",
-        "f1d0a095.e9e33"
+        "f455e87a.bb05c8",
+        "dc467c76.6e0b1",
+        "26412110.73f856"
       ]
     ]
   },
   {
-    "id": "1b9180c4.9f766f",
+    "id": "f455e87a.bb05c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4946.566665649414,
-    "y": 6687,
-    "z": "8bc654d2.f0dde",
+    "x": 4990.566665649414,
+    "y": 6686.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "901d20b6.63b228"
+        "8ff8217a.525ad8"
       ]
     ]
   },
   {
-    "id": "3223a99b.bae36e",
+    "id": "dc467c76.6e0b1",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4930.057632446289,
-    "y": 6748.574035644531,
-    "z": "8bc654d2.f0dde",
+    "x": 4974.057632446289,
+    "y": 6748.140701293945,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "74136956.3d8c9"
+        "2b587a1.cfe3f86"
       ]
     ]
   },
   {
-    "id": "f1d0a095.e9e33",
+    "id": "26412110.73f856",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4927.566665649414,
-    "y": 6792,
-    "z": "8bc654d2.f0dde",
+    "x": 4971.566665649414,
+    "y": 6791.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c0df29cc.8ad0d8"
+        "b747b55e.88ecf8"
       ]
     ]
   },
   {
-    "id": "901d20b6.63b228",
+    "id": "8ff8217a.525ad8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5102.566665649414,
-    "y": 6701,
-    "z": "8bc654d2.f0dde",
+    "x": 5146.566665649414,
+    "y": 6700.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1ef77bcc.af8c2c"
+        "8429b279.d4cdf"
       ]
     ]
   },
   {
-    "id": "74136956.3d8c9",
+    "id": "2b587a1.cfe3f86",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5092.629043579102,
-    "y": 6748.859771728516,
-    "z": "8bc654d2.f0dde",
+    "x": 5136.629043579102,
+    "y": 6748.42643737793,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c0df29cc.8ad0d8",
+    "id": "b747b55e.88ecf8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5094.566665649414,
-    "y": 6791,
-    "z": "8bc654d2.f0dde",
+    "x": 5138.566665649414,
+    "y": 6790.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1ef77bcc.af8c2c",
+    "id": "8429b279.d4cdf",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5349.566665649414,
-    "y": 6698,
-    "z": "8bc654d2.f0dde",
+    "x": 5393.566665649414,
+    "y": 6697.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "77c4c783.c3eb4"
+        "1ddbd038.9357b"
       ]
     ]
   },
   {
-    "id": "77c4c783.c3eb4",
+    "id": "1ddbd038.9357b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5586.566665649414,
-    "y": 6694,
-    "z": "8bc654d2.f0dde",
+    "x": 5630.566665649414,
+    "y": 6693.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "aa349c90.ef423"
+        "7922b60b.c6e31"
       ]
     ]
   },
   {
-    "id": "41bd4d7e.8e8f9c",
+    "id": "e0649c96.67ff88",
     "type": "switchNode",
     "name": "switch vpnuuid is for this slice",
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5829.566665649414,
-    "y": 6666,
-    "z": "8bc654d2.f0dde",
+    "x": 5873.566665649414,
+    "y": 6665.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "858dc053.37b33",
-        "5e74f51.5b7928c"
+        "6697bde5.6a73ec",
+        "f1cd44ef.865458"
       ]
     ]
   },
   {
-    "id": "858dc053.37b33",
+    "id": "6697bde5.6a73ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6034.566665649414,
-    "y": 6686,
-    "z": "8bc654d2.f0dde",
+    "x": 6078.566665649414,
+    "y": 6685.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "aa349c90.ef423"
+        "7922b60b.c6e31"
       ]
     ]
   },
   {
-    "id": "5e74f51.5b7928c",
+    "id": "f1cd44ef.865458",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6033.566665649414,
-    "y": 6639,
-    "z": "8bc654d2.f0dde",
+    "x": 6077.566665649414,
+    "y": 6638.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "aa349c90.ef423",
+    "id": "7922b60b.c6e31",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4777.566665649414,
-    "y": 6961,
-    "z": "8bc654d2.f0dde",
+    "x": 4821.566665649414,
+    "y": 6960.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b674f90b.943ea8"
+        "b0b5d457.a97bd"
       ]
     ]
   },
   {
-    "id": "4b6f312b.4e491",
+    "id": "1fa90257.6a5f2e",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 6239.566635131836,
-    "y": 6898.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6283.566635131836,
+    "y": 6898.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e9dae4fe.64e148",
+    "id": "a2de4936.eeff58",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4839.566665649414,
-    "y": 6637,
-    "z": "8bc654d2.f0dde",
+    "x": 4883.566665649414,
+    "y": 6636.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f1d05d51.ef74a8",
+    "id": "90bf2cc6.ca2d58",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4721.566665649414,
-    "y": 6525,
-    "z": "8bc654d2.f0dde",
+    "x": 4765.566665649414,
+    "y": 6524.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "87a0032d.5441b8",
+    "id": "917753a8.ea741",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5066.566665649414,
-    "y": 6356,
-    "z": "8bc654d2.f0dde",
+    "x": 5110.566665649414,
+    "y": 6355.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e7a622d1.3aac3"
+        "ddf721ac.b7eef8"
       ]
     ]
   },
   {
-    "id": "e7a622d1.3aac3",
+    "id": "ddf721ac.b7eef8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5286.566665649414,
-    "y": 6362,
-    "z": "8bc654d2.f0dde",
+    "x": 5330.566665649414,
+    "y": 6361.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d7851175.526278"
+        "ff49769d.1bd52"
       ]
     ]
   },
   {
-    "id": "d7851175.526278",
+    "id": "ff49769d.1bd52",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5473.566665649414,
-    "y": 6322,
-    "z": "8bc654d2.f0dde",
+    "x": 5517.566665649414,
+    "y": 6321.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "56e3e30c.886de4"
+        "4e069c0d.3968f4"
       ]
     ]
   },
   {
-    "id": "56e3e30c.886de4",
+    "id": "4e069c0d.3968f4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5665.566665649414,
-    "y": 6325,
-    "z": "8bc654d2.f0dde",
+    "x": 5709.566665649414,
+    "y": 6324.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c0a5fdcc.0dad4"
+        "2305c4b2.be932c"
       ]
     ]
   },
   {
-    "id": "c0a5fdcc.0dad4",
+    "id": "2305c4b2.be932c",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5874.566665649414,
-    "y": 6323,
-    "z": "8bc654d2.f0dde",
+    "x": 5918.566665649414,
+    "y": 6322.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e3b520b5.76f3e",
+    "id": "c8b3b99a.24ee1",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4773.566665649414,
-    "y": 6350,
-    "z": "8bc654d2.f0dde",
+    "x": 4817.566665649414,
+    "y": 6349.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "87a0032d.5441b8"
+        "917753a8.ea741"
       ]
     ]
   },
   {
-    "id": "fa17bed2.102338",
+    "id": "bb8d3610.613d68",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4781.566665649414,
-    "y": 6243,
-    "z": "8bc654d2.f0dde",
+    "x": 4825.566665649414,
+    "y": 6242.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b854c35b.ab4dd8",
-        "6917c22f.3449c4",
-        "56393d6a.f28b34"
+        "ae57a65a.f0c818",
+        "d5c36a0.e7a9398",
+        "2780984c.5a15a"
       ]
     ]
   },
   {
-    "id": "b854c35b.ab4dd8",
+    "id": "ae57a65a.f0c818",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5017.566665649414,
-    "y": 6226,
-    "z": "8bc654d2.f0dde",
+    "x": 5061.566665649414,
+    "y": 6225.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "6917c22f.3449c4",
+    "id": "d5c36a0.e7a9398",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5014.566665649414,
-    "y": 6267,
-    "z": "8bc654d2.f0dde",
+    "x": 5058.566665649414,
+    "y": 6266.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "56393d6a.f28b34",
+    "id": "2780984c.5a15a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5028.566665649414,
-    "y": 6307,
-    "z": "8bc654d2.f0dde",
+    "x": 5072.566665649414,
+    "y": 6306.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "4394fc56.b0a524",
+    "id": "89f249f3.3e5608",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4717.566665649414,
-    "y": 6402,
-    "z": "8bc654d2.f0dde",
+    "x": 4761.566665649414,
+    "y": 6401.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c58358a8.9796d8",
+    "id": "1d656b5f.37186d",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4725.566665649414,
-    "y": 6460,
-    "z": "8bc654d2.f0dde",
+    "x": 4769.566665649414,
+    "y": 6459.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "684d5c9e.960e44",
+    "id": "9b687ead.d5262",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4730.566665649414,
-    "y": 6200,
-    "z": "8bc654d2.f0dde",
+    "x": 4774.566665649414,
+    "y": 6199.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4f9189d2.f34a8",
+    "id": "201d95ad.f7c612",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4845.566665649414,
-    "y": 6152,
-    "z": "8bc654d2.f0dde",
+    "x": 4889.566665649414,
+    "y": 6151.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b674f90b.943ea8",
+    "id": "b0b5d457.a97bd",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5020.566665649414,
-    "y": 6958,
-    "z": "8bc654d2.f0dde",
+    "x": 5064.566665649414,
+    "y": 6957.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f695cd31.082f9",
-        "a92f49c6.640148"
+        "46f9fbf7.fbe6cc",
+        "bab2d066.0ad5b"
       ]
     ]
   },
   {
-    "id": "f695cd31.082f9",
+    "id": "46f9fbf7.fbe6cc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5249.566665649414,
-    "y": 6935,
-    "z": "8bc654d2.f0dde",
+    "x": 5293.566665649414,
+    "y": 6934.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fe65cd53.d11278"
+        "66be0922.f0399"
       ]
     ]
   },
   {
-    "id": "a92f49c6.640148",
+    "id": "bab2d066.0ad5b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5249.566665649414,
-    "y": 6984,
-    "z": "8bc654d2.f0dde",
+    "x": 5293.566665649414,
+    "y": 6983.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "8c69c55b.110248",
+    "id": "646b562c.1751a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5982.566635131836,
-    "y": 6989.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6026.566635131836,
+    "y": 6989.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "aeda0706.1d102",
-        "4b6f312b.4e491",
-        "eebb4557.9c03c"
+        "898afc0c.eb00d8",
+        "1fa90257.6a5f2e",
+        "9d2bedee.a23cf"
       ]
     ]
   },
   {
-    "id": "ca7dd8b0.fcddf",
+    "id": "5bb30070.2c2c98",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6367.566635131836,
-    "y": 6952.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6411.566635131836,
+    "y": 6952.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "eebb4557.9c03c",
+    "id": "9d2bedee.a23cf",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\n\n<parameter name='operational-status' value='Modified' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6337.566635131836,
-    "y": 7012.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6381.566635131836,
+    "y": 7012.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "aeda0706.1d102",
+    "id": "898afc0c.eb00d8",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 6244.566635131836,
-    "y": 6840.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6288.566635131836,
+    "y": 6840.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6c4c0ada.7452e4",
+    "id": "e66ef561.f9598",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3980.566665649414,
-    "y": 5898,
-    "z": "8bc654d2.f0dde",
+    "x": 4024.566665649414,
+    "y": 5897.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5829dcc0.7722b4",
-        "b6d8895e.58d1b",
-        "c1456abb.063048",
-        "da4c1b48.fae9f8",
-        "778aa80b.aa4e1"
+        "526f34d0.18befc",
+        "fad64a40.999cd8",
+        "1f999717.41db99",
+        "c52167d8.94938",
+        "be5aff94.f7d12"
       ]
     ]
   },
   {
-    "id": "146e3d98.17031a",
+    "id": "55c4563d.130918",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4722.566665649414,
-    "y": 6300,
-    "z": "8bc654d2.f0dde",
+    "x": 4766.566665649414,
+    "y": 6299.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1492db48.4787f5",
+    "id": "2487bbac.e2018c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4850.566665649414,
-    "y": 6042,
-    "z": "8bc654d2.f0dde",
+    "x": 4894.566665649414,
+    "y": 6041.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "cc643bc5.4660a",
+    "id": "eef6a242.86b638",
     "type": "comment",
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "comments": "",
-    "x": 4987.566665649414,
-    "y": 5992,
-    "z": "8bc654d2.f0dde",
+    "x": 5031.566665649414,
+    "y": 5991.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "eb6eb29c.21a438",
+    "id": "9860b974.593a3",
     "type": "save",
     "name": "save ROOT UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "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",
     "comments": "",
     "outputs": 1,
-    "x": 3814.566665649414,
-    "y": 3385,
-    "z": "8bc654d2.f0dde",
+    "x": 3858.566665649414,
+    "y": 3384.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "3ddb9817.a2345",
+    "id": "c96fd773.2e2468",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3992.566635131836,
-    "y": 1619.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4036.566635131836,
+    "y": 1619.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "87712f4d.617c48",
+    "id": "e5b482c4.4ff96",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3971.566604614258,
-    "y": 2131.9999389648438,
-    "z": "8bc654d2.f0dde",
+    "x": 4015.566604614258,
+    "y": 2131.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4a9500be.eb8d5",
+    "id": "58efc802.973c9",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 3806.566665649414,
-    "y": 4006,
-    "z": "8bc654d2.f0dde",
+    "x": 3850.566665649414,
+    "y": 4005.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1cb779c6.3641ce",
+    "id": "517fe5d1.d6143c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3896.566665649414,
-    "y": 6386,
-    "z": "8bc654d2.f0dde",
+    "x": 3940.566665649414,
+    "y": 6385.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "316110e0.e54cc",
+    "id": "fa1a129b.8e1e58",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 3698.566665649414,
-    "y": 4915,
-    "z": "8bc654d2.f0dde",
+    "x": 3742.566665649414,
+    "y": 4914.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b160de6d.e8ced8",
+    "id": "8f8ab353.277fd8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3831.566665649414,
-    "y": 4963,
-    "z": "8bc654d2.f0dde",
+    "x": 3875.566665649414,
+    "y": 4962.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f0982e54.06c37",
+    "id": "6651db46.728784",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4377.566665649414,
-    "y": 4591,
-    "z": "8bc654d2.f0dde",
+    "x": 4421.566665649414,
+    "y": 4590.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c8f13ad.170ba48",
-        "e5fec2af.744f18"
+        "894780c2.49e69",
+        "859a7332.ec6f6"
       ]
     ]
   },
   {
-    "id": "c8f13ad.170ba48",
+    "id": "894780c2.49e69",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4570.566665649414,
-    "y": 4592,
-    "z": "8bc654d2.f0dde",
+    "x": 4614.566665649414,
+    "y": 4591.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7d8426b0.28b2e8"
+        "ba88b5a5.1ae688"
       ]
     ]
   },
   {
-    "id": "e5fec2af.744f18",
+    "id": "859a7332.ec6f6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4574.566665649414,
-    "y": 4636,
-    "z": "8bc654d2.f0dde",
+    "x": 4618.566665649414,
+    "y": 4635.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bbb62c5.19c455"
+        "99dc491a.da7278"
       ]
     ]
   },
   {
-    "id": "bbb62c5.19c455",
+    "id": "99dc491a.da7278",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4713.566665649414,
-    "y": 4631,
-    "z": "8bc654d2.f0dde",
+    "x": 4757.566665649414,
+    "y": 4630.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fdbb486.bd6db38",
-        "ecce0ba1.70791",
-        "5cdec210.c3723c"
+        "8cf9ac68.b6fb08",
+        "b04660b8.eae2",
+        "fb45e770.b6fb4"
       ]
     ]
   },
   {
-    "id": "7d8426b0.28b2e8",
+    "id": "ba88b5a5.1ae688",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4713.566665649414,
-    "y": 4588,
-    "z": "8bc654d2.f0dde",
+    "x": 4757.566665649414,
+    "y": 4587.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5a0b429f.b8f42c",
-        "5930a956.25a2b",
-        "8f7ba394.827068",
-        "4161f07f.2b4a78"
+        "c30363c7.dd0dc",
+        "10271018.94b4f8",
+        "285754a8.44159c",
+        "3647078f.866d7"
       ]
     ]
   },
   {
-    "id": "fdbb486.bd6db38",
+    "id": "8cf9ac68.b6fb08",
     "type": "set",
     "name": "set prop.connectivity-domainA-uuid",
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5115.566909790039,
-    "y": 4853,
-    "z": "8bc654d2.f0dde",
+    "x": 5159.566909790039,
+    "y": 4852.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1b42c685.843199",
+    "id": "f52716f7.92c318",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5122.566909790039,
-    "y": 4807,
-    "z": "8bc654d2.f0dde",
+    "x": 5166.566909790039,
+    "y": 4806.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4433eaac.652284",
+    "id": "203e33ee.d272e4",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4912.566665649414,
-    "y": 6586,
-    "z": "8bc654d2.f0dde",
+    "x": 4956.566665649414,
+    "y": 6585.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ecce0ba1.70791",
+    "id": "b04660b8.eae2",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5233.566909790039,
-    "y": 4895,
-    "z": "8bc654d2.f0dde",
+    "x": 5277.566909790039,
+    "y": 4894.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "31466e0d.9a3dba",
+    "id": "3aab431e.930194",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5108.566665649414,
-    "y": 5153,
-    "z": "8bc654d2.f0dde",
+    "x": 5152.566665649414,
+    "y": 5152.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7cb9f6d.ac734",
+    "id": "b6e6466d.f535c8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3453.566665649414,
-    "y": 4486,
-    "z": "8bc654d2.f0dde",
+    "x": 3497.566665649414,
+    "y": 4485.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9ba8b5cc.a415f",
+    "id": "eb0222bd.49b5a",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3975.566665649414,
-    "y": 4587,
-    "z": "8bc654d2.f0dde",
+    "x": 4019.566665649414,
+    "y": 4586.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "595e7f4b.3b8bd8",
+    "id": "e967635e.d5f898",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3432.566665649414,
-    "y": 4530,
-    "z": "8bc654d2.f0dde",
+    "x": 3476.566665649414,
+    "y": 4529.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2a6568f7.a02838",
-        "9843c265.208d4",
-        "db80e493.f550d"
+        "a0645295.c076d8",
+        "9cfd1461.a062b8",
+        "c3fd0eeb.1191a"
       ]
     ]
   },
   {
-    "id": "9843c265.208d4",
+    "id": "9cfd1461.a062b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3621.057632446289,
-    "y": 4498.57421875,
-    "z": "8bc654d2.f0dde",
+    "x": 3665.057632446289,
+    "y": 4498.140884399414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d1fd8036.140ed8"
+        "763a574e.7131"
       ]
     ]
   },
   {
-    "id": "db80e493.f550d",
+    "id": "c3fd0eeb.1191a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3609.566665649414,
-    "y": 4538,
-    "z": "8bc654d2.f0dde",
+    "x": 3653.566665649414,
+    "y": 4537.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b0bc7666.9d27d8"
+        "64809ae2.7e048c"
       ]
     ]
   },
   {
-    "id": "d1fd8036.140ed8",
+    "id": "763a574e.7131",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3780.629165649414,
-    "y": 4496.85986328125,
-    "z": "8bc654d2.f0dde",
+    "x": 3824.629165649414,
+    "y": 4496.426528930664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b0bc7666.9d27d8",
+    "id": "64809ae2.7e048c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3770.566665649414,
-    "y": 4539,
-    "z": "8bc654d2.f0dde",
+    "x": 3814.566665649414,
+    "y": 4538.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "aa03472e.31d4e8",
+    "id": "9a196ab1.500e98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3772.566665649414,
-    "y": 4583,
-    "z": "8bc654d2.f0dde",
+    "x": 3816.566665649414,
+    "y": 4582.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4ba9a34f.8b45e4",
-        "9ba8b5cc.a415f"
+        "6eb0cd28.22b8f4",
+        "eb0222bd.49b5a"
       ]
     ]
   },
   {
-    "id": "2a6568f7.a02838",
+    "id": "a0645295.c076d8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3614.566665649414,
-    "y": 4575,
-    "z": "8bc654d2.f0dde",
+    "x": 3658.566665649414,
+    "y": 4574.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "aa03472e.31d4e8"
+        "9a196ab1.500e98"
       ]
     ]
   },
   {
-    "id": "4ba9a34f.8b45e4",
+    "id": "6eb0cd28.22b8f4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3933.566665649414,
-    "y": 4515,
-    "z": "8bc654d2.f0dde",
+    "x": 3977.566665649414,
+    "y": 4514.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8bf8bc6f.53ce6",
+    "id": "a7e951fd.34174",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $middle-man-conn.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$middle-man-conn.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3798.566665649414,
-    "y": 4854,
-    "z": "8bc654d2.f0dde",
+    "x": 3842.566665649414,
+    "y": 4853.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d58a2a07.e32878",
+    "id": "a3ce23a7.48a0c8",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5913.449966430664,
-    "y": 6603.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5957.449966430664,
+    "y": 6603.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5cdec210.c3723c",
+    "id": "fb45e770.b6fb4",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5113.233901977539,
-    "y": 4991.08349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5157.233901977539,
+    "y": 4990.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "7d691c73.0a445c",
+    "id": "7a5a11e8.fe41c8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5115.450698852539,
-    "y": 4950.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5159.450698852539,
+    "y": 4950.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "19c788e0.a62557",
+    "id": "c5e59db3.c67ea",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4989.233657836914,
-    "y": 5241.08349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5033.233657836914,
+    "y": 5240.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b53673c2.40ae68",
+    "id": "57dbe634.714a18",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4991.450454711914,
-    "y": 5200.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5035.450454711914,
+    "y": 5200.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cb99e55a.09312",
+    "id": "aa096a62.a00c18",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5079.033462524414,
-    "y": 5603.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5123.033462524414,
+    "y": 5603.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b6bbe449.e349b8",
+    "id": "a1684c9.099dc3",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4906.033462524414,
-    "y": 5660.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 4950.033462524414,
+    "y": 5660.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9f020db8.9d3b98",
-        "42fb1006.cd98b"
+        "322ec37b.7f462c",
+        "a4688844.be2738"
       ]
     ]
   },
   {
-    "id": "9f020db8.9d3b98",
+    "id": "322ec37b.7f462c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5117.033462524414,
-    "y": 5660.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5161.033462524414,
+    "y": 5660.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "406d3b53.ee3654"
+        "32e06877.2a572"
       ]
     ]
   },
   {
-    "id": "42fb1006.cd98b",
+    "id": "a4688844.be2738",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5113.033462524414,
-    "y": 5708.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5157.033462524414,
+    "y": 5708.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fa70895e.520cf8"
+        "748c1810.be501"
       ]
     ]
   },
   {
-    "id": "406d3b53.ee3654",
+    "id": "32e06877.2a572",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5273.033462524414,
-    "y": 5656.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5317.033462524414,
+    "y": 5656.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8249d2ac.0a73f8",
-        "2838a041.93c678",
-        "45d14641.c6458"
+        "c380fc3b.e6c15",
+        "4e971f2e.5d2078",
+        "7fabceea.e8bd9"
       ]
     ]
   },
   {
-    "id": "fa70895e.520cf8",
+    "id": "748c1810.be501",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 5261.033462524414,
-    "y": 5703.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5305.033462524414,
+    "y": 5703.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f332f23.f01a81",
+    "id": "bf0ec53.d08f2b8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5582.917251586914,
-    "y": 5757.39990234375,
-    "z": "8bc654d2.f0dde",
+    "x": 5626.917251586914,
+    "y": 5756.966567993164,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "45d14641.c6458",
+    "id": "7fabceea.e8bd9",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5586.700454711914,
-    "y": 5795.60009765625,
-    "z": "8bc654d2.f0dde",
+    "x": 5630.700454711914,
+    "y": 5795.166763305664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "2838a041.93c678",
+    "id": "4e971f2e.5d2078",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5693.033462524414,
-    "y": 5708.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5737.033462524414,
+    "y": 5708.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "8249d2ac.0a73f8",
+    "id": "c380fc3b.e6c15",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5577.033462524414,
-    "y": 5656.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5621.033462524414,
+    "y": 5656.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3aa78165.d5c51e",
+    "id": "ddfb9582.3445a8",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4968.033462524414,
-    "y": 5561.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5012.033462524414,
+    "y": 5561.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5e482e7e.e4be78",
+    "id": "3c1017d1.449bb",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4680.366470336914,
-    "y": 5736.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 4724.366470336914,
+    "y": 5736.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cb99e55a.09312",
-        "b6bbe449.e349b8",
-        "5021b590.5d75e4",
-        "316a2790.87ce5"
+        "aa096a62.a00c18",
+        "a1684c9.099dc3",
+        "a4cbceb2.4df788",
+        "9c03eaae.aa875"
       ]
     ]
   },
   {
-    "id": "b03c5831.d4c5f",
+    "id": "21e17170.9d1c4e",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 4980.399673461914,
-    "y": 6097.2001953125,
-    "z": "8bc654d2.f0dde",
+    "x": 5024.399673461914,
+    "y": 6096.766860961914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b60a5a20.1568d",
+    "id": "bfe53aa3.d585a8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5786.683334350586,
-    "y": 6934.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5830.683334350586,
+    "y": 6933.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "fe65cd53.d11278",
+    "id": "66be0922.f0399",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5405.683334350586,
-    "y": 6937.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5449.683334350586,
+    "y": 6936.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b60a5a20.1568d",
-        "364f2ed4.be66d2",
-        "3daa885e.628288"
+        "bfe53aa3.d585a8",
+        "f8b29486.7e71d",
+        "bf54edf8.ad3758"
       ]
     ]
   },
   {
-    "id": "364f2ed4.be66d2",
+    "id": "f8b29486.7e71d",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5631.683334350586,
-    "y": 6989.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5675.683334350586,
+    "y": 6988.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1f12c870.4650c"
+        "45d6980.5fa0ee8"
       ]
     ]
   },
   {
-    "id": "1f12c870.4650c",
+    "id": "45d6980.5fa0ee8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5810.683334350586,
-    "y": 6988.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5854.683334350586,
+    "y": 6987.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8c69c55b.110248"
+        "646b562c.1751a8"
       ]
     ]
   },
   {
-    "id": "3daa885e.628288",
+    "id": "bf54edf8.ad3758",
     "type": "set",
     "name": "set vpnNameToSearch",
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
     "comments": "",
-    "x": 5632.683334350586,
-    "y": 6882.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5676.683334350586,
+    "y": 6881.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "651f3c1e.ddf684",
+    "id": "7c0aae65.c25f7",
     "type": "notify",
     "name": "notify",
     "xml": "<notify plugin='' resource='' action='' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2626.683334350586,
-    "y": 931.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 2670.683334350586,
+    "y": 930.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f71bee39.3d2f68",
+    "id": "c9e93381.966988",
     "type": "set",
     "name": "set network-route-three",
     "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",
     "comments": "",
-    "x": 3304.683334350586,
-    "y": 707.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3348.683334350586,
+    "y": 706.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1f090c0d.f20bac",
+    "id": "18d11d50.cb3a7b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3520.683334350586,
-    "y": 1035.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3564.683334350586,
+    "y": 1034.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "4c96009f.d63af8",
+    "id": "e2e500c.35b568",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3516.192398071289,
-    "y": 1077.542724609375,
-    "z": "8bc654d2.f0dde",
+    "x": 3560.192398071289,
+    "y": 1077.109390258789,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "30702b44.ca2744",
+    "id": "ac92425e.1b5228",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3520.192367553711,
-    "y": 1125.5426940917969,
-    "z": "8bc654d2.f0dde",
+    "x": 3564.192367553711,
+    "y": 1125.109359741211,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f0fe90c1.1ee158"
+        "74bd1e76.c1a798"
       ]
     ]
   },
   {
-    "id": "f0fe90c1.1ee158",
+    "id": "74bd1e76.c1a798",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3677.683334350586,
-    "y": 1125.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3721.683334350586,
+    "y": 1124.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "24f554c8.25b494"
+        "75cda54f.508c54"
       ]
     ]
   },
   {
-    "id": "24f554c8.25b494",
+    "id": "75cda54f.508c54",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3847.683364868164,
-    "y": 1128.1168212890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3891.683364868164,
+    "y": 1127.6834869384766,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "92b753af.8b83b",
-        "e0d04b94.0a949",
-        "3f783acd.f1212e"
+        "b5759425.3c5bd",
+        "a5689d25.4480b8",
+        "32c4f78e.6013e8"
       ]
     ]
   },
   {
-    "id": "92b753af.8b83b",
+    "id": "b5759425.3c5bd",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4021.683334350586,
-    "y": 1066.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4065.683334350586,
+    "y": 1065.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "34be9217.24bb7e"
+        "e254226b.74faf"
       ]
     ]
   },
   {
-    "id": "e0d04b94.0a949",
+    "id": "a5689d25.4480b8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4023.683334350586,
-    "y": 1120.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4067.683334350586,
+    "y": 1119.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1a5ec0d1.1d1527"
+        "b214dc3a.ed1eb8"
       ]
     ]
   },
   {
-    "id": "34be9217.24bb7e",
+    "id": "e254226b.74faf",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4149.683334350586,
-    "y": 1066.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4193.683334350586,
+    "y": 1065.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c2e9a46e.2fa128",
-        "d3171aa3.cb0078"
+        "1e63a796.08e87",
+        "c1790587.ac9f08"
       ]
     ]
   },
   {
-    "id": "1a5ec0d1.1d1527",
+    "id": "b214dc3a.ed1eb8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4152.683334350586,
-    "y": 1119.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4196.683334350586,
+    "y": 1118.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1fb8ea51.9b1c8e",
-        "b9df456c.24fc38"
+        "ea9630d6.e1db68",
+        "7cd0ca92.870d14"
       ]
     ]
   },
   {
-    "id": "d3171aa3.cb0078",
+    "id": "c1790587.ac9f08",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4310.683334350586,
-    "y": 1090.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4354.683334350586,
+    "y": 1089.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1fb8ea51.9b1c8e",
+    "id": "ea9630d6.e1db68",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4327.683334350586,
-    "y": 1132.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4371.683334350586,
+    "y": 1131.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b9df456c.24fc38",
+    "id": "7cd0ca92.870d14",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4312.683334350586,
-    "y": 1170.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4356.683334350586,
+    "y": 1169.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c2e9a46e.2fa128",
+    "id": "1e63a796.08e87",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4324.683334350586,
-    "y": 1050.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4368.683334350586,
+    "y": 1049.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "dc69c361.915968",
+    "id": "5b64a8f4.eea95",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4489.683334350586,
-    "y": 1066.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4533.683334350586,
+    "y": 1065.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6cb3b80a.d81b1",
+    "id": "5fc9799.82ba788",
     "type": "save",
     "name": "get network-route-three from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
     "comments": "",
     "outputs": 1,
-    "x": 3280.683334350586,
-    "y": 1052.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3324.683334350586,
+    "y": 1051.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1f090c0d.f20bac",
-        "4c96009f.d63af8",
-        "30702b44.ca2744"
+        "18d11d50.cb3a7b",
+        "e2e500c.35b568",
+        "ac92425e.1b5228"
       ]
     ]
   },
   {
-    "id": "3f783acd.f1212e",
+    "id": "32c4f78e.6013e8",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3966.683334350586,
-    "y": 1184.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4010.683334350586,
+    "y": 1183.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ce69203c.a7c0d"
+        "e8d5048b.eb9908"
       ]
     ]
   },
   {
-    "id": "ce69203c.a7c0d",
+    "id": "e8d5048b.eb9908",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4140.683334350586,
-    "y": 1179.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4184.683334350586,
+    "y": 1178.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "77a19b24.92e3d4",
-        "6c3b4ea8.3b622"
+        "cbdde789.933e38",
+        "ff9c265d.ccb66"
       ]
     ]
   },
   {
-    "id": "6c3b4ea8.3b622",
+    "id": "ff9c265d.ccb66",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4310.683334350586,
-    "y": 1252.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4354.683334350586,
+    "y": 1251.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "77a19b24.92e3d4",
+    "id": "cbdde789.933e38",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4364.683334350586,
-    "y": 1212.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4408.683334350586,
+    "y": 1211.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a7c6adcc.5c3908",
+    "id": "fa28f519.9b734",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4478.683334350586,
-    "y": 1237.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4522.683334350586,
+    "y": 1236.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cb966d3f.bcf358",
+    "id": "65095290.735c7c",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4037.683334350586,
-    "y": 940.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4081.683334350586,
+    "y": 939.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "359af935.19ef46"
+        "6a27287d.2ebf6"
       ]
     ]
   },
   {
-    "id": "ca572ac1.2b94f8",
+    "id": "d7809ac8.28364",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4381.683334350586,
-    "y": 1008.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4425.683334350586,
+    "y": 1007.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "60fff9bd.2ccfe",
+    "id": "38b369ba.8d91fe",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4435.683334350586,
-    "y": 968.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4479.683334350586,
+    "y": 967.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "74e2fab5.3910b4",
+    "id": "7d1c2c8b.bd9814",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4579.683334350586,
-    "y": 997.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4623.683334350586,
+    "y": 996.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "359af935.19ef46",
+    "id": "6a27287d.2ebf6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4211.683334350586,
-    "y": 935.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4255.683334350586,
+    "y": 934.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "60fff9bd.2ccfe",
-        "ca572ac1.2b94f8"
+        "38b369ba.8d91fe",
+        "d7809ac8.28364"
       ]
     ]
   },
   {
-    "id": "dd62b4eb.26fb1",
+    "id": "b03ebc69.8e68d8",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4097.683334350586,
-    "y": 678.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4141.683334350586,
+    "y": 677.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "eaab099.c2c5e78"
+        "e58f35e3.4b6a2"
       ]
     ]
   },
   {
-    "id": "44f31aac.78bf4c",
+    "id": "6a2c136e.692edc",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4441.683334350586,
-    "y": 746.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4485.683334350586,
+    "y": 745.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e00b5614.1b212",
+    "id": "66ae94b1.018af4",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4495.683334350586,
-    "y": 706.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4539.683334350586,
+    "y": 705.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fb8145.224d2eb8",
+    "id": "33be367d.fbce62",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4609.683334350586,
-    "y": 731.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4653.683334350586,
+    "y": 730.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "eaab099.c2c5e78",
+    "id": "e58f35e3.4b6a2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4271.683334350586,
-    "y": 673.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4315.683334350586,
+    "y": 672.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e00b5614.1b212",
-        "44f31aac.78bf4c"
+        "66ae94b1.018af4",
+        "6a2c136e.692edc"
       ]
     ]
   },
   {
-    "id": "47b6d6c0.771098",
+    "id": "64cdb464.83135c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3678.683334350586,
-    "y": 2555.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3722.683334350586,
+    "y": 2554.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d5c762a3.e1b22",
-        "cd80f814.c17fb8"
+        "7a3829d.42a01d8",
+        "d03e5e53.5cee58"
       ]
     ]
   },
   {
-    "id": "6a53c92c.c39ad8",
+    "id": "6e42edd4.58cd0c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3506.016830444336,
-    "y": 2556.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3550.016830444336,
+    "y": 2555.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "47b6d6c0.771098"
+        "64cdb464.83135c"
       ]
     ]
   },
   {
-    "id": "15ee64d.915489b",
+    "id": "b61e07a3.0e4238",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3515.507797241211,
-    "y": 2598.690704345703,
-    "z": "8bc654d2.f0dde",
+    "x": 3559.507797241211,
+    "y": 2598.257369995117,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ffc72b13.54b308",
+    "id": "2df3a08e.41f4c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3504.016830444336,
-    "y": 2645.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3548.016830444336,
+    "y": 2644.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d5c762a3.e1b22",
+    "id": "7a3829d.42a01d8",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3965.016830444336,
-    "y": 2559.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4009.016830444336,
+    "y": 2558.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "39f97b3f.483dec",
-        "a10b377c.8904d8"
+        "38c64779.e618f",
+        "14f81708.27e459"
       ]
     ]
   },
   {
-    "id": "a10b377c.8904d8",
+    "id": "14f81708.27e459",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4188.016830444336,
-    "y": 2514.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4232.016830444336,
+    "y": 2513.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1c79745.54c4b0c"
+        "2753f3be.c9c924"
       ]
     ]
   },
   {
-    "id": "39f97b3f.483dec",
+    "id": "38c64779.e618f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4190.016830444336,
-    "y": 2578.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4234.016830444336,
+    "y": 2577.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5e26eb53.994624"
+        "43ad3093.31a088"
       ]
     ]
   },
   {
-    "id": "59ced5c4.1cbb54",
+    "id": "9fbb56ee.c43378",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3278.016830444336,
-    "y": 2591.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3322.016830444336,
+    "y": 2590.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6a53c92c.c39ad8",
-        "15ee64d.915489b",
-        "ffc72b13.54b308"
+        "6e42edd4.58cd0c",
+        "b61e07a3.0e4238",
+        "2df3a08e.41f4c"
       ]
     ]
   },
   {
-    "id": "bf53a639.73b6d8",
+    "id": "ac1718b4.765b78",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3239.016830444336,
-    "y": 2535.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3283.016830444336,
+    "y": 2534.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7411f30.15b1c8c",
+    "id": "7ebd6769.0b5428",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3298.016830444336,
-    "y": 2331.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3342.016830444336,
+    "y": 2330.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dd801267.ae8a78",
-        "2c468159.26cb9e"
+        "2f0a58a8.ee7038",
+        "79cdcb97.546894"
       ]
     ]
   },
   {
-    "id": "2c468159.26cb9e",
+    "id": "79cdcb97.546894",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3521.016830444336,
-    "y": 2317.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3565.016830444336,
+    "y": 2316.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1f5c2f54.7e50d9"
+        "49eedb67.f00374"
       ]
     ]
   },
   {
-    "id": "dd801267.ae8a78",
+    "id": "2f0a58a8.ee7038",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3523.016830444336,
-    "y": 2350.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3567.016830444336,
+    "y": 2349.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "1f5c2f54.7e50d9",
+    "id": "49eedb67.f00374",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3669.016830444336,
-    "y": 2310.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3713.016830444336,
+    "y": 2309.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "33d7ee91.be9492",
-        "2cd16653.cccd12"
+        "f5d93681.391ea",
+        "66937670.413898"
       ]
     ]
   },
   {
-    "id": "33d7ee91.be9492",
+    "id": "f5d93681.391ea",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3863.016830444336,
-    "y": 2313.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 3907.016830444336,
+    "y": 2312.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cd80f814.c17fb8",
+    "id": "d03e5e53.5cee58",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3916.016799926758,
-    "y": 2682.1166381835938,
-    "z": "8bc654d2.f0dde",
+    "x": 3960.016799926758,
+    "y": 2681.683303833008,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f197c90a.b0bfd8"
+        "1dfcba6a.928896"
       ]
     ]
   },
   {
-    "id": "f197c90a.b0bfd8",
+    "id": "1dfcba6a.928896",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4122.016799926758,
-    "y": 2682.1166381835938,
-    "z": "8bc654d2.f0dde",
+    "x": 4166.016799926758,
+    "y": 2681.683303833008,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ee87c14f.7e00c8"
+        "ad7b62a1.1a3de8"
       ]
     ]
   },
   {
-    "id": "2cd16653.cccd12",
+    "id": "66937670.413898",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3885.016830444336,
-    "y": 2381.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 3929.016830444336,
+    "y": 2380.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b86ed6f1.7f482",
-        "f1a441ce.e5665",
-        "de4f03bc.b1dad"
+        "7e1c1529.6f1464",
+        "e1251115.be77b",
+        "d084db0e.513758"
       ]
     ]
   },
   {
-    "id": "b86ed6f1.7f482",
+    "id": "7e1c1529.6f1464",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.5169525146484,
-    "y": 2333.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4124.516952514648,
+    "y": 2332.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4728dd3.dc78424"
+        "24a5d36d.06630c"
       ]
     ]
   },
   {
-    "id": "f1a441ce.e5665",
+    "id": "e1251115.be77b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4072.5169525146484,
-    "y": 2388.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4116.516952514648,
+    "y": 2387.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "250a014d.a07c5e"
+        "e4759099.9196a"
       ]
     ]
   },
   {
-    "id": "de4f03bc.b1dad",
+    "id": "d084db0e.513758",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4077.5169525146484,
-    "y": 2445.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4121.516952514648,
+    "y": 2444.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c4850afb.039ba"
+        "68e5ccfb.96ac94"
       ]
     ]
   },
   {
-    "id": "c4850afb.039ba",
+    "id": "68e5ccfb.96ac94",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4229.516952514648,
-    "y": 2446.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4273.516952514648,
+    "y": 2445.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4728dd3.dc78424",
+    "id": "24a5d36d.06630c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4224.899276733398,
-    "y": 2330.7724609375,
-    "z": "8bc654d2.f0dde",
+    "x": 4268.899276733398,
+    "y": 2330.339126586914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f5f74636.92701"
+        "b2ff1ea.8d4406"
       ]
     ]
   },
   {
-    "id": "b2338e3d.f752e8",
+    "id": "387e5bde.fd50e4",
     "type": "set",
     "name": "set SECONDARY-ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
     "comments": "",
-    "x": 3300.683334350586,
-    "y": 2670.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3344.683334350586,
+    "y": 2669.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b3bc28cb.23625",
+    "id": "4cfd3be4.f62fcc",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3975.683303833008,
-    "y": 2634.1166381835938,
-    "z": "8bc654d2.f0dde",
+    "x": 4019.683303833008,
+    "y": 2633.683303833008,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5e26eb53.994624",
+    "id": "43ad3093.31a088",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4349.016830444336,
-    "y": 2597.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4393.016830444336,
+    "y": 2596.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1c79745.54c4b0c",
+    "id": "2753f3be.c9c924",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4353.016830444336,
-    "y": 2511.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4397.016830444336,
+    "y": 2510.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fe7cdeb0.daac9",
-        "34c0d4b1.5c7dfc"
+        "a6bf1231.b0b2f8",
+        "b6449bb5.90e018"
       ]
     ]
   },
   {
-    "id": "ee87c14f.7e00c8",
+    "id": "ad7b62a1.1a3de8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4339.302444458008,
-    "y": 2680.9384155273438,
-    "z": "8bc654d2.f0dde",
+    "x": 4383.302444458008,
+    "y": 2680.505081176758,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fc8a72d4.98e42"
+        "e5d22111.f520c"
       ]
     ]
   },
   {
-    "id": "250a014d.a07c5e",
+    "id": "e4759099.9196a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4240.516952514648,
-    "y": 2391.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4284.516952514648,
+    "y": 2390.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fe7cdeb0.daac9",
+    "id": "a6bf1231.b0b2f8",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
     "comments": "",
-    "x": 4523.016830444336,
-    "y": 2472.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4567.016830444336,
+    "y": 2471.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "34c0d4b1.5c7dfc",
+    "id": "b6449bb5.90e018",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
     "comments": "",
-    "x": 4524.016830444336,
-    "y": 2577.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4568.016830444336,
+    "y": 2576.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6a8cd207.c1e8c4",
+    "id": "2544beb5.524cf2",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4519.016830444336,
-    "y": 2526.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4563.016830444336,
+    "y": 2525.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fc8a72d4.98e42",
+    "id": "e5d22111.f520c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4546.133987426758,
-    "y": 2670.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4590.133987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8f4cacd5.ce6228",
-        "4e56644.a64779c",
-        "68f649.e92691b8"
+        "387e5354.258eec",
+        "d91f6407.9298c8",
+        "8a12363d.8f67b8"
       ]
     ]
   },
   {
-    "id": "8f4cacd5.ce6228",
+    "id": "387e5354.258eec",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4761.133987426758,
-    "y": 2632.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4805.133987426758,
+    "y": 2632.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4e56644.a64779c",
+    "id": "d91f6407.9298c8",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4758.133987426758,
-    "y": 2671.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4802.133987426758,
+    "y": 2671.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9a6ae8ae.1adf3"
+        "824c0ca3.93f64"
       ]
     ]
   },
   {
-    "id": "68f649.e92691b8",
+    "id": "8a12363d.8f67b8",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4713.633987426758,
-    "y": 2713.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4757.633987426758,
+    "y": 2713.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d8d22b92.e3f9c8",
+    "id": "b23c99bf.cf2e8",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4807.016830444336,
-    "y": 2349.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4851.016830444336,
+    "y": 2348.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8d5de697.738fb"
+        "97206b42.8c742"
       ]
     ]
   },
   {
-    "id": "f5f74636.92701",
+    "id": "b2ff1ea.8d4406",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4409.016830444336,
-    "y": 2345.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4453.016830444336,
+    "y": 2344.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "458de584.eb17d4"
+        "3bc9e41b.32e2f4"
       ]
     ]
   },
   {
-    "id": "458de584.eb17d4",
+    "id": "3bc9e41b.32e2f4",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4604.016830444336,
-    "y": 2345.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4648.016830444336,
+    "y": 2344.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d8d22b92.e3f9c8",
-        "aa17b1cc.ebb808"
+        "b23c99bf.cf2e8",
+        "c333a868.fb119"
       ]
     ]
   },
   {
-    "id": "aa17b1cc.ebb808",
+    "id": "c333a868.fb119",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4809.016830444336,
-    "y": 2422.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4853.016830444336,
+    "y": 2421.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "74ed71f8.f337d8"
+        "bd453b0b.71f93"
       ]
     ]
   },
   {
-    "id": "9a6ae8ae.1adf3",
+    "id": "824c0ca3.93f64",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4938.633987426758,
-    "y": 2670.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4982.633987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "48cbb65c.c75f18"
+        "95206ee6.94dd"
       ]
     ]
   },
   {
-    "id": "48cbb65c.c75f18",
+    "id": "95206ee6.94dd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5096.633987426758,
-    "y": 2670.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 5140.633987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5d1f9a1.a44f9e4"
+        "a1087d28.90e2f"
       ]
     ]
   },
   {
-    "id": "5d1f9a1.a44f9e4",
+    "id": "a1087d28.90e2f",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5303.633987426758,
-    "y": 2670.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 5347.633987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8d5de697.738fb",
+    "id": "97206b42.8c742",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4984.016830444336,
-    "y": 2341.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5028.016830444336,
+    "y": 2340.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "557f2b2a.e4488c",
-        "b7eb9cb4.7bd228"
+        "4cfed3d4.2e715c",
+        "b3c82e8a.c152c"
       ]
     ]
   },
   {
-    "id": "b7eb9cb4.7bd228",
+    "id": "b3c82e8a.c152c",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5192.016830444336,
-    "y": 2348.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5236.016830444336,
+    "y": 2347.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2cc0f80f.8e664",
-        "e33c4c36.9c6408",
-        "decf6255.02de4"
+        "c3765dd7.98e19",
+        "82480139.31c848",
+        "da19380a.5cc67"
       ]
     ]
   },
   {
-    "id": "74ed71f8.f337d8",
+    "id": "bd453b0b.71f93",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4986.016830444336,
-    "y": 2414.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5030.016830444336,
+    "y": 2413.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ddc00f08.8fee3"
+        "14471967.2bb00f"
       ]
     ]
   },
   {
-    "id": "557f2b2a.e4488c",
+    "id": "4cfed3d4.2e715c",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainC id",
     "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5222.016830444336,
-    "y": 2296.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5266.016830444336,
+    "y": 2295.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ddc00f08.8fee3",
+    "id": "14471967.2bb00f",
     "type": "set",
     "name": "set domainC ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5221.016830444336,
-    "y": 2538.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5265.016830444336,
+    "y": 2537.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2cc0f80f.8e664",
+    "id": "c3765dd7.98e19",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5402.016830444336,
-    "y": 2339.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5446.016830444336,
+    "y": 2338.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "aada8b04.37bbe"
+        "eb76aab.05915d8"
       ]
     ]
   },
   {
-    "id": "e33c4c36.9c6408",
+    "id": "82480139.31c848",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5394.016830444336,
-    "y": 2394.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5438.016830444336,
+    "y": 2393.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "52b0fc34.6385e4"
+        "3c8ef50f.dc9d5a"
       ]
     ]
   },
   {
-    "id": "decf6255.02de4",
+    "id": "da19380a.5cc67",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5399.016830444336,
-    "y": 2451.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5443.016830444336,
+    "y": 2450.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1d0f9aee.0f2085"
+        "11ed4dc4.069aca"
       ]
     ]
   },
   {
-    "id": "1d0f9aee.0f2085",
+    "id": "11ed4dc4.069aca",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5551.016830444336,
-    "y": 2452.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5595.016830444336,
+    "y": 2451.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "52b0fc34.6385e4",
+    "id": "3c8ef50f.dc9d5a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5562.016830444336,
-    "y": 2397.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5606.016830444336,
+    "y": 2396.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "aada8b04.37bbe",
+    "id": "eb76aab.05915d8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5546.399154663086,
-    "y": 2336.7724609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5590.399154663086,
+    "y": 2336.339126586914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b0a8403b.df77f8"
+        "57675f66.16eb5"
       ]
     ]
   },
   {
-    "id": "b0a8403b.df77f8",
+    "id": "57675f66.16eb5",
     "type": "set",
     "name": "set controller domainC data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5761.016830444336,
-    "y": 2333.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5805.016830444336,
+    "y": 2332.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8b07e19d.5f94",
+    "id": "a78822a6.5321b",
     "type": "switchNode",
     "name": "switch secondary empty?",
     "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3274.683334350586,
-    "y": 806.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3318.683334350586,
+    "y": 805.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ba76d6d3.05fe9",
-        "fe627d30.e07a9"
+        "ee3317c4.be6f98",
+        "785558d0.46aa7"
       ]
     ]
   },
   {
-    "id": "ba76d6d3.05fe9",
+    "id": "ee3317c4.be6f98",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3396.683364868164,
-    "y": 751.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 3440.683364868164,
+    "y": 750.6833648681641,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "aae22e84.83191"
+        "b70329ff.3ba71"
       ]
     ]
   },
   {
-    "id": "fe627d30.e07a9",
+    "id": "785558d0.46aa7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3383.683364868164,
-    "y": 860.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 3427.683364868164,
+    "y": 859.6833648681641,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "652bcf4e.b1513"
+        "e7d34a7a.6aac6"
       ]
     ]
   },
   {
-    "id": "aae22e84.83191",
+    "id": "b70329ff.3ba71",
     "type": "set",
     "name": "set hasSecondary false",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
     "comments": "",
-    "x": 3611.683334350586,
-    "y": 588.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3655.683334350586,
+    "y": 587.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "652bcf4e.b1513",
+    "id": "e7d34a7a.6aac6",
     "type": "set",
     "name": "set hasSecondary true",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 3607.683334350586,
-    "y": 632.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3651.683334350586,
+    "y": 631.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8877dbf4.9fef7",
+    "id": "3cc87f7.3864a",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3804.683364868164,
-    "y": 3532.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 3848.683364868164,
+    "y": 3531.683364868164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8a807ecd.e2d688"
+        "f7171cc6.827928"
       ]
     ]
   },
   {
-    "id": "8a807ecd.e2d688",
+    "id": "f7171cc6.827928",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3995.683364868164,
-    "y": 3536.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 4039.683364868164,
+    "y": 3535.683364868164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "157127d1.cb4078"
+        "27271b87.886184"
       ]
     ]
   },
   {
-    "id": "157127d1.cb4078",
+    "id": "27271b87.886184",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4122.683364868164,
-    "y": 3535.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 4166.683364868164,
+    "y": 3534.683364868164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "75df7ed7.bf083",
-        "34e17ebd.74d332"
+        "90e47ea0.ecee8",
+        "8a6c8ced.8f741"
       ]
     ]
   },
   {
-    "id": "34e17ebd.74d332",
+    "id": "8a6c8ced.8f741",
     "type": "save",
     "name": "save SECONDARY-ROOT UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "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",
     "comments": "",
     "outputs": 1,
-    "x": 4344.683364868164,
-    "y": 3424.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 4388.683364868164,
+    "y": 3423.683364868164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "877b276.88c73d8",
+    "id": "a4c94b0b.1b4718",
     "type": "set",
     "name": "unset secondary related variables",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
     "comments": "",
-    "x": 3349.566665649414,
-    "y": 464,
-    "z": "8bc654d2.f0dde",
+    "x": 3393.566665649414,
+    "y": 463.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "75df7ed7.bf083",
+    "id": "90e47ea0.ecee8",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4340.566665649414,
-    "y": 3483,
-    "z": "8bc654d2.f0dde",
+    "x": 4384.566665649414,
+    "y": 3482.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "298158e5.1b02b8",
-        "8816a027.c5ad7"
+        "61b6ba56.719bdc",
+        "226a53c4.28be4c"
       ]
     ]
   },
   {
-    "id": "298158e5.1b02b8",
+    "id": "61b6ba56.719bdc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4550.566665649414,
-    "y": 3460,
-    "z": "8bc654d2.f0dde",
+    "x": 4594.566665649414,
+    "y": 3459.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2754d16a.8d72ae"
+        "3f2dca65.c993b6"
       ]
     ]
   },
   {
-    "id": "2754d16a.8d72ae",
+    "id": "3f2dca65.c993b6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4676.566665649414,
-    "y": 3460,
-    "z": "8bc654d2.f0dde",
+    "x": 4720.566665649414,
+    "y": 3459.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1ec26074.15dbf"
+        "812380f1.94aae8"
       ]
     ]
   },
   {
-    "id": "7bc2899d.3cc8d",
+    "id": "32cc56e4.b47402",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4681.566665649414,
-    "y": 3509,
-    "z": "8bc654d2.f0dde",
+    "x": 4725.566665649414,
+    "y": 3508.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4336d7d0.b3e05",
-        "60df6ba0.591fdc",
-        "73d9646c.b91d7c",
-        "81cba3c.9ee8de"
+        "7de42311.cfc97c",
+        "94a4f684.655798",
+        "9102db37.03feb",
+        "168bc7a3.f57628"
       ]
     ]
   },
   {
-    "id": "8816a027.c5ad7",
+    "id": "226a53c4.28be4c",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4555.566665649414,
-    "y": 3509,
-    "z": "8bc654d2.f0dde",
+    "x": 4599.566665649414,
+    "y": 3508.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7bc2899d.3cc8d"
+        "32cc56e4.b47402"
       ]
     ]
   },
   {
-    "id": "1ec26074.15dbf",
+    "id": "812380f1.94aae8",
     "type": "save",
     "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5004.566665649414,
-    "y": 3457,
-    "z": "8bc654d2.f0dde",
+    "x": 5048.566665649414,
+    "y": 3456.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "4336d7d0.b3e05",
+    "id": "7de42311.cfc97c",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainC",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4957.566665649414,
-    "y": 3548,
-    "z": "8bc654d2.f0dde",
+    "x": 5001.566665649414,
+    "y": 3547.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "60df6ba0.591fdc",
+    "id": "94a4f684.655798",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4905.566665649414,
-    "y": 3590,
-    "z": "8bc654d2.f0dde",
+    "x": 4949.566665649414,
+    "y": 3589.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "73d9646c.b91d7c",
+    "id": "9102db37.03feb",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5034.566665649414,
-    "y": 3632,
-    "z": "8bc654d2.f0dde",
+    "x": 5078.566665649414,
+    "y": 3631.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "63767aff.e83474",
+    "id": "3c0b7ceb.8c4ecc",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 4920.566665649414,
-    "y": 3505,
-    "z": "8bc654d2.f0dde",
+    "x": 4964.566665649414,
+    "y": 3504.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "81cba3c.9ee8de",
+    "id": "168bc7a3.f57628",
     "type": "save",
     "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5012.566665649414,
-    "y": 3680,
-    "z": "8bc654d2.f0dde",
+    "x": 5056.566665649414,
+    "y": 3679.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "238550a0.c6cd18",
+    "id": "54d0b322.54c85c",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3832.566665649414,
-    "y": 3483,
-    "z": "8bc654d2.f0dde",
+    "x": 3876.566665649414,
+    "y": 3482.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "374b533b.d2c934",
+    "id": "5fefabc6.f62f5c",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3807.566665649414,
-    "y": 4154,
-    "z": "8bc654d2.f0dde",
+    "x": 3851.566665649414,
+    "y": 4153.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "42d7b44a.367424"
+        "b4ef06b7.1fe62"
       ]
     ]
   },
   {
-    "id": "42d7b44a.367424",
+    "id": "b4ef06b7.1fe62",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3999.566665649414,
-    "y": 4149,
-    "z": "8bc654d2.f0dde",
+    "x": 4043.566665649414,
+    "y": 4148.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "aa122d60.47dec8"
+        "815df3f1.7eb0f"
       ]
     ]
   },
   {
-    "id": "aa122d60.47dec8",
+    "id": "815df3f1.7eb0f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4128.566665649414,
-    "y": 4149,
-    "z": "8bc654d2.f0dde",
+    "x": 4172.566665649414,
+    "y": 4148.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bc496cc4.1ac428"
+        "67264e9c.83602"
       ]
     ]
   },
   {
-    "id": "bc496cc4.1ac428",
+    "id": "67264e9c.83602",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4460.566665649414,
-    "y": 4147,
-    "z": "8bc654d2.f0dde",
+    "x": 4504.566665649414,
+    "y": 4146.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e008f489.a45f08",
+    "id": "dbd95dbb.cf097",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3795.566665649414,
-    "y": 4378,
-    "z": "8bc654d2.f0dde",
+    "x": 3839.566665649414,
+    "y": 4377.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7e1de7f3.95bcb"
+        "aef64578.f3199"
       ]
     ]
   },
   {
-    "id": "7e1de7f3.95bcb",
+    "id": "aef64578.f3199",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3975.566665649414,
-    "y": 4377,
-    "z": "8bc654d2.f0dde",
+    "x": 4019.566665649414,
+    "y": 4376.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5cd7b855.2a4ef"
+        "9830e38b.25b19"
       ]
     ]
   },
   {
-    "id": "5cd7b855.2a4ef",
+    "id": "9830e38b.25b19",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4104.566665649414,
-    "y": 4377,
-    "z": "8bc654d2.f0dde",
+    "x": 4148.566665649414,
+    "y": 4376.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e3d19dba.c0bd7"
+        "7d4e5c3a.fc6a0c"
       ]
     ]
   },
   {
-    "id": "e3d19dba.c0bd7",
+    "id": "7d4e5c3a.fc6a0c",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4322.449966430664,
-    "y": 4375.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 4366.449966430664,
+    "y": 4375.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "53c7d161.8eb9"
+        "1e59b518.b0bee3"
       ]
     ]
   },
   {
-    "id": "53c7d161.8eb9",
+    "id": "1e59b518.b0bee3",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4537.449966430664,
-    "y": 4375.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 4581.449966430664,
+    "y": 4375.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fbe01cc.5b1afe"
+        "40af1183.5043e"
       ]
     ]
   },
   {
-    "id": "fbe01cc.5b1afe",
+    "id": "40af1183.5043e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4669.449966430664,
-    "y": 4375.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 4713.449966430664,
+    "y": 4375.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2bf4a87a.e670f8"
+        "9532f45e.79d66"
       ]
     ]
   },
   {
-    "id": "2bf4a87a.e670f8",
+    "id": "9532f45e.79d66",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5033.566665649414,
-    "y": 4375,
-    "z": "8bc654d2.f0dde",
+    "x": 5077.566665649414,
+    "y": 4374.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e2222c.7b917dd",
+    "id": "147222b6.72d4a5",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3470.566665649414,
-    "y": 4633,
-    "z": "8bc654d2.f0dde",
+    "x": 3514.566665649414,
+    "y": 4632.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "99a3a0e8.0b0e08"
+        "adad110b.2a8008"
       ]
     ]
   },
   {
-    "id": "99a3a0e8.0b0e08",
+    "id": "adad110b.2a8008",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3650.566665649414,
-    "y": 4632,
-    "z": "8bc654d2.f0dde",
+    "x": 3694.566665649414,
+    "y": 4631.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "34a5a7ab.8782f"
+        "b9b6357c.7dc958"
       ]
     ]
   },
   {
-    "id": "34a5a7ab.8782f",
+    "id": "b9b6357c.7dc958",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3779.566665649414,
-    "y": 4632,
-    "z": "8bc654d2.f0dde",
+    "x": 3823.566665649414,
+    "y": 4631.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "41dd40eb.c66e7"
+        "883d53e4.0057c"
       ]
     ]
   },
   {
-    "id": "1e73a5a2.1f85da",
+    "id": "8f1b73bf.36d998",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3515.566665649414,
-    "y": 4691,
-    "z": "8bc654d2.f0dde",
+    "x": 3559.566665649414,
+    "y": 4690.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d18a7342.6feac8",
+    "id": "f9162d4b.d76cb",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4081.566665649414,
-    "y": 4790,
-    "z": "8bc654d2.f0dde",
+    "x": 4125.566665649414,
+    "y": 4789.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "41dd40eb.c66e7",
+    "id": "883d53e4.0057c",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3545.566665649414,
-    "y": 4724,
-    "z": "8bc654d2.f0dde",
+    "x": 3589.566665649414,
+    "y": 4723.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f4cc70f5.9b6bc",
-        "ce8af9cd.332b9",
-        "130dfbc3.4a6c5c"
+        "a081e505.7d3b8",
+        "370b0cd4.1d67f4",
+        "3bb246d3.6b0eb2"
       ]
     ]
   },
   {
-    "id": "ce8af9cd.332b9",
+    "id": "370b0cd4.1d67f4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3727.057632446289,
-    "y": 4701.57421875,
-    "z": "8bc654d2.f0dde",
+    "x": 3771.057632446289,
+    "y": 4701.140884399414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3c80b807.6a4d88"
+        "21a39fa9.8cdbc"
       ]
     ]
   },
   {
-    "id": "130dfbc3.4a6c5c",
+    "id": "3bb246d3.6b0eb2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3715.566665649414,
-    "y": 4741,
-    "z": "8bc654d2.f0dde",
+    "x": 3759.566665649414,
+    "y": 4740.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c80f59b7.c8277"
+        "3acf6433.2f683c"
       ]
     ]
   },
   {
-    "id": "3c80b807.6a4d88",
+    "id": "21a39fa9.8cdbc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3886.629165649414,
-    "y": 4699.85986328125,
-    "z": "8bc654d2.f0dde",
+    "x": 3930.629165649414,
+    "y": 4699.426528930664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c80f59b7.c8277",
+    "id": "3acf6433.2f683c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3876.566665649414,
-    "y": 4742,
-    "z": "8bc654d2.f0dde",
+    "x": 3920.566665649414,
+    "y": 4741.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "96ee8bec.e5c4a8",
+    "id": "c435208e.fb61a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3878.566665649414,
-    "y": 4786,
-    "z": "8bc654d2.f0dde",
+    "x": 3922.566665649414,
+    "y": 4785.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "60b9b66c.eef658",
-        "d18a7342.6feac8"
+        "6438caae.bf37d4",
+        "f9162d4b.d76cb"
       ]
     ]
   },
   {
-    "id": "f4cc70f5.9b6bc",
+    "id": "a081e505.7d3b8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3720.566665649414,
-    "y": 4778,
-    "z": "8bc654d2.f0dde",
+    "x": 3764.566665649414,
+    "y": 4777.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "96ee8bec.e5c4a8"
+        "c435208e.fb61a8"
       ]
     ]
   },
   {
-    "id": "60b9b66c.eef658",
+    "id": "6438caae.bf37d4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4039.566665649414,
-    "y": 4718,
-    "z": "8bc654d2.f0dde",
+    "x": 4083.566665649414,
+    "y": 4717.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "eedd5a70.956fd8",
+    "id": "3f5c519e.52fcfe",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4405.566665649414,
-    "y": 5286,
-    "z": "8bc654d2.f0dde",
+    "x": 4449.566665649414,
+    "y": 5285.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "76d94500.85b34c",
+    "id": "128b476.c3c24b9",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4560.566665649414,
-    "y": 5327,
-    "z": "8bc654d2.f0dde",
+    "x": 4604.566665649414,
+    "y": 5326.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "5f94b51d.236064",
+    "id": "ef90095c.80a978",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5003.566665649414,
-    "y": 5375,
-    "z": "8bc654d2.f0dde",
+    "x": 5047.566665649414,
+    "y": 5374.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "66bf889f.a4f118",
+    "id": "b1e27ce1.629f7",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4376.566665649414,
-    "y": 5385,
-    "z": "8bc654d2.f0dde",
+    "x": 4420.566665649414,
+    "y": 5384.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b509f4ce.23c808",
-        "425be1a9.ccccd8"
+        "6c93874b.ea46a8",
+        "a48ce649.08b9f8"
       ]
     ]
   },
   {
-    "id": "b509f4ce.23c808",
+    "id": "6c93874b.ea46a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4612.566665649414,
-    "y": 5369,
-    "z": "8bc654d2.f0dde",
+    "x": 4656.566665649414,
+    "y": 5368.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1cce9d9d.44252a"
+        "2bac874c.98bee"
       ]
     ]
   },
   {
-    "id": "1cce9d9d.44252a",
+    "id": "2bac874c.98bee",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4756.566665649414,
-    "y": 5371,
-    "z": "8bc654d2.f0dde",
+    "x": 4800.566665649414,
+    "y": 5370.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5f94b51d.236064",
-        "efe8a2f7.303938",
-        "b992a481.10f3f"
+        "ef90095c.80a978",
+        "900ede93.5cfd68",
+        "c9e4ee74.f1da1"
       ]
     ]
   },
   {
-    "id": "425be1a9.ccccd8",
+    "id": "a48ce649.08b9f8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4611.566665649414,
-    "y": 5417,
-    "z": "8bc654d2.f0dde",
+    "x": 4655.566665649414,
+    "y": 5416.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "efe8a2f7.303938",
+    "id": "900ede93.5cfd68",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5124.566665649414,
-    "y": 5422,
-    "z": "8bc654d2.f0dde",
+    "x": 5168.566665649414,
+    "y": 5421.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b992a481.10f3f",
+    "id": "c9e4ee74.f1da1",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5006.233657836914,
-    "y": 5507.08349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5050.233657836914,
+    "y": 5506.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "3dbfccd3.2b6904",
+    "id": "80a5d0bc.394668",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5007.450454711914,
-    "y": 5465.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5051.450454711914,
+    "y": 5465.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c4e3627c.f5b198",
+    "id": "7af1ce17.a2c558",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5538.566665649414,
-    "y": 5854,
-    "z": "8bc654d2.f0dde",
+    "x": 5582.566665649414,
+    "y": 5853.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "316a2790.87ce5",
+    "id": "9c03eaae.aa875",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4911.566665649414,
-    "y": 5864,
-    "z": "8bc654d2.f0dde",
+    "x": 4955.566665649414,
+    "y": 5863.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2b91cb0d.4b878c",
-        "b9e860d6.0863a"
+        "c8852cc.de0315",
+        "d3e42d04.fd0a28"
       ]
     ]
   },
   {
-    "id": "2b91cb0d.4b878c",
+    "id": "c8852cc.de0315",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5144.566665649414,
-    "y": 5858,
-    "z": "8bc654d2.f0dde",
+    "x": 5188.566665649414,
+    "y": 5857.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "617327bf.d18368"
+        "3860ec82.4027f4"
       ]
     ]
   },
   {
-    "id": "617327bf.d18368",
+    "id": "3860ec82.4027f4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5291.566665649414,
-    "y": 5866,
-    "z": "8bc654d2.f0dde",
+    "x": 5335.566665649414,
+    "y": 5865.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c4e3627c.f5b198",
-        "7767e038.8b5bf",
-        "5189b1c7.a8726"
+        "7af1ce17.a2c558",
+        "cf788720.b865d8",
+        "78c6b3da.3a0f94"
       ]
     ]
   },
   {
-    "id": "b9e860d6.0863a",
+    "id": "d3e42d04.fd0a28",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5145.566665649414,
-    "y": 5908,
-    "z": "8bc654d2.f0dde",
+    "x": 5189.566665649414,
+    "y": 5907.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "7767e038.8b5bf",
+    "id": "cf788720.b865d8",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5659.566665649414,
-    "y": 5901,
-    "z": "8bc654d2.f0dde",
+    "x": 5703.566665649414,
+    "y": 5900.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "5189b1c7.a8726",
+    "id": "78c6b3da.3a0f94",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5541.233657836914,
-    "y": 5986.08349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5585.233657836914,
+    "y": 5985.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "be3f8000.1758f8",
+    "id": "187aa522.975483",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5542.450454711914,
-    "y": 5944.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5586.450454711914,
+    "y": 5944.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5021b590.5d75e4",
+    "id": "a4cbceb2.4df788",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5072.566665649414,
-    "y": 5814,
-    "z": "8bc654d2.f0dde",
+    "x": 5116.566665649414,
+    "y": 5813.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "92959871.fa0e08",
+    "id": "1eb398cf.3d4a57",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4906.566665649414,
-    "y": 5775,
-    "z": "8bc654d2.f0dde",
+    "x": 4950.566665649414,
+    "y": 5774.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "899de386.880988",
+    "id": "629500a0.f350c",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3233.816665649414,
-    "y": 6384.25,
-    "z": "8bc654d2.f0dde",
+    "x": 3277.816665649414,
+    "y": 6383.816665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1f7a42c6.29cf15",
-        "5608d8df.18871"
+        "9cad2425.bfa4",
+        "5e118a1d.622834"
       ]
     ]
   },
   {
-    "id": "1f7a42c6.29cf15",
+    "id": "9cad2425.bfa4",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3424.816665649414,
-    "y": 6388.25,
-    "z": "8bc654d2.f0dde",
+    "x": 3468.816665649414,
+    "y": 6387.816665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d6990f3f.a131a8"
+        "eaa9d7ab.22184"
       ]
     ]
   },
   {
-    "id": "d6990f3f.a131a8",
+    "id": "eaa9d7ab.22184",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3551.816665649414,
-    "y": 6387.25,
-    "z": "8bc654d2.f0dde",
+    "x": 3595.816665649414,
+    "y": 6386.816665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1cb779c6.3641ce"
+        "517fe5d1.d6143c"
       ]
     ]
   },
   {
-    "id": "5608d8df.18871",
+    "id": "5e118a1d.622834",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3420.816665649414,
-    "y": 6458.25,
-    "z": "8bc654d2.f0dde",
+    "x": 3464.816665649414,
+    "y": 6457.816665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9d5d9d30.3fbe28"
+        "3146887c.847d98"
       ]
     ]
   },
   {
-    "id": "60292317.f03774",
+    "id": "9e160da7.86044",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3970.316665649414,
-    "y": 6457.33349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 4014.316665649414,
+    "y": 6456.900161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d5d9d30.3fbe28",
+    "id": "3146887c.847d98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3554.316665649414,
-    "y": 6460.33349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 3598.316665649414,
+    "y": 6459.900161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "60292317.f03774"
+        "9e160da7.86044"
       ]
     ]
   }