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;fp=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json;h=2fc491a793717fb8899d990d20fac74468e3459e;hb=a6c6776d93ee0ec6bd8aefa23ac107262cf93154;hp=338c6456a7e9e364592f86fe890ceba33ccf0d89;hpb=b0ec399c096b8d4ccdd5adff17fd4fd59d0f72d1;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 338c6456..2fc491a7 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": "eebfe6b4.36c4f8",
+    "id": "934a37b5.570538",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 140,
-    "y": 119,
-    "z": "f8944603.71553",
+    "x": 132.56666564941406,
+    "y": 130,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f39097a1.daa63"
+        "56cf7e3f.c20408"
       ]
     ]
   },
   {
-    "id": "f39097a1.daa63",
+    "id": "56cf7e3f.c20408",
     "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": 424.2856903076172,
-    "y": 180.23810863494873,
-    "z": "f8944603.71553",
+    "x": 416.85235595703125,
+    "y": 191.23810863494873,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "af444c12.6df4"
+        "9d6f7a83.dd2e58"
       ]
     ]
   },
   {
-    "id": "af444c12.6df4",
+    "id": "9d6f7a83.dd2e58",
     "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": 430.42860412597656,
-    "y": 265.0000305175781,
-    "z": "f8944603.71553",
+    "x": 422.9952697753906,
+    "y": 276.0000305175781,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cd7fb41b.b80af8"
+        "69ada9d9.f9e3c"
       ]
     ]
   },
   {
-    "id": "cd7fb41b.b80af8",
+    "id": "69ada9d9.f9e3c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 780,
-    "y": 324,
-    "z": "f8944603.71553",
+    "x": 772.5666656494141,
+    "y": 335,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1330d7b6.40f6",
-        "327e5a08.352bde",
-        "b36ceae.9917d98"
+        "8dd82f3b.b9fa5",
+        "304cbf07.b12f58",
+        "1a3f65b2.521b1a"
       ]
     ]
   },
   {
-    "id": "1330d7b6.40f6",
+    "id": "8dd82f3b.b9fa5",
     "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": 1081.33349609375,
-    "y": 594.9302978515625,
-    "z": "f8944603.71553",
+    "x": 1073.900161743164,
+    "y": 605.9302978515625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "327e5a08.352bde",
+    "id": "304cbf07.b12f58",
     "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": 1102.761962890625,
-    "y": 297.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1095.328628540039,
+    "y": 308.33331298828125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "393ddb72.9cdaac",
-        "27423ab.7bf7dc6",
-        "e70357b.8e78fa8"
+        "c42506f9.b054",
+        "15d85509.bac5fb",
+        "c693218f.780828"
       ]
     ]
   },
   {
-    "id": "393ddb72.9cdaac",
+    "id": "c42506f9.b054",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1327.761962890625,
-    "y": 155.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1320.328628540039,
+    "y": 166.33331298828125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "db827fdb.ec8a7"
+        "c432fa86.b14b18"
       ]
     ]
   },
   {
-    "id": "27423ab.7bf7dc6",
+    "id": "15d85509.bac5fb",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1323.2529296875,
-    "y": 224.9073486328125,
-    "z": "f8944603.71553",
+    "x": 1315.819595336914,
+    "y": 235.9073486328125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "2aba6522.745fa2"
+        "c16eebd5.51383"
       ]
     ]
   },
   {
-    "id": "e70357b.8e78fa8",
+    "id": "c693218f.780828",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1311.761962890625,
-    "y": 271.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1304.328628540039,
+    "y": 282.33331298828125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "85c2ab27.5d7c"
+        "3a0cbeb0.e80882"
       ]
     ]
   },
   {
-    "id": "d67dd652.2acc48",
+    "id": "2b8d35c8.ebc05a",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1081.761962890625,
-    "y": 185.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1074.328628540039,
+    "y": 196.33331298828125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b36ceae.9917d98",
+    "id": "1a3f65b2.521b1a",
     "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": 1069.761962890625,
-    "y": 237.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1062.328628540039,
+    "y": 248.33331298828125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "db827fdb.ec8a7",
+    "id": "c432fa86.b14b18",
     "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": 1568,
-    "y": 152,
-    "z": "f8944603.71553",
+    "x": 1560.566665649414,
+    "y": 163,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cb5b5e94.b15ef8",
-        "b997ad22.d70e8"
+        "1d921b54.6d01cd",
+        "4b7292d8.462d44"
       ]
     ]
   },
   {
-    "id": "2aba6522.745fa2",
+    "id": "c16eebd5.51383",
     "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": 1478.0623779296875,
-    "y": 227.85977172851562,
-    "z": "f8944603.71553",
+    "x": 1470.6290435791016,
+    "y": 238.85977172851562,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "85c2ab27.5d7c",
+    "id": "3a0cbeb0.e80882",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1482,
-    "y": 272,
-    "z": "f8944603.71553",
+    "x": 1474.566665649414,
+    "y": 283,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cb5b5e94.b15ef8",
+    "id": "1d921b54.6d01cd",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1773,
-    "y": 189,
-    "z": "f8944603.71553",
+    "x": 1765.566665649414,
+    "y": 200,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3cb72715.02a808"
+        "e73b29c9.cbd5e8"
       ]
     ]
   },
   {
-    "id": "b997ad22.d70e8",
+    "id": "4b7292d8.462d44",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783,
-    "y": 116,
-    "z": "f8944603.71553",
+    "x": 1775.566665649414,
+    "y": 127,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "3cb72715.02a808",
+    "id": "e73b29c9.cbd5e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1766,
-    "y": 264,
-    "z": "f8944603.71553",
+    "x": 1758.566665649414,
+    "y": 275,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ebf5f2d6.b4c7b8",
-        "490f1cae.a20b64",
-        "b4dd975f.8385a8",
-        "43a803a5.2842f4",
-        "651a17c0.63b678"
+        "d6fcbbd7.6468b8",
+        "8f5c7a9a.326598",
+        "cd48af2d.929d6",
+        "528e88db.403fc",
+        "899de386.880988"
       ]
     ]
   },
   {
-    "id": "d707b8ba.d22b28",
+    "id": "1f336392.1dac3c",
     "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": 2252,
-    "y": 315,
-    "z": "f8944603.71553",
+    "x": 2244.566665649414,
+    "y": 326,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3717142f.9eacbc",
-        "81f224b1.8ce278",
-        "360e18d9.8e8878"
+        "923c23f1.638a98",
+        "ba451af8.67c9c8",
+        "2ed7be49.0a7032"
       ]
     ]
   },
   {
-    "id": "3717142f.9eacbc",
+    "id": "923c23f1.638a98",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2468,
-    "y": 382,
-    "z": "f8944603.71553",
+    "x": 2460.566665649414,
+    "y": 393,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "90fe9f39.2d3b48"
+        "c090e3a4.ec2058"
       ]
     ]
   },
   {
-    "id": "81f224b1.8ce278",
+    "id": "ba451af8.67c9c8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2468.490966796875,
-    "y": 281.573974609375,
-    "z": "f8944603.71553",
+    "x": 2461.057632446289,
+    "y": 292.573974609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fa7677d5.848dd"
+        "4c29ba0c.292a6c"
       ]
     ]
   },
   {
-    "id": "360e18d9.8e8878",
+    "id": "2ed7be49.0a7032",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2464,
-    "y": 331,
-    "z": "f8944603.71553",
+    "x": 2456.566665649414,
+    "y": 342,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "72c2923b.56a34c"
+        "f2cd659.3fc4898"
       ]
     ]
   },
   {
-    "id": "ebf5f2d6.b4c7b8",
+    "id": "d6fcbbd7.6468b8",
     "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": 1969,
-    "y": 296,
-    "z": "f8944603.71553",
+    "x": 1961.566665649414,
+    "y": 307,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "618e3f4f.a42bf",
-        "d707b8ba.d22b28",
-        "e8527008.db6228",
-        "a669b945.663408"
+        "419d8708.3b9078",
+        "1f336392.1dac3c",
+        "90827cac.7f3cc8",
+        "e557ce2.09f823"
       ]
     ]
   },
   {
-    "id": "618e3f4f.a42bf",
+    "id": "419d8708.3b9078",
     "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": 2249,
-    "y": 234,
-    "z": "f8944603.71553",
+    "x": 2241.566665649414,
+    "y": 245,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "43a803a5.2842f4",
+    "id": "528e88db.403fc",
     "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": 1943,
-    "y": 246,
-    "z": "f8944603.71553",
+    "x": 1935.566665649414,
+    "y": 257,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "490f1cae.a20b64",
+    "id": "8f5c7a9a.326598",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1986,
-    "y": 105,
-    "z": "f8944603.71553",
+    "x": 1978.566665649414,
+    "y": 116,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "b4dd975f.8385a8",
+    "id": "cd48af2d.929d6",
     "type": "get-resource",
     "name": "get-resource logical-links",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1998,
-    "y": 146,
-    "z": "f8944603.71553",
+    "x": 1990.566665649414,
+    "y": 157,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "d38afd8a.8bc96",
+    "id": "73efca11.a03e0c",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2023,
-    "y": 58,
-    "z": "f8944603.71553",
+    "x": 2015.566665649414,
+    "y": 69,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "8fedb211.a1c3d8",
+    "id": "19fb453a.d497cb",
     "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": 1943,
-    "y": 192,
-    "z": "f8944603.71553",
+    "x": 1935.566665649414,
+    "y": 203,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "fa7677d5.848dd",
+    "id": "4c29ba0c.292a6c",
     "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": 2647,
-    "y": 284,
-    "z": "f8944603.71553",
+    "x": 2639.566665649414,
+    "y": 295,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "72c2923b.56a34c",
+    "id": "f2cd659.3fc4898",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2646.9375,
-    "y": 333.1402587890625,
-    "z": "f8944603.71553",
+    "x": 2639.504165649414,
+    "y": 344.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "90fe9f39.2d3b48",
+    "id": "c090e3a4.ec2058",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2648.9375,
-    "y": 384.1402587890625,
-    "z": "f8944603.71553",
+    "x": 2641.504165649414,
+    "y": 395.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "458d5965.a3abf"
+        "383f413.f1d10be"
       ]
     ]
   },
   {
-    "id": "458d5965.a3abf",
+    "id": "383f413.f1d10be",
     "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": 2941.9375,
-    "y": 331.1402587890625,
-    "z": "f8944603.71553",
+    "x": 2934.504165649414,
+    "y": 342.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9e8135ff.08a04",
-        "11480c56.53825c",
-        "c18b528b.950eb"
+        "7f2204ba.ff0eac",
+        "6593ad3c.c3a94c",
+        "91d5dd73.0552a8"
       ]
     ]
   },
   {
-    "id": "11480c56.53825c",
+    "id": "6593ad3c.c3a94c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3245.428436279297,
-    "y": 63.7142333984375,
-    "z": "f8944603.71553",
+    "x": 3237.995101928711,
+    "y": 74.7142333984375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fafa91c8.b89"
+        "578e5a01.301d74"
       ]
     ]
   },
   {
-    "id": "fafa91c8.b89",
+    "id": "578e5a01.301d74",
     "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": 3422.999969482422,
-    "y": 64,
-    "z": "f8944603.71553",
+    "x": 3415.566635131836,
+    "y": 75,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "c18b528b.950eb",
+    "id": "91d5dd73.0552a8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3240.937469482422,
-    "y": 113.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3233.504135131836,
+    "y": 124.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c9c4d95e.e78bc8"
+        "3a340bd0.83bde4"
       ]
     ]
   },
   {
-    "id": "c9c4d95e.e78bc8",
+    "id": "3a340bd0.83bde4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3422.937469482422,
-    "y": 113.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3415.504135131836,
+    "y": 124.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9e8135ff.08a04",
+    "id": "7f2204ba.ff0eac",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3244.937469482422,
-    "y": 164.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3237.504135131836,
+    "y": 175.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "249c683e.fa6548"
+        "5f6b46f2.1bbc28"
       ]
     ]
   },
   {
-    "id": "249c683e.fa6548",
+    "id": "5f6b46f2.1bbc28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3424.937469482422,
-    "y": 164.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3417.504135131836,
+    "y": 175.1402587890625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8380148b.ccdda"
+        "432203ff.80791c"
       ]
     ]
   },
   {
-    "id": "8380148b.ccdda",
+    "id": "432203ff.80791c",
     "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": 2961,
-    "y": 459,
-    "z": "f8944603.71553",
+    "x": 2953.566665649414,
+    "y": 470,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f9f860ee.48ada",
-        "3ee71a32.7e39ae"
+        "25bf5884.d1bc1",
+        "68d7ca3f.b9c4a4"
       ]
     ]
   },
   {
-    "id": "3ee71a32.7e39ae",
+    "id": "68d7ca3f.b9c4a4",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3300.999969482422,
-    "y": 306,
-    "z": "f8944603.71553",
+    "x": 3293.566635131836,
+    "y": 317,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f9f860ee.48ada",
+    "id": "25bf5884.d1bc1",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3299.999969482422,
-    "y": 360,
-    "z": "f8944603.71553",
+    "x": 3292.566635131836,
+    "y": 371,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "88c3b86.63e2c48"
+        "a4256717.8bdab"
       ]
     ]
   },
   {
-    "id": "b0fb22ca.f9ce1",
+    "id": "dc3dd60e.e6fb58",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4044.999969482422,
-    "y": 314,
-    "z": "f8944603.71553",
+    "x": 4037.566635131836,
+    "y": 325,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "5f3f920d.e5225c"
+        "7a99d9c1.cc807"
       ]
     ]
   },
   {
-    "id": "5f3f920d.e5225c",
+    "id": "7a99d9c1.cc807",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4221.999847412109,
-    "y": 306.9998779296875,
-    "z": "f8944603.71553",
+    "x": 4214.566513061523,
+    "y": 317.9998779296875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8197a230.f5fc28",
-        "add943b3.661de"
+        "54329230.9376a4",
+        "e44ffd73.3caae8"
       ]
     ]
   },
   {
-    "id": "88c3b86.63e2c48",
+    "id": "a4256717.8bdab",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3463.999969482422,
-    "y": 286,
-    "z": "f8944603.71553",
+    "x": 3456.566635131836,
+    "y": 297,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b1327250.c3733",
-        "de9a0d51.d824a"
+        "ab8d2f4.fb7de5",
+        "6cd92abd.ea602c"
       ]
     ]
   },
   {
-    "id": "b1327250.c3733",
+    "id": "ab8d2f4.fb7de5",
     "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": 3744.999969482422,
-    "y": 242,
-    "z": "f8944603.71553",
+    "x": 3737.566635131836,
+    "y": 253,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "64d386dc.4f4038"
+        "d2f6d2c1.0cd0b8"
       ]
     ]
   },
   {
-    "id": "64d386dc.4f4038",
+    "id": "d2f6d2c1.0cd0b8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4006.999969482422,
-    "y": 242,
-    "z": "f8944603.71553",
+    "x": 3999.566635131836,
+    "y": 253,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b0fb22ca.f9ce1"
+        "dc3dd60e.e6fb58"
       ]
     ]
   },
   {
-    "id": "8197a230.f5fc28",
+    "id": "54329230.9376a4",
     "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": 4464.999847412109,
-    "y": 263.9998779296875,
-    "z": "f8944603.71553",
+    "x": 4457.566513061523,
+    "y": 274.9998779296875,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "add943b3.661de",
+    "id": "e44ffd73.3caae8",
     "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": 4453.999847412109,
-    "y": 318.9998779296875,
-    "z": "f8944603.71553",
+    "x": 4446.566513061523,
+    "y": 329.9998779296875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "584012e4.8af54c",
-        "84e11e56.e2a698",
-        "b5114711.48fe28"
+        "9db3143c.c20748",
+        "3f90e90d.8c4416",
+        "767c00f3.c60f18"
       ]
     ]
   },
   {
-    "id": "b5114711.48fe28",
+    "id": "767c00f3.c60f18",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4705.000213623047,
-    "y": 260,
-    "z": "f8944603.71553",
+    "x": 4697.566879272461,
+    "y": 271,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3ff18282.41fa7e"
+        "eb2a7a65.4a99c"
       ]
     ]
   },
   {
-    "id": "3ff18282.41fa7e",
+    "id": "eb2a7a65.4a99c",
     "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": 4853.571746826172,
-    "y": 260.2857666015625,
-    "z": "f8944603.71553",
+    "x": 4846.138412475586,
+    "y": 271.2857666015625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "576f251.536f1dc",
+    "id": "1d4fa709.d3c2b1",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4852.509246826172,
-    "y": 304.426025390625,
-    "z": "f8944603.71553",
+    "x": 4845.075912475586,
+    "y": 315.426025390625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "84e11e56.e2a698",
+    "id": "3f90e90d.8c4416",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4693.509246826172,
-    "y": 304.426025390625,
-    "z": "f8944603.71553",
+    "x": 4686.075912475586,
+    "y": 315.426025390625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "576f251.536f1dc"
+        "1d4fa709.d3c2b1"
       ]
     ]
   },
   {
-    "id": "584012e4.8af54c",
+    "id": "9db3143c.c20748",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4700.509246826172,
-    "y": 383.426025390625,
-    "z": "f8944603.71553",
+    "x": 4693.075912475586,
+    "y": 394.426025390625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "84e0295.fec0058"
+        "d725abd1.c0b928"
       ]
     ]
   },
   {
-    "id": "84e0295.fec0058",
+    "id": "d725abd1.c0b928",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4839.509246826172,
-    "y": 383.426025390625,
-    "z": "f8944603.71553",
+    "x": 4832.075912475586,
+    "y": 394.426025390625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "40dc732c.a37574",
-        "72f9e36c.5c6004"
+        "561b0f6d.fce1f8",
+        "8702a1ee.cea5e8"
       ]
     ]
   },
   {
-    "id": "40dc732c.a37574",
+    "id": "561b0f6d.fce1f8",
     "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": 5045.000213623047,
-    "y": 381,
-    "z": "f8944603.71553",
+    "x": 5037.566879272461,
+    "y": 392,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "72f9e36c.5c6004",
+    "id": "8702a1ee.cea5e8",
     "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": 5044.000213623047,
-    "y": 427,
-    "z": "f8944603.71553",
+    "x": 5036.566879272461,
+    "y": 438,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "de9a0d51.d824a",
+    "id": "6cd92abd.ea602c",
     "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": 3561.999969482422,
-    "y": 358,
-    "z": "f8944603.71553",
+    "x": 3554.566635131836,
+    "y": 369,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1f9cf648.b23842"
+        "dd91e386.997658"
       ]
     ]
   },
   {
-    "id": "1f9cf648.b23842",
+    "id": "dd91e386.997658",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3841.999969482422,
-    "y": 358,
-    "z": "f8944603.71553",
+    "x": 3834.566635131836,
+    "y": 369,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9a7f86a9.e4bc3"
+        "d0b5ecff.91d928"
       ]
     ]
   },
   {
-    "id": "9a7f86a9.e4bc3",
+    "id": "d0b5ecff.91d928",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2225.0001220703125,
-    "y": 771.0001220703125,
-    "z": "f8944603.71553",
+    "x": 2217.5667877197266,
+    "y": 782.0001220703125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a00c69ca.adce48"
+        "3175715f.1727f6"
       ]
     ]
   },
   {
-    "id": "a00c69ca.adce48",
+    "id": "3175715f.1727f6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2402,
-    "y": 764,
-    "z": "f8944603.71553",
+    "x": 2394.566665649414,
+    "y": 775,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b1915aed.463e4",
-        "2d618162.692d86"
+        "e36efc83.994d78",
+        "41c74306.d5cc9c"
       ]
     ]
   },
   {
-    "id": "b1915aed.463e4",
+    "id": "e36efc83.994d78",
     "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": 2645,
-    "y": 721,
-    "z": "f8944603.71553",
+    "x": 2637.566665649414,
+    "y": 732,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "2d618162.692d86",
+    "id": "41c74306.d5cc9c",
     "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": 2634,
-    "y": 776,
-    "z": "f8944603.71553",
+    "x": 2626.566665649414,
+    "y": 787,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e482931e.42ecd",
-        "ed5f6487.2f87b",
-        "f8d33751.7b5a4"
+        "9d68f10f.bd8b8",
+        "dffb55fa.85b55",
+        "c53e6e84.05ac9"
       ]
     ]
   },
   {
-    "id": "e482931e.42ecd",
+    "id": "9d68f10f.bd8b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2925.490966796875,
-    "y": 754.573974609375,
-    "z": "f8944603.71553",
+    "x": 2918.057632446289,
+    "y": 765.573974609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "57635b4b.26640c"
+        "b9d2eb35.931cc8"
       ]
     ]
   },
   {
-    "id": "ed5f6487.2f87b",
+    "id": "dffb55fa.85b55",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2914,
-    "y": 799,
-    "z": "f8944603.71553",
+    "x": 2906.566665649414,
+    "y": 810,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a7b92e8f.8c52e8"
+        "e6924452.e6205"
       ]
     ]
   },
   {
-    "id": "57635b4b.26640c",
+    "id": "b9d2eb35.931cc8",
     "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": 3074.0625,
-    "y": 754.8597412109375,
-    "z": "f8944603.71553",
+    "x": 3066.629165649414,
+    "y": 765.8597412109375,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a7b92e8f.8c52e8",
+    "id": "e6924452.e6205",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3073,
-    "y": 799,
-    "z": "f8944603.71553",
+    "x": 3065.566665649414,
+    "y": 810,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "f8d33751.7b5a4",
+    "id": "c53e6e84.05ac9",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2921,
-    "y": 878,
-    "z": "f8944603.71553",
+    "x": 2913.566665649414,
+    "y": 889,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "98a40400.3efa78"
+        "361f88a3.058c08"
       ]
     ]
   },
   {
-    "id": "98a40400.3efa78",
+    "id": "361f88a3.058c08",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3060,
-    "y": 878,
-    "z": "f8944603.71553",
+    "x": 3052.566665649414,
+    "y": 889,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "71736994.8ef448",
-        "262a2cdd.1722ec",
-        "6dffa8a4.87ef28",
-        "19dc8ab.73ff975",
-        "442ee5c4.7ebc14",
-        "55e39af5.a2b61c",
-        "22efa8c9.c8576",
-        "d6e1611b.9ddcf",
-        "b18620c8.640928",
-        "11e0f934.faeab7",
-        "b71f57a7.e2a288",
-        "f7d11626.bd108",
-        "7d22810d.66642",
-        "5fc2699f.6720b8",
-        "d4db1de6.243c9",
-        "4c9f1a43.e137e4",
-        "f953800.9cf34",
-        "1931dff5.72d728",
-        "be1fed24.75522",
-        "3ab03c8.bdf8544",
-        "d566dc7.835f6a"
+        "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"
       ]
     ]
   },
   {
-    "id": "8992052.d396a78",
+    "id": "b5bad4b9.685ad8",
     "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": 3409,
-    "y": 411.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3401.566665649414,
+    "y": 422.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "71736994.8ef448",
+    "id": "936c7f50.057838",
     "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": 3389.9999389648438,
-    "y": 490.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3382.566604614258,
+    "y": 501.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "5fc2699f.6720b8",
+    "id": "2ae40328.466974",
     "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": 3346.9999389648438,
-    "y": 535.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3339.566604614258,
+    "y": 546.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "262a2cdd.1722ec",
+    "id": "fff97b6b.1650f8",
     "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": 3311.999969482422,
-    "y": 589.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3304.566635131836,
+    "y": 600.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "6dffa8a4.87ef28",
+    "id": "40c59221.de8304",
     "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": 3312.999969482422,
-    "y": 644.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3305.566635131836,
+    "y": 655.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "19dc8ab.73ff975",
+    "id": "da2087d.3780d78",
     "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": 3310.999969482422,
-    "y": 908.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3303.566635131836,
+    "y": 919.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6a238476.e2fb94",
-        "535decdf.f72024",
-        "ae1cf5c7.80a6f8"
+        "969278b.6dcd308",
+        "8ef50320.33a2f",
+        "bc9f501b.616458"
       ]
     ]
   },
   {
-    "id": "442ee5c4.7ebc14",
+    "id": "db5a893f.6acb2",
     "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": 3305.999969482422,
-    "y": 969.9998474121094,
-    "z": "f8944603.71553",
+    "x": 3298.566635131836,
+    "y": 980.9998474121094,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3acf80af.f43f8",
-        "d256cf0d.9aea78",
-        "e101efde.aba"
+        "3f6dc76b.2c189",
+        "8fe533b.8ccffd",
+        "17823dcb.715f8a"
       ]
     ]
   },
   {
-    "id": "6a238476.e2fb94",
+    "id": "969278b.6dcd308",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3621.999969482422,
-    "y": 679.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3614.566635131836,
+    "y": 690.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ab9f09fe.f29c98"
+        "9ca5fa1b.024df8"
       ]
     ]
   },
   {
-    "id": "535decdf.f72024",
+    "id": "8ef50320.33a2f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3617.509002685547,
-    "y": 729.4259948730469,
-    "z": "f8944603.71553",
+    "x": 3610.075668334961,
+    "y": 740.4259948730469,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e4e6f924.884bf"
+        "e39d355.b4f33c8"
       ]
     ]
   },
   {
-    "id": "ae1cf5c7.80a6f8",
+    "id": "bc9f501b.616458",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3621.509002685547,
-    "y": 782.4259948730469,
-    "z": "f8944603.71553",
+    "x": 3614.075668334961,
+    "y": 793.4259948730469,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ab5ff9c2.10c8a"
+        "e84899ba.db50e8"
       ]
     ]
   },
   {
-    "id": "ab9f09fe.f29c98",
+    "id": "9ca5fa1b.024df8",
     "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": 3770.571502685547,
-    "y": 679.2857360839844,
-    "z": "f8944603.71553",
+    "x": 3763.138168334961,
+    "y": 690.2857360839844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "e4e6f924.884bf",
+    "id": "e39d355.b4f33c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3760.509002685547,
-    "y": 729.4259948730469,
-    "z": "f8944603.71553",
+    "x": 3753.075668334961,
+    "y": 740.4259948730469,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3acf80af.f43f8",
+    "id": "3f6dc76b.2c189",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3583.9999389648438,
-    "y": 869.9998168945312,
-    "z": "f8944603.71553",
+    "x": 3576.566604614258,
+    "y": 880.9998168945312,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "87a2e14c.f364a"
+        "62e0b7bc.37a4e"
       ]
     ]
   },
   {
-    "id": "d256cf0d.9aea78",
+    "id": "8fe533b.8ccffd",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3579.509002685547,
-    "y": 912.4258728027344,
-    "z": "f8944603.71553",
+    "x": 3572.075668334961,
+    "y": 923.4258728027344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "98a18e9a.d4f5a"
+        "ac864505.12601"
       ]
     ]
   },
   {
-    "id": "e101efde.aba",
+    "id": "17823dcb.715f8a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3580.509002685547,
-    "y": 965.4258728027344,
-    "z": "f8944603.71553",
+    "x": 3573.075668334961,
+    "y": 976.4258728027344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4d45fe17.38da58"
+        "bed44813.048dd"
       ]
     ]
   },
   {
-    "id": "87a2e14c.f364a",
+    "id": "62e0b7bc.37a4e",
     "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": 3732.5714721679688,
-    "y": 869.2855834960938,
-    "z": "f8944603.71553",
+    "x": 3725.138137817383,
+    "y": 880.2855834960938,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "98a18e9a.d4f5a",
+    "id": "ac864505.12601",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3722.509002685547,
-    "y": 912.4258728027344,
-    "z": "f8944603.71553",
+    "x": 3715.075668334961,
+    "y": 923.4258728027344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "ab5ff9c2.10c8a",
+    "id": "e84899ba.db50e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3782.999969482422,
-    "y": 781.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3775.566635131836,
+    "y": 792.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "84478c6a.6d587"
+        "f9db2337.8fb9d"
       ]
     ]
   },
   {
-    "id": "4d45fe17.38da58",
+    "id": "bed44813.048dd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3733.999969482422,
-    "y": 964.9998474121094,
-    "z": "f8944603.71553",
+    "x": 3726.566635131836,
+    "y": 975.9998474121094,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "2dfc998d.a2b3e6"
+        "423a02cf.14e434"
       ]
     ]
   },
   {
-    "id": "84478c6a.6d587",
+    "id": "f9db2337.8fb9d",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3957.999969482422,
-    "y": 755.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3950.566635131836,
+    "y": 766.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "be084505.b458",
-        "5b2d2057.dd8c4",
-        "83ce05e.7f315f8"
+        "2c035f93.775ae8",
+        "a1971f98.6ccb48",
+        "dd62b4eb.26fb1"
       ]
     ]
   },
   {
-    "id": "2dfc998d.a2b3e6",
+    "id": "423a02cf.14e434",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3917.999969482422,
-    "y": 872.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3910.566635131836,
+    "y": 883.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "27a94561.e70e32",
-        "e39a6c9c.1e6dd8",
-        "fe4b773c.0eae98"
+        "9f546ca0.9d33e8",
+        "2ec96d4e.1ca132",
+        "cb966d3f.bcf358"
       ]
     ]
   },
   {
-    "id": "be084505.b458",
+    "id": "2c035f93.775ae8",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4079.999969482422,
-    "y": 540.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4072.566635131836,
+    "y": 551.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "86b880d.ad45d"
+        "6429cd23.35e7c4"
       ]
     ]
   },
   {
-    "id": "5b2d2057.dd8c4",
+    "id": "a1971f98.6ccb48",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4081.999969482422,
-    "y": 594.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4074.566635131836,
+    "y": 605.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "10eaea8a.998afd"
+        "17c9fbf5.2a0a34"
       ]
     ]
   },
   {
-    "id": "27a94561.e70e32",
+    "id": "9f546ca0.9d33e8",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4099,
-    "y": 811,
-    "z": "f8944603.71553",
+    "x": 4091.566665649414,
+    "y": 822,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e84921e.f8ecce"
+        "22d232ad.fa9d6e"
       ]
     ]
   },
   {
-    "id": "e39a6c9c.1e6dd8",
+    "id": "2ec96d4e.1ca132",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4101,
-    "y": 865,
-    "z": "f8944603.71553",
+    "x": 4093.566665649414,
+    "y": 876,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b7ebf9b7.e2f348"
+        "5c001c7.14606e4"
       ]
     ]
   },
   {
-    "id": "4ebe65d0.3ec92c",
+    "id": "d98ccbbe.37e04",
     "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": 4389.999969482422,
-    "y": 492.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4382.566635131836,
+    "y": 503.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b5b3e89e.18b28",
+    "id": "449eb720.722948",
     "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": 4382.999969482422,
-    "y": 590.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4375.566635131836,
+    "y": 601.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "81270995.5d712",
+    "id": "83bfbc5.ae6994",
     "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": 4401,
-    "y": 784,
-    "z": "f8944603.71553",
+    "x": 4393.566665649414,
+    "y": 795,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7db54dd4.f36624",
+    "id": "5244a859.c728e8",
     "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": 4405,
-    "y": 877,
-    "z": "f8944603.71553",
+    "x": 4397.566665649414,
+    "y": 888,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3464c217.ddf82e",
+    "id": "6ca3f458.2d99d4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3548,
-    "y": 1549,
-    "z": "f8944603.71553",
+    "x": 3540.566665649414,
+    "y": 1560,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "5c2f3801.4eed3"
+        "3eea4372.1c5814"
       ]
     ]
   },
   {
-    "id": "e12bcc6e.caae8",
+    "id": "662947db.2b96e8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3557.490966796875,
-    "y": 1591.5740356445312,
-    "z": "f8944603.71553",
+    "x": 3550.057632446289,
+    "y": 1602.5740356445312,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fb3f4046.01bc4"
+        "f28295e0.d2c148"
       ]
     ]
   },
   {
-    "id": "a3a68564.d1334",
+    "id": "5677884d.d93c78",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3546,
-    "y": 1638,
-    "z": "f8944603.71553",
+    "x": 3538.566665649414,
+    "y": 1649,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9f68f9be.d7aab8"
+        "f900f622.22fda"
       ]
     ]
   },
   {
-    "id": "8a9b7f74.e3a568",
+    "id": "eddb7de7.123d5",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3248,
-    "y": 1511,
-    "z": "f8944603.71553",
+    "x": 3240.566665649414,
+    "y": 1522,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "22efa8c9.c8576",
+    "id": "bd585daa.5b0d3",
     "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": 3291,
-    "y": 1576,
-    "z": "f8944603.71553",
+    "x": 3283.566665649414,
+    "y": 1587,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3464c217.ddf82e",
-        "e12bcc6e.caae8",
-        "a3a68564.d1334"
+        "6ca3f458.2d99d4",
+        "662947db.2b96e8",
+        "5677884d.d93c78"
       ]
     ]
   },
   {
-    "id": "55e39af5.a2b61c",
+    "id": "855375ef.856b78",
     "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": 3292,
-    "y": 1246,
-    "z": "f8944603.71553",
+    "x": 3284.566665649414,
+    "y": 1257,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cbe70d53.b79168",
-        "9e0cb899.0e0f"
+        "74d070ad.2d8b38",
+        "f1856675.64f168"
       ]
     ]
   },
   {
-    "id": "9e0cb899.0e0f",
+    "id": "f1856675.64f168",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3512.999969482422,
-    "y": 1298.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3505.566635131836,
+    "y": 1309.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "300fab87.54654c"
+        "77f0bbcf.b75e0c"
       ]
     ]
   },
   {
-    "id": "cbe70d53.b79168",
+    "id": "74d070ad.2d8b38",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3514.999969482422,
-    "y": 1331.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3507.566635131836,
+    "y": 1342.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ad0b83ff.4cb308"
+        "6e268d43.53f934"
       ]
     ]
   },
   {
-    "id": "5c2f3801.4eed3",
+    "id": "3eea4372.1c5814",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3720.66650390625,
-    "y": 1548,
-    "z": "f8944603.71553",
+    "x": 3713.233169555664,
+    "y": 1559,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fe2c6692.47101",
-        "9af14a91.b12a68"
+        "f48e6ddf.17618",
+        "cc30c632.26f008"
       ]
     ]
   },
   {
-    "id": "fb3f4046.01bc4",
+    "id": "f28295e0.d2c148",
     "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": 3711.0623779296875,
-    "y": 1594.8597717285156,
-    "z": "f8944603.71553",
+    "x": 3703.6290435791016,
+    "y": 1605.8597717285156,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9f68f9be.d7aab8",
+    "id": "f900f622.22fda",
     "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,
-    "y": 1639,
-    "z": "f8944603.71553",
+    "x": 3707.566665649414,
+    "y": 1650,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "fe2c6692.47101",
+    "id": "f48e6ddf.17618",
     "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": 3985,
-    "y": 1532,
-    "z": "f8944603.71553",
+    "x": 3977.566665649414,
+    "y": 1543,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "37956c14.cf1964",
-        "7f26a273.a5f25c"
+        "c31fbd4a.4c152",
+        "ca57bc98.e008f"
       ]
     ]
   },
   {
-    "id": "7f26a273.a5f25c",
+    "id": "ca57bc98.e008f",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4208,
-    "y": 1487,
-    "z": "f8944603.71553",
+    "x": 4200.566665649414,
+    "y": 1498,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d180abab.fe69a"
+        "ae27226e.c1211"
       ]
     ]
   },
   {
-    "id": "37956c14.cf1964",
+    "id": "c31fbd4a.4c152",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4210,
-    "y": 1551,
-    "z": "f8944603.71553",
+    "x": 4202.566665649414,
+    "y": 1562,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "11875f6b.e538c1"
+        "48b6888c.1688c8"
       ]
     ]
   },
   {
-    "id": "11875f6b.e538c1",
+    "id": "48b6888c.1688c8",
     "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": 4372,
-    "y": 1547,
-    "z": "f8944603.71553",
+    "x": 4364.566665649414,
+    "y": 1558,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d180abab.fe69a",
+    "id": "ae27226e.c1211",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4373,
-    "y": 1484,
-    "z": "f8944603.71553",
+    "x": 4365.566665649414,
+    "y": 1495,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c42ee54d.ec9ea",
-        "e2dee17e.90746"
+        "dc9805ea.b1d968",
+        "e17a88a7.3a0c68"
       ]
     ]
   },
   {
-    "id": "ad0b83ff.4cb308",
+    "id": "6e268d43.53f934",
     "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": 3657.999969482422,
-    "y": 1328.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3650.566635131836,
+    "y": 1339.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "300fab87.54654c",
+    "id": "77f0bbcf.b75e0c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3660.999969482422,
-    "y": 1291.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3653.566635131836,
+    "y": 1302.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "844bb618.6c32e8",
-        "99a55ff.3057da"
+        "6b41cb54.146c7c",
+        "2227088d.da8978"
       ]
     ]
   },
   {
-    "id": "844bb618.6c32e8",
+    "id": "6b41cb54.146c7c",
     "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": 3834.999969482422,
-    "y": 1247.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3827.566635131836,
+    "y": 1258.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9af14a91.b12a68",
+    "id": "cc30c632.26f008",
     "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": 3933.999969482422,
-    "y": 1641.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3926.566635131836,
+    "y": 1652.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1b19176e.822411"
+        "4c51d8d9.7e50e"
       ]
     ]
   },
   {
-    "id": "1b19176e.822411",
+    "id": "4c51d8d9.7e50e",
     "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": 4139.999969482422,
-    "y": 1641.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4132.566635131836,
+    "y": 1652.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c875ac48.6e9"
+        "ea6dd5aa.f54cc"
       ]
     ]
   },
   {
-    "id": "c875ac48.6e9",
+    "id": "ea6dd5aa.f54cc",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4355.285614013672,
-    "y": 1641.8217468261719,
-    "z": "f8944603.71553",
+    "x": 4347.852279663086,
+    "y": 1652.8217468261719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6e0bf03.4de201"
+        "878f0a88.cc7f28"
       ]
     ]
   },
   {
-    "id": "99a55ff.3057da",
+    "id": "2227088d.da8978",
     "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": 3849.999969482422,
-    "y": 1358.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3842.566635131836,
+    "y": 1369.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "26c5a31d.0e26c4",
-        "1dba38b8.e09647",
-        "703777cb.7523f"
+        "a1b22fed.dd46f",
+        "39006ff3.e4d42",
+        "90a88d63.a0deb"
       ]
     ]
   },
   {
-    "id": "26c5a31d.0e26c4",
+    "id": "a1b22fed.dd46f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4045.5000915527344,
-    "y": 1310.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4038.0667572021484,
+    "y": 1321.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3f157e84.d62172"
+        "11cc8b93.732e94"
       ]
     ]
   },
   {
-    "id": "1dba38b8.e09647",
+    "id": "39006ff3.e4d42",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4037.5000915527344,
-    "y": 1365.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4030.0667572021484,
+    "y": 1376.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7126adde.e76d1c"
+        "dc84c818.c1238"
       ]
     ]
   },
   {
-    "id": "703777cb.7523f",
+    "id": "90a88d63.a0deb",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4042.5000915527344,
-    "y": 1422.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4035.0667572021484,
+    "y": 1433.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f85ce86b.434b48"
+        "5b4aec5c.78ea6c"
       ]
     ]
   },
   {
-    "id": "f85ce86b.434b48",
+    "id": "5b4aec5c.78ea6c",
     "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": 4194.500091552734,
-    "y": 1423.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4187.066757202148,
+    "y": 1434.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7126adde.e76d1c",
+    "id": "dc84c818.c1238",
     "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": 4205.500091552734,
-    "y": 1368.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4198.066757202148,
+    "y": 1379.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3f157e84.d62172",
+    "id": "11cc8b93.732e94",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4189.882415771484,
-    "y": 1308.6556396484375,
-    "z": "f8944603.71553",
+    "x": 4182.449081420898,
+    "y": 1319.6556396484375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "61a6617b.c1f918"
+        "3dd6ac8d.e6d824"
       ]
     ]
   },
   {
-    "id": "61a6617b.c1f918",
+    "id": "3dd6ac8d.e6d824",
     "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": 4373.999969482422,
-    "y": 1322.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4366.566635131836,
+    "y": 1333.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c94ffafa.dcbd38"
+        "2c6d0561.1001da"
       ]
     ]
   },
   {
-    "id": "e2dee17e.90746",
+    "id": "e17a88a7.3a0c68",
     "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": 4543,
-    "y": 1442,
-    "z": "f8944603.71553",
+    "x": 4535.566665649414,
+    "y": 1453,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "c42ee54d.ec9ea",
+    "id": "dc9805ea.b1d968",
     "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": 4544,
-    "y": 1550,
-    "z": "f8944603.71553",
+    "x": 4536.566665649414,
+    "y": 1561,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a1e5e819.9ba388",
+    "id": "4eccdb3c.a00b8c",
     "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": 4545,
-    "y": 1499,
-    "z": "f8944603.71553",
+    "x": 4537.566665649414,
+    "y": 1510,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "6e0bf03.4de201",
+    "id": "878f0a88.cc7f28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4562.117156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4554.683822631836,
+    "y": 1653.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "663b6226.995afc",
-        "dd7e9ff0.ed3a48",
-        "21e8d5ce.795f42"
+        "a6df4a7c.6d4298",
+        "e55c6491.d1cf5",
+        "7eb455b8.997c94"
       ]
     ]
   },
   {
-    "id": "663b6226.995afc",
+    "id": "a6df4a7c.6d4298",
     "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": 4777.117156982422,
-    "y": 1604.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4769.683822631836,
+    "y": 1615.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "dd7e9ff0.ed3a48",
+    "id": "e55c6491.d1cf5",
     "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": 4774.117156982422,
-    "y": 1643.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4766.683822631836,
+    "y": 1654.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "49a01492.84fe34"
+        "5121fcc7.d1555c"
       ]
     ]
   },
   {
-    "id": "21e8d5ce.795f42",
+    "id": "7eb455b8.997c94",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4729.617156982422,
-    "y": 1685.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4722.183822631836,
+    "y": 1696.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "49a01492.84fe34",
+    "id": "5121fcc7.d1555c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4954.617156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4947.183822631836,
+    "y": 1653.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "292cacf5.882694"
+        "dcdffb31.a68748"
       ]
     ]
   },
   {
-    "id": "ccfcf164.268f1",
+    "id": "ee290dd7.3447b8",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4774,
-    "y": 1260,
-    "z": "f8944603.71553",
+    "x": 4766.566665649414,
+    "y": 1271,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c88ef5fa.00d8b"
+        "f5c3f7a5.0472d8"
       ]
     ]
   },
   {
-    "id": "c88ef5fa.00d8b",
+    "id": "f5c3f7a5.0472d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4951,
-    "y": 1252,
-    "z": "f8944603.71553",
+    "x": 4943.566665649414,
+    "y": 1263,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "889b0a64.f04af",
-        "b7b819bd.9ab3a"
+        "92327400.5b0ea",
+        "7dac197a.3be828"
       ]
     ]
   },
   {
-    "id": "c94ffafa.dcbd38",
+    "id": "2c6d0561.1001da",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4568.999969482422,
-    "y": 1322.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4561.566635131836,
+    "y": 1333.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ccfcf164.268f1",
-        "109fb904.331fef"
+        "ee290dd7.3447b8",
+        "97637af.969a388"
       ]
     ]
   },
   {
-    "id": "109fb904.331fef",
+    "id": "97637af.969a388",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4777,
-    "y": 1334,
-    "z": "f8944603.71553",
+    "x": 4769.566665649414,
+    "y": 1345,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c72b69fd.2d015"
+        "2b94ab82.f6af74"
       ]
     ]
   },
   {
-    "id": "c72b69fd.2d015",
+    "id": "2b94ab82.f6af74",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4954,
-    "y": 1326,
-    "z": "f8944603.71553",
+    "x": 4946.566665649414,
+    "y": 1337,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7fcaaf72.ffd618"
+        "a745e5da.a32578"
       ]
     ]
   },
   {
-    "id": "292cacf5.882694",
+    "id": "dcdffb31.a68748",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5112.617156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 5105.183822631836,
+    "y": 1653.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "63e30873.d5c4b8"
+        "f0d23e06.a32c6"
       ]
     ]
   },
   {
-    "id": "63e30873.d5c4b8",
+    "id": "f0d23e06.a32c6",
     "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": 5319.617156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 5312.183822631836,
+    "y": 1653.3403015136719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b7b819bd.9ab3a",
+    "id": "7dac197a.3be828",
     "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": 5159,
-    "y": 1259,
-    "z": "f8944603.71553",
+    "x": 5151.566665649414,
+    "y": 1270,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b062763c.d2a4c",
-        "54b52301.01aeac",
-        "c657b443.273d9"
+        "36ef2efb.214b2a",
+        "a6a3aa1c.6f7288",
+        "f4089fab.088a2"
       ]
     ]
   },
   {
-    "id": "889b0a64.f04af",
+    "id": "92327400.5b0ea",
     "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": 5189,
-    "y": 1207,
-    "z": "f8944603.71553",
+    "x": 5181.566665649414,
+    "y": 1218,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b062763c.d2a4c",
+    "id": "36ef2efb.214b2a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5369,
-    "y": 1250,
-    "z": "f8944603.71553",
+    "x": 5361.566665649414,
+    "y": 1261,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "be5642b7.4ae158"
+        "8d49602b.5cbbb8"
       ]
     ]
   },
   {
-    "id": "54b52301.01aeac",
+    "id": "a6a3aa1c.6f7288",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5361,
-    "y": 1305,
-    "z": "f8944603.71553",
+    "x": 5353.566665649414,
+    "y": 1316,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4c818fe4.79442"
+        "2502bb8.26e4744"
       ]
     ]
   },
   {
-    "id": "c657b443.273d9",
+    "id": "f4089fab.088a2",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5366,
-    "y": 1362,
-    "z": "f8944603.71553",
+    "x": 5358.566665649414,
+    "y": 1373,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "efb52045.6ba93"
+        "192598bd.b5d887"
       ]
     ]
   },
   {
-    "id": "efb52045.6ba93",
+    "id": "192598bd.b5d887",
     "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": 5518,
-    "y": 1363,
-    "z": "f8944603.71553",
+    "x": 5510.566665649414,
+    "y": 1374,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "4c818fe4.79442",
+    "id": "2502bb8.26e4744",
     "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": 5529,
-    "y": 1308,
-    "z": "f8944603.71553",
+    "x": 5521.566665649414,
+    "y": 1319,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "be5642b7.4ae158",
+    "id": "8d49602b.5cbbb8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5513.38232421875,
-    "y": 1247.6556701660156,
-    "z": "f8944603.71553",
+    "x": 5505.948989868164,
+    "y": 1258.6556701660156,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6763b660.709548"
+        "34dd56c8.a561f2"
       ]
     ]
   },
   {
-    "id": "7fcaaf72.ffd618",
+    "id": "a745e5da.a32578",
     "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": 5189,
-    "y": 1450,
-    "z": "f8944603.71553",
+    "x": 5181.566665649414,
+    "y": 1461,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "6763b660.709548",
+    "id": "34dd56c8.a561f2",
     "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": 5728,
-    "y": 1244,
-    "z": "f8944603.71553",
+    "x": 5720.566665649414,
+    "y": 1255,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "1bc82fcd.e38b3",
+    "id": "9cc65469.2e5488",
     "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": 4377.999969482422,
-    "y": 528.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4370.566635131836,
+    "y": 539.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "1ea9819.2a7577e",
+    "id": "bae36160.d0fbc",
     "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": 4368.999969482422,
-    "y": 626.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4361.566635131836,
+    "y": 637.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "86b880d.ad45d",
+    "id": "6429cd23.35e7c4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4202.999969482422,
-    "y": 534.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4195.566635131836,
+    "y": 545.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4ebe65d0.3ec92c",
-        "1bc82fcd.e38b3"
+        "d98ccbbe.37e04",
+        "9cc65469.2e5488"
       ]
     ]
   },
   {
-    "id": "10eaea8a.998afd",
+    "id": "17c9fbf5.2a0a34",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4208.999969482422,
-    "y": 598.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4201.566635131836,
+    "y": 609.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b5b3e89e.18b28",
-        "1ea9819.2a7577e"
+        "449eb720.722948",
+        "bae36160.d0fbc"
       ]
     ]
   },
   {
-    "id": "e84921e.f8ecce",
+    "id": "22d232ad.fa9d6e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4227,
-    "y": 811,
-    "z": "f8944603.71553",
+    "x": 4219.566665649414,
+    "y": 822,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "81270995.5d712",
-        "aacd9933.603dc8"
+        "83bfbc5.ae6994",
+        "7c60504e.d38f7"
       ]
     ]
   },
   {
-    "id": "b7ebf9b7.e2f348",
+    "id": "5c001c7.14606e4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4230,
-    "y": 864,
-    "z": "f8944603.71553",
+    "x": 4222.566665649414,
+    "y": 875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7db54dd4.f36624",
-        "bffe7efa.872038"
+        "5244a859.c728e8",
+        "9835c9a0.4caf78"
       ]
     ]
   },
   {
-    "id": "aacd9933.603dc8",
+    "id": "7c60504e.d38f7",
     "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": 4387,
-    "y": 824,
-    "z": "f8944603.71553",
+    "x": 4379.566665649414,
+    "y": 835,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "bffe7efa.872038",
+    "id": "9835c9a0.4caf78",
     "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": 4390,
-    "y": 915,
-    "z": "f8944603.71553",
+    "x": 4382.566665649414,
+    "y": 926,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "786dd6d1.bb9f",
+    "id": "c2220864.024798",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3681.999969482422,
-    "y": 2041.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3674.566635131836,
+    "y": 2052.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ced1d6e7.1761a",
-        "debfaec3.11449"
+        "b80ff39a.5788d",
+        "d5ffb970.fa1968"
       ]
     ]
   },
   {
-    "id": "4b469f00.bbd698",
+    "id": "db8ae4f9.347f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3509.333465576172,
-    "y": 2042.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3501.900131225586,
+    "y": 2053.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "786dd6d1.bb9f"
+        "c2220864.024798"
       ]
     ]
   },
   {
-    "id": "abe29976.f7b82",
+    "id": "4d1c7431.f53f04",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3518.824432373047,
-    "y": 2085.574005126953,
-    "z": "f8944603.71553",
+    "x": 3511.391098022461,
+    "y": 2096.574005126953,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fd5b7bb5.9eb778"
+        "c720d68c.d6ef88"
       ]
     ]
   },
   {
-    "id": "df5e24e1.4bbfc8",
+    "id": "f027027b.1605f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3507.333465576172,
-    "y": 2131.999969482422,
-    "z": "f8944603.71553",
+    "x": 3499.900131225586,
+    "y": 2142.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8efc96df.7aca9"
+        "174ecc35.cb4194"
       ]
     ]
   },
   {
-    "id": "fd5b7bb5.9eb778",
+    "id": "c720d68c.d6ef88",
     "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": 3672.3958435058594,
-    "y": 2088.8597412109375,
-    "z": "f8944603.71553",
+    "x": 3664.9625091552734,
+    "y": 2099.8597412109375,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "8efc96df.7aca9",
+    "id": "174ecc35.cb4194",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3676.333465576172,
-    "y": 2132.999969482422,
-    "z": "f8944603.71553",
+    "x": 3668.900131225586,
+    "y": 2143.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "ced1d6e7.1761a",
+    "id": "b80ff39a.5788d",
     "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": 3968.333465576172,
-    "y": 2046.0000915527344,
-    "z": "f8944603.71553",
+    "x": 3960.900131225586,
+    "y": 2057.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8ff8205e.94493",
-        "d23599ca.696b88"
+        "f5a758df.e8e0d8",
+        "83d46017.2ef77"
       ]
     ]
   },
   {
-    "id": "d23599ca.696b88",
+    "id": "83d46017.2ef77",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4191.333465576172,
-    "y": 2001.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4183.900131225586,
+    "y": 2012.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9c58fe22.c1b4f8"
+        "128bbd7c.ee7803"
       ]
     ]
   },
   {
-    "id": "8ff8205e.94493",
+    "id": "f5a758df.e8e0d8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4193.333465576172,
-    "y": 2065.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4185.900131225586,
+    "y": 2076.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f9f53a1b.e6879"
+        "7922a686.9432f8"
       ]
     ]
   },
   {
-    "id": "f9f53a1b.e6879",
+    "id": "7922a686.9432f8",
     "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": 4352.333465576172,
-    "y": 2084.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4344.900131225586,
+    "y": 2095.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9c58fe22.c1b4f8",
+    "id": "128bbd7c.ee7803",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4356.333465576172,
-    "y": 1998.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4348.900131225586,
+    "y": 2009.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a3891ddf.35707",
-        "dedb2135.03f5b8"
+        "ecc94bdb.36f218",
+        "70d8643e.5fc584"
       ]
     ]
   },
   {
-    "id": "b18620c8.640928",
+    "id": "dd28e890.6f37f",
     "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": 3281.333465576172,
-    "y": 2077.999969482422,
-    "z": "f8944603.71553",
+    "x": 3273.900131225586,
+    "y": 2088.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4b469f00.bbd698",
-        "abe29976.f7b82",
-        "df5e24e1.4bbfc8"
+        "db8ae4f9.347f",
+        "4d1c7431.f53f04",
+        "f027027b.1605f8"
       ]
     ]
   },
   {
-    "id": "2363f2d1.c22566",
+    "id": "6cb9de7.531902",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3242.333465576172,
-    "y": 2021.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3234.900131225586,
+    "y": 2032.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d6e1611b.9ddcf",
+    "id": "d3754757.4f2538",
     "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": 3301.333465576172,
-    "y": 1817.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3293.900131225586,
+    "y": 1828.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cf2f2f41.e3b378",
-        "39e668ff.f44578"
+        "c926dd8a.c40d78",
+        "b866a3cd.1307c8"
       ]
     ]
   },
   {
-    "id": "39e668ff.f44578",
+    "id": "b866a3cd.1307c8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3524.333465576172,
-    "y": 1803.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3516.900131225586,
+    "y": 1814.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a19c910d.573ee"
+        "963b51c2.5c60a8"
       ]
     ]
   },
   {
-    "id": "cf2f2f41.e3b378",
+    "id": "c926dd8a.c40d78",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3526.333465576172,
-    "y": 1836.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3518.900131225586,
+    "y": 1847.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "13f310d4.058aff"
+        "288c4b3e.38e3ac"
       ]
     ]
   },
   {
-    "id": "13f310d4.058aff",
+    "id": "288c4b3e.38e3ac",
     "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": 3669.333465576172,
-    "y": 1833.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3661.900131225586,
+    "y": 1844.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a19c910d.573ee",
+    "id": "963b51c2.5c60a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3672.333465576172,
-    "y": 1796.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3664.900131225586,
+    "y": 1807.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f7d74c47.1bc978",
-        "f5bac544.61fa48"
+        "dba238c.ade58c8",
+        "11c5499c.e33516"
       ]
     ]
   },
   {
-    "id": "f7d74c47.1bc978",
+    "id": "dba238c.ade58c8",
     "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": 3866.333465576172,
-    "y": 1800.0000915527344,
-    "z": "f8944603.71553",
+    "x": 3858.900131225586,
+    "y": 1811.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "debfaec3.11449",
+    "id": "d5ffb970.fa1968",
     "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": 3919.3334350585938,
-    "y": 2168.9999389648438,
-    "z": "f8944603.71553",
+    "x": 3911.900100708008,
+    "y": 2179.9999389648438,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9615e6c.711fd18"
+        "8ab0c323.e760e"
       ]
     ]
   },
   {
-    "id": "9615e6c.711fd18",
+    "id": "8ab0c323.e760e",
     "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": 4125.333435058594,
-    "y": 2168.9999389648438,
-    "z": "f8944603.71553",
+    "x": 4117.900100708008,
+    "y": 2179.9999389648438,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cbe4341f.004078"
+        "ef601430.2ce96"
       ]
     ]
   },
   {
-    "id": "cbe4341f.004078",
+    "id": "ef601430.2ce96",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4342.619079589844,
-    "y": 2167.8217163085938,
-    "z": "f8944603.71553",
+    "x": 4335.185745239258,
+    "y": 2178.8217163085938,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c7f950c4.309208"
+        "e64538ad.e88608"
       ]
     ]
   },
   {
-    "id": "f5bac544.61fa48",
+    "id": "11c5499c.e33516",
     "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": 3888.333465576172,
-    "y": 1868.0000915527344,
-    "z": "f8944603.71553",
+    "x": 3880.900131225586,
+    "y": 1879.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "2c3b0cc0.e9a8bc",
-        "964d0d68.ea7238",
-        "c9fecb15.92dc4"
+        "72da73e.01fae8c",
+        "1bf4f20c.844916",
+        "c2abc766.4ac0f"
       ]
     ]
   },
   {
-    "id": "2c3b0cc0.e9a8bc",
+    "id": "72da73e.01fae8c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4083.8335876464844,
-    "y": 1820.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4076.4002532958984,
+    "y": 1831.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d8e08a6a.bad6c"
+        "e5dd1f31.8ac458"
       ]
     ]
   },
   {
-    "id": "964d0d68.ea7238",
+    "id": "1bf4f20c.844916",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4075.8335876464844,
-    "y": 1875.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4068.4002532958984,
+    "y": 1886.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "30330606.c5c78a"
+        "2c7c5a6c.8f4a66"
       ]
     ]
   },
   {
-    "id": "c9fecb15.92dc4",
+    "id": "c2abc766.4ac0f",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.8335876464844,
-    "y": 1932.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4073.4002532958984,
+    "y": 1943.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7d5217b1.764cf"
+        "a0f15b8e.a7ebb"
       ]
     ]
   },
   {
-    "id": "7d5217b1.764cf",
+    "id": "a0f15b8e.a7ebb",
     "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": 4232.833587646484,
-    "y": 1933.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4225.400253295898,
+    "y": 1944.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "30330606.c5c78a",
+    "id": "2c7c5a6c.8f4a66",
     "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": 4243.833587646484,
-    "y": 1878.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4236.400253295898,
+    "y": 1889.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d8e08a6a.bad6c",
+    "id": "e5dd1f31.8ac458",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4228.215911865234,
-    "y": 1817.65576171875,
-    "z": "f8944603.71553",
+    "x": 4220.782577514648,
+    "y": 1828.65576171875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "57c065bf.a4bd5c"
+        "5bc7c506.3f7314"
       ]
     ]
   },
   {
-    "id": "a3891ddf.35707",
+    "id": "ecc94bdb.36f218",
     "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": 4526.333465576172,
-    "y": 1959.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4518.900131225586,
+    "y": 1970.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "dedb2135.03f5b8",
+    "id": "70d8643e.5fc584",
     "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": 4527.333465576172,
-    "y": 2064.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4519.900131225586,
+    "y": 2075.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cd4b037.d584a",
+    "id": "75e052b3.6ff0fc",
     "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": 4522.333465576172,
-    "y": 2013.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4514.900131225586,
+    "y": 2024.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "c7f950c4.309208",
+    "id": "e64538ad.e88608",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4549.450622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4542.017288208008,
+    "y": 2168.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "dd90bf13.7024b8",
-        "71302a26.8b2194",
-        "1d143619.b4c942"
+        "58b39a0b.a28104",
+        "908d048a.fd0138",
+        "5394d746.97415"
       ]
     ]
   },
   {
-    "id": "dd90bf13.7024b8",
+    "id": "58b39a0b.a28104",
     "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": 4764.450622558594,
-    "y": 2119.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4757.017288208008,
+    "y": 2130.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "71302a26.8b2194",
+    "id": "908d048a.fd0138",
     "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": 4761.450622558594,
-    "y": 2158.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4754.017288208008,
+    "y": 2169.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d8986410.1ab67"
+        "160d9213.6a516e"
       ]
     ]
   },
   {
-    "id": "1d143619.b4c942",
+    "id": "5394d746.97415",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4716.950622558594,
-    "y": 2200.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4709.517288208008,
+    "y": 2211.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d8986410.1ab67",
+    "id": "160d9213.6a516e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4941.950622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4934.517288208008,
+    "y": 2168.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ce977a1e.eca43"
+        "2403cbf1.90bae4"
       ]
     ]
   },
   {
-    "id": "ce977a1e.eca43",
+    "id": "2403cbf1.90bae4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5099.950622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 5092.517288208008,
+    "y": 2168.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fad51809.c9b758"
+        "15dae2c1.fe6bdd"
       ]
     ]
   },
   {
-    "id": "fad51809.c9b758",
+    "id": "15dae2c1.fe6bdd",
     "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": 5306.950622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 5299.517288208008,
+    "y": 2168.3403930664062,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3e817052.af0e48",
+    "id": "e7ce121f.269bb",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4810.333465576172,
-    "y": 1836.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4802.900131225586,
+    "y": 1847.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "41d964fa.bed18c"
+        "30725ca7.222ea4"
       ]
     ]
   },
   {
-    "id": "41d964fa.bed18c",
+    "id": "30725ca7.222ea4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4987.333465576172,
-    "y": 1828.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4979.900131225586,
+    "y": 1839.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "286abe4.161a1c2",
-        "51859ea0.e5a788"
+        "82bc9190.99083",
+        "c6a75ef3.9aa488"
       ]
     ]
   },
   {
-    "id": "57c065bf.a4bd5c",
+    "id": "5bc7c506.3f7314",
     "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": 4412.333465576172,
-    "y": 1832.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4404.900131225586,
+    "y": 1843.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "89b46226.1281f"
+        "9e2fa3d8.88246"
       ]
     ]
   },
   {
-    "id": "89b46226.1281f",
+    "id": "9e2fa3d8.88246",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4607.333465576172,
-    "y": 1832.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4599.900131225586,
+    "y": 1843.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3e817052.af0e48",
-        "56bdf4f5.249c24"
+        "e7ce121f.269bb",
+        "87abf2c8.a21648"
       ]
     ]
   },
   {
-    "id": "51859ea0.e5a788",
+    "id": "c6a75ef3.9aa488",
     "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": 5195.333465576172,
-    "y": 1835.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5187.900131225586,
+    "y": 1846.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d1ce3d2f.531928",
-        "ba2a8dba.a8d52",
-        "4ba192d1.030d84"
+        "d33681ca.12c55",
+        "54cfcb70.c20a5c",
+        "76901bc2.c646ec"
       ]
     ]
   },
   {
-    "id": "f8a3b14d.675a5",
+    "id": "c7485083.08e3d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4989.333465576172,
-    "y": 1901.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4981.900131225586,
+    "y": 1912.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "25c16268.66f006"
+        "9f7ab33f.3d3ee8"
       ]
     ]
   },
   {
-    "id": "56bdf4f5.249c24",
+    "id": "87abf2c8.a21648",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4812.333465576172,
-    "y": 1909.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4804.900131225586,
+    "y": 1920.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f8a3b14d.675a5"
+        "c7485083.08e3d"
       ]
     ]
   },
   {
-    "id": "286abe4.161a1c2",
+    "id": "82bc9190.99083",
     "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": 5225.333465576172,
-    "y": 1783.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5217.900131225586,
+    "y": 1794.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "25c16268.66f006",
+    "id": "9f7ab33f.3d3ee8",
     "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": 5224.333465576172,
-    "y": 2025.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5216.900131225586,
+    "y": 2036.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d1ce3d2f.531928",
+    "id": "d33681ca.12c55",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5405.333465576172,
-    "y": 1826.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5397.900131225586,
+    "y": 1837.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9d788655.20f98"
+        "52bdc174.53236"
       ]
     ]
   },
   {
-    "id": "ba2a8dba.a8d52",
+    "id": "54cfcb70.c20a5c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5397.333465576172,
-    "y": 1881.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5389.900131225586,
+    "y": 1892.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "96363bdc.091"
+        "da0362e9.7cf8b8"
       ]
     ]
   },
   {
-    "id": "4ba192d1.030d84",
+    "id": "76901bc2.c646ec",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5402.333465576172,
-    "y": 1938.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5394.900131225586,
+    "y": 1949.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6a0588e1.3fd2b8"
+        "656ad13e.13aaf8"
       ]
     ]
   },
   {
-    "id": "6a0588e1.3fd2b8",
+    "id": "656ad13e.13aaf8",
     "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": 5554.333465576172,
-    "y": 1939.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5546.900131225586,
+    "y": 1950.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "96363bdc.091",
+    "id": "da0362e9.7cf8b8",
     "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": 5565.333465576172,
-    "y": 1884.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5557.900131225586,
+    "y": 1895.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9d788655.20f98",
+    "id": "52bdc174.53236",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5549.715789794922,
-    "y": 1823.65576171875,
-    "z": "f8944603.71553",
+    "x": 5542.282455444336,
+    "y": 1834.65576171875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f42174ac.a42b5"
+        "2dd4dc53.801b1c"
       ]
     ]
   },
   {
-    "id": "f42174ac.a42b5",
+    "id": "2dd4dc53.801b1c",
     "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": 5764.333465576172,
-    "y": 1820.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5756.900131225586,
+    "y": 1831.0000915527344,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "11e0f934.faeab7",
+    "id": "10147ab3.fed6fd",
     "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": 3248.999969482422,
-    "y": 1638.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3241.566635131836,
+    "y": 1649.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "87d62238.4ede38",
+    "id": "bb3da11a.4b756",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4544.999969482422,
-    "y": 612.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4537.566635131836,
+    "y": 623.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "da6b2335.2cb2",
+    "id": "550747e5.fd6e4",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4555,
-    "y": 809,
-    "z": "f8944603.71553",
+    "x": 4547.566665649414,
+    "y": 820,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b71f57a7.e2a288",
+    "id": "425867c4.b0a9",
     "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": 3251.9999389648438,
-    "y": 2146.9999389648438,
-    "z": "f8944603.71553",
+    "x": 3244.566604614258,
+    "y": 2157.9999389648438,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "f7d11626.bd108",
+    "id": "e3e1a44c.9927b8",
     "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": 3389,
-    "y": 2803,
-    "z": "f8944603.71553",
+    "x": 3381.566665649414,
+    "y": 2814,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "7d22810d.66642",
+    "id": "4a62d4e.fca9aac",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3266,
-    "y": 2913,
-    "z": "f8944603.71553",
+    "x": 3258.566665649414,
+    "y": 2924,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "74458dfb.e82acc",
-        "6d43d493.c2ab14"
+        "81493f2.f26234",
+        "6c24115d.c6e7c"
       ]
     ]
   },
   {
-    "id": "74458dfb.e82acc",
+    "id": "81493f2.f26234",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3450,
-    "y": 2892,
-    "z": "f8944603.71553",
+    "x": 3442.566665649414,
+    "y": 2903,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "bd8c7362.5e86a8"
+        "3aff0eaf.ff7b7a"
       ]
     ]
   },
   {
-    "id": "6d43d493.c2ab14",
+    "id": "6c24115d.c6e7c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3342,
-    "y": 5070,
-    "z": "f8944603.71553",
+    "x": 3334.566665649414,
+    "y": 5081,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f235a0e0.02a8"
+        "5bc4950a.db01dc"
       ]
     ]
   },
   {
-    "id": "f235a0e0.02a8",
+    "id": "5bc4950a.db01dc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3497,
-    "y": 5063,
-    "z": "f8944603.71553",
+    "x": 3489.566665649414,
+    "y": 5074,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "69d3ed18.577c3c",
-        "f2a7dc4a.68ede",
-        "a789852e.51cd48",
-        "434bd8c2.bae4f8",
-        "cd1fc06c.124968",
-        "c32fbe2a.4ce3f"
+        "2f2701b5.2dac16",
+        "316110e0.e54cc",
+        "b160de6d.e8ced8",
+        "595e7f4b.3b8bd8",
+        "8bf8bc6f.53ce6",
+        "1e2222c.7b917dd"
       ]
     ]
   },
   {
-    "id": "bd8c7362.5e86a8",
+    "id": "3aff0eaf.ff7b7a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3593,
-    "y": 2892,
-    "z": "f8944603.71553",
+    "x": 3585.566665649414,
+    "y": 2903,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "edf6563f.502118",
-        "59e68189.ade8e8",
-        "39d89d00.a48b3c",
-        "f51c657e.c3fcc8",
-        "3b5e2d55.c49c42",
-        "c40c923d.ffb318",
-        "3d1335ab.d13122",
-        "441ba30c.ae2a1c",
-        "5bfaebb4.b0d114",
-        "32f3c697.c51f22",
-        "f60b0d1b.343218",
-        "51fbee04.79f4f",
-        "a2a5771a.032e88",
-        "a39c337f.4b8598",
-        "f9369eb9.dd61b",
-        "dad20130.739d78",
-        "124ab46d.2d752c",
-        "fdfcc8c4.b3e8a8",
-        "8b9dcfa3.01c508",
-        "87dcb71b.a618f",
-        "286f0ec8.852352",
-        "2bbca6cc.0ec622"
+        "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"
       ]
     ]
   },
   {
-    "id": "5bfaebb4.b0d114",
+    "id": "638e1104.d7c428",
     "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": 3903,
-    "y": 3207,
-    "z": "f8944603.71553",
+    "x": 3895.566665649414,
+    "y": 3218,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "edf6563f.502118",
+    "id": "5168a07f.a36df8",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3851,
-    "y": 3249,
-    "z": "f8944603.71553",
+    "x": 3843.566665649414,
+    "y": 3260,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "59e68189.ade8e8",
+    "id": "6c599b75.a60fcc",
     "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": 3980,
-    "y": 3291,
-    "z": "f8944603.71553",
+    "x": 3972.566665649414,
+    "y": 3302,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "c425c4b.b5f8838",
+    "id": "e80dd6ae.f178",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 3826,
-    "y": 3166,
-    "z": "f8944603.71553",
+    "x": 3818.566665649414,
+    "y": 3177,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "78e08e98.7c634",
+    "id": "b4b36e39.27fc08",
     "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": 4351,
-    "y": 3687,
-    "z": "f8944603.71553",
+    "x": 4343.566665649414,
+    "y": 3698,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "39d89d00.a48b3c",
+    "id": "35850a83.44a89e",
     "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": 3915,
-    "y": 3726,
-    "z": "f8944603.71553",
+    "x": 3907.566665649414,
+    "y": 3737,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f51c657e.c3fcc8",
+    "id": "ae160236.4157c8",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3863,
-    "y": 3777,
-    "z": "f8944603.71553",
+    "x": 3855.566665649414,
+    "y": 3788,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "3b5e2d55.c49c42",
+    "id": "b7fd9c88.558b98",
     "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": 3999,
-    "y": 3824,
-    "z": "f8944603.71553",
+    "x": 3991.566665649414,
+    "y": 3835,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "62d7e2a.9cbc61c",
+    "id": "f07a7af4.49b438",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 3856,
-    "y": 3686,
-    "z": "f8944603.71553",
+    "x": 3848.566665649414,
+    "y": 3697,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "1f0597e7.f750d8",
+    "id": "d7c1d718.25aef8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4286,
-    "y": 3883,
-    "z": "f8944603.71553",
+    "x": 4278.566665649414,
+    "y": 3894,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "c40c923d.ffb318",
+    "id": "6e041a0e.19b3cc",
     "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": 3877,
-    "y": 3930,
-    "z": "f8944603.71553",
+    "x": 3869.566665649414,
+    "y": 3941,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b2dc6149.43ec28",
-        "f8c162ee.8e2a8",
-        "a8c36503.377908"
+        "3be15b0.8cc9ea6",
+        "8fcafedd.8f9ff8",
+        "74f3c2d6.5194d4"
       ]
     ]
   },
   {
-    "id": "b2dc6149.43ec28",
+    "id": "3be15b0.8cc9ea6",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4124,
-    "y": 3884,
-    "z": "f8944603.71553",
+    "x": 4116.566665649414,
+    "y": 3895,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1f0597e7.f750d8"
+        "d7c1d718.25aef8"
       ]
     ]
   },
   {
-    "id": "f8c162ee.8e2a8",
+    "id": "8fcafedd.8f9ff8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4124.490966796875,
-    "y": 3929.5740356445312,
-    "z": "f8944603.71553",
+    "x": 4117.057632446289,
+    "y": 3940.5740356445312,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "244505cb.7c97da"
+        "535b8241.bba134"
       ]
     ]
   },
   {
-    "id": "a8c36503.377908",
+    "id": "74f3c2d6.5194d4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4122,
-    "y": 3973,
-    "z": "f8944603.71553",
+    "x": 4114.566665649414,
+    "y": 3984,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fac0a6c3.57a578"
+        "4abd8099.5640c"
       ]
     ]
   },
   {
-    "id": "244505cb.7c97da",
+    "id": "535b8241.bba134",
     "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": 4287.0623779296875,
-    "y": 3929.8597717285156,
-    "z": "f8944603.71553",
+    "x": 4279.629043579102,
+    "y": 3940.8597717285156,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "fac0a6c3.57a578",
+    "id": "4abd8099.5640c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4291,
-    "y": 3974,
-    "z": "f8944603.71553",
+    "x": 4283.566665649414,
+    "y": 3985,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "f9369eb9.dd61b",
+    "id": "982a1a56.4966b8",
     "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": 3931,
-    "y": 4272,
-    "z": "f8944603.71553",
+    "x": 3923.566665649414,
+    "y": 4283,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "dad20130.739d78",
+    "id": "8feec705.936fd8",
     "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": 3934,
-    "y": 4317,
-    "z": "f8944603.71553",
+    "x": 3926.566665649414,
+    "y": 4328,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "fdfcc8c4.b3e8a8",
+    "id": "cad73781.1cf898",
     "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": 3926,
-    "y": 4045,
-    "z": "f8944603.71553",
+    "x": 3918.566665649414,
+    "y": 4056,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "8b9dcfa3.01c508",
+    "id": "bdd8ea07.2740c",
     "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": 3928,
-    "y": 4092,
-    "z": "f8944603.71553",
+    "x": 3920.566665649414,
+    "y": 4103,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "ed841a30.7664d",
+    "id": "b21853e4.c6418",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 3847,
-    "y": 4225,
-    "z": "f8944603.71553",
+    "x": 3839.566665649414,
+    "y": 4236,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7144ff5f.c519e8",
+    "id": "f1842c11.743b7",
     "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": 4457,
-    "y": 4891,
-    "z": "f8944603.71553",
+    "x": 4449.566665649414,
+    "y": 4902,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "69d3ed18.577c3c",
+    "id": "2f2701b5.2dac16",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3712,
-    "y": 5044,
-    "z": "f8944603.71553",
+    "x": 3704.566665649414,
+    "y": 5055,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ae7574f4.3ebe3",
-        "8bd2d4fd.8c4f1"
+        "bb4138b0.4e1d88",
+        "3497566e.93319a"
       ]
     ]
   },
   {
-    "id": "8bd2d4fd.8c4f1",
+    "id": "3497566e.93319a",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3884,
-    "y": 5041,
-    "z": "f8944603.71553",
+    "x": 3876.566665649414,
+    "y": 5052,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "439959aa.a8d0e"
+        "c7f4755e.39d608"
       ]
     ]
   },
   {
-    "id": "ae7574f4.3ebe3",
+    "id": "bb4138b0.4e1d88",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3836,
-    "y": 5888,
-    "z": "f8944603.71553",
+    "x": 3828.566665649414,
+    "y": 5899,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b05d129.ef1b1f"
+        "6c4c0ada.7452e4"
       ]
     ]
   },
   {
-    "id": "bbd89123.3c84c8",
+    "id": "4c3530ee.3fa66",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3897,
-    "y": 5011,
-    "z": "f8944603.71553",
+    "x": 3889.566665649414,
+    "y": 5022,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "88e636e4.0ad278",
+    "id": "56d0be77.8f738",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3907,
-    "y": 5846,
-    "z": "f8944603.71553",
+    "x": 3899.566665649414,
+    "y": 5857,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3d1335ab.d13122",
+    "id": "612f5852.aaa57",
     "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": 3930,
-    "y": 4420,
-    "z": "f8944603.71553",
+    "x": 3922.566665649414,
+    "y": 4431,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "439959aa.a8d0e",
+    "id": "c7f4755e.39d608",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4060,
-    "y": 5043,
-    "z": "f8944603.71553",
+    "x": 4052.566665649414,
+    "y": 5054,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "398ca5b9.10ae92",
-        "26315d76.5ba5da",
-        "70413194.4e4218",
-        "36f7b692.fe5f9a",
-        "23762b83.94d65c",
-        "1981b041.f96778",
-        "7144ff5f.c519e8",
-        "d1a4e2c9.15ac9",
-        "24040f90.d6a4"
+        "230e1b13.237ccc",
+        "5181bb49.6fa9a4",
+        "fd0048f2.8665c8",
+        "78647ab5.49b354",
+        "f0982e54.06c37",
+        "828e934c.bce518",
+        "f1842c11.743b7",
+        "76d94500.85b34c",
+        "66bf889f.a4f118"
       ]
     ]
   },
   {
-    "id": "9b6d23e8.2f4c1",
+    "id": "ae961dcf.a0b6c",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5505,
-    "y": 4516,
-    "z": "f8944603.71553",
+    "x": 5497.566665649414,
+    "y": 4527,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "398ca5b9.10ae92",
+    "id": "230e1b13.237ccc",
     "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": 4438,
-    "y": 5546,
-    "z": "f8944603.71553",
+    "x": 4430.566665649414,
+    "y": 5557,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "441ba30c.ae2a1c",
+    "id": "8d9898f5.dd7e",
     "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": 3909,
-    "y": 3420,
-    "z": "f8944603.71553",
+    "x": 3901.566665649414,
+    "y": 3431,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "32f3c697.c51f22",
+    "id": "d797d3a4.8fe9",
     "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": 3907,
-    "y": 2877,
-    "z": "f8944603.71553",
+    "x": 3899.566665649414,
+    "y": 2888,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f60b0d1b.343218",
+    "id": "ce4e4e08.0ce56",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3855,
-    "y": 2925,
-    "z": "f8944603.71553",
+    "x": 3847.566665649414,
+    "y": 2936,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "51fbee04.79f4f",
+    "id": "a4cacc19.7d376",
     "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": 3983,
-    "y": 2972,
-    "z": "f8944603.71553",
+    "x": 3975.566665649414,
+    "y": 2983,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f3326814.1ece9",
+    "id": "ae968df.974b9f",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 3820,
-    "y": 2835,
-    "z": "f8944603.71553",
+    "x": 3812.566665649414,
+    "y": 2846,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a2a5771a.032e88",
+    "id": "57e31ea9.c7173",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />",
     "comments": "",
     "outputs": 1,
-    "x": 3817,
-    "y": 3063,
-    "z": "f8944603.71553",
+    "x": 3809.566665649414,
+    "y": 3074,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "a39c337f.4b8598",
+    "id": "bf6be8f0.fb6c88",
     "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": 3910,
-    "y": 3116,
-    "z": "f8944603.71553",
+    "x": 3902.566665649414,
+    "y": 3127,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "71641615.6f44c8",
+    "id": "155d8942.126f0f",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 3801,
-    "y": 3019,
-    "z": "f8944603.71553",
+    "x": 3793.566665649414,
+    "y": 3030,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "11067d29.f83e4b",
+    "id": "eda430a0.e8a4b8",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3805,
-    "y": 3335,
-    "z": "f8944603.71553",
+    "x": 3797.566665649414,
+    "y": 3346,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "36f7b692.fe5f9a",
+    "id": "78647ab5.49b354",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4374,
-    "y": 4524,
-    "z": "f8944603.71553",
+    "x": 4366.566665649414,
+    "y": 4535,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "fa6ec7f0.b5b858",
+    "id": "db99df8c.8021",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4358,
-    "y": 4480,
-    "z": "f8944603.71553",
+    "x": 4350.566665649414,
+    "y": 4491,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "87e40dc2.3dae2",
+    "id": "fea8fd97.74e2c8",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5105,
-    "y": 4511,
-    "z": "f8944603.71553",
+    "x": 5097.566665649414,
+    "y": 4522,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a4406b4c.17bbc",
+    "id": "5a0b429f.b8f42c",
     "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": 5192,
-    "y": 4553,
-    "z": "f8944603.71553",
+    "x": 5184.566665649414,
+    "y": 4564,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "18ca4a3.634f536",
+    "id": "5930a956.25a2b",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5140,
-    "y": 4601,
-    "z": "f8944603.71553",
+    "x": 5132.566665649414,
+    "y": 4612,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "b4f57662.21d798",
+    "id": "8f7ba394.827068",
     "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": 5268,
-    "y": 4648,
-    "z": "f8944603.71553",
+    "x": 5260.566665649414,
+    "y": 4659,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "1981b041.f96778",
+    "id": "828e934c.bce518",
     "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": 4445,
-    "y": 4933,
-    "z": "f8944603.71553",
+    "x": 4437.566665649414,
+    "y": 4944,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "1ff0ab3b.554fd5",
+    "id": "29a2a107.550e86",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4428,
-    "y": 4995,
-    "z": "f8944603.71553",
+    "x": 4420.566665649414,
+    "y": 5006,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "26315d76.5ba5da",
+    "id": "5181bb49.6fa9a4",
     "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": 4539,
-    "y": 5037,
-    "z": "f8944603.71553",
+    "x": 4531.566665649414,
+    "y": 5048,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "99476299.d65948",
+    "id": "a3e1b718.3ad9",
     "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": 4987,
-    "y": 5090,
-    "z": "f8944603.71553",
+    "x": 4979.566665649414,
+    "y": 5101,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7e1b41de.44cf5",
+    "id": "778aa80b.aa4e1",
     "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": 4297,
-    "y": 5788,
-    "z": "f8944603.71553",
+    "x": 4289.566665649414,
+    "y": 5799,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "99207b39.65e8d8",
+    "id": "5829dcc0.7722b4",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4195,
-    "y": 5737,
-    "z": "f8944603.71553",
+    "x": 4187.566665649414,
+    "y": 5748,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "fc9d3b48.0b961",
+    "id": "e74f47d7.82472",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4179,
-    "y": 5693,
-    "z": "f8944603.71553",
+    "x": 4171.566665649414,
+    "y": 5704,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cdbca407.a3714",
+    "id": "edf4200a.b4f218",
     "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": 4965,
-    "y": 5950,
-    "z": "f8944603.71553",
+    "x": 4957.566665649414,
+    "y": 5961,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "70413194.4e4218",
+    "id": "fd0048f2.8665c8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4366,
-    "y": 5094,
-    "z": "f8944603.71553",
+    "x": 4358.566665649414,
+    "y": 5105,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9e68e3f9.d79778",
-        "3f3ed24c.0decee"
+        "ad0bda8.59e5ba8",
+        "a82a76f3.4e09c"
       ]
     ]
   },
   {
-    "id": "9e68e3f9.d79778",
+    "id": "ad0bda8.59e5ba8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4577,
-    "y": 5094,
-    "z": "f8944603.71553",
+    "x": 4569.566665649414,
+    "y": 5105,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e924e4da.1f13b"
+        "85a5596f.5bdcf8"
       ]
     ]
   },
   {
-    "id": "e924e4da.1f13b",
+    "id": "85a5596f.5bdcf8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4733,
-    "y": 5090,
-    "z": "f8944603.71553",
+    "x": 4725.566665649414,
+    "y": 5101,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "99476299.d65948",
-        "259aff1b.d97a1",
-        "b61f1c95.4694d"
+        "a3e1b718.3ad9",
+        "31466e0d.9a3dba",
+        "19c788e0.a62557"
       ]
     ]
   },
   {
-    "id": "3f3ed24c.0decee",
+    "id": "a82a76f3.4e09c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4573,
-    "y": 5142,
-    "z": "f8944603.71553",
+    "x": 4565.566665649414,
+    "y": 5153,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6bc2c49e.5247fc"
+        "9fc5ee1f.667928"
       ]
     ]
   },
   {
-    "id": "6bc2c49e.5247fc",
+    "id": "9fc5ee1f.667928",
     "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": 4721,
-    "y": 5137,
-    "z": "f8944603.71553",
+    "x": 4713.566665649414,
+    "y": 5148,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "540d81b.ac8608",
+    "id": "4161f07f.2b4a78",
     "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": 5229,
-    "y": 4719,
-    "z": "f8944603.71553",
+    "x": 5221.566665649414,
+    "y": 4730,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "e8527008.db6228",
+    "id": "90827cac.7f3cc8",
     "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": 2395,
-    "y": 130,
-    "z": "f8944603.71553",
+    "x": 2387.566665649414,
+    "y": 141,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "a669b945.663408",
+    "id": "e557ce2.09f823",
     "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": 2329,
-    "y": 166,
-    "z": "f8944603.71553",
+    "x": 2321.566665649414,
+    "y": 177,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "ba20200a.599368",
+    "id": "47435c42.bdd92c",
     "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": 2514,
-    "y": 93,
-    "z": "f8944603.71553",
+    "x": 2506.566665649414,
+    "y": 104,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "f5cafc97.3be338",
+    "id": "b6d8895e.58d1b",
     "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": 4264,
-    "y": 5854,
-    "z": "f8944603.71553",
+    "x": 4256.566665649414,
+    "y": 5865,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "433677c1.52ee48",
+    "id": "c1456abb.063048",
     "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": 4397,
-    "y": 5902,
-    "z": "f8944603.71553",
+    "x": 4389.566665649414,
+    "y": 5913,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "fabf4cab.b217e",
+    "id": "da4c1b48.fae9f8",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4216,
-    "y": 5960,
-    "z": "f8944603.71553",
+    "x": 4208.566665649414,
+    "y": 5971,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d58843e6.45b67",
-        "5480ce12.618198"
+        "86ae7c06.4b48",
+        "7bcdf21f.be49d4"
       ]
     ]
   },
   {
-    "id": "d58843e6.45b67",
+    "id": "86ae7c06.4b48",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4409,
-    "y": 5961,
-    "z": "f8944603.71553",
+    "x": 4401.566665649414,
+    "y": 5972,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3584d606.ea3b92"
+        "97f7b4f.de4c2c8"
       ]
     ]
   },
   {
-    "id": "3584d606.ea3b92",
+    "id": "97f7b4f.de4c2c8",
     "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": 4565,
-    "y": 5958,
-    "z": "f8944603.71553",
+    "x": 4557.566665649414,
+    "y": 5969,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "5480ce12.618198",
+    "id": "7bcdf21f.be49d4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4413,
-    "y": 6005,
-    "z": "f8944603.71553",
+    "x": 4405.566665649414,
+    "y": 6016,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "2c5800b.fe6138"
+        "c9f63d74.2677a"
       ]
     ]
   },
   {
-    "id": "2c5800b.fe6138",
+    "id": "c9f63d74.2677a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4552,
-    "y": 6000,
-    "z": "f8944603.71553",
+    "x": 4544.566665649414,
+    "y": 6011,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cdbca407.a3714",
-        "908326bd.db0de8",
-        "252b791f.9db75e",
-        "275b22ee.4a806e",
-        "331c47e0.bff598",
-        "cf9d9601.e8d088",
-        "b92b2881.bc3e18",
-        "19e51740.b8f8a1",
-        "2ded21f8.219046",
-        "a0a762d0.469c28",
-        "60c16c76.a98d34",
-        "8396080f.a7f6c8"
+        "edf4200a.b4f218",
+        "684d5c9e.960e44",
+        "fa17bed2.102338",
+        "4394fc56.b0a524",
+        "c58358a8.9796d8",
+        "f1d05d51.ef74a8",
+        "9dd9cb2c.0f6d38",
+        "e3b520b5.76f3e",
+        "1492db48.4787f5",
+        "4433eaac.652284",
+        "5e482e7e.e4be78",
+        "b03c5831.d4c5f"
       ]
     ]
   },
   {
-    "id": "b92b2881.bc3e18",
+    "id": "9dd9cb2c.0f6d38",
     "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": 4749,
-    "y": 6679,
-    "z": "f8944603.71553",
+    "x": 4741.566665649414,
+    "y": 6690,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b068e9a3.d4db4",
-        "b79debc6.f268c",
-        "599f79e1.6940a8"
+        "1b9180c4.9f766f",
+        "3223a99b.bae36e",
+        "f1d0a095.e9e33"
       ]
     ]
   },
   {
-    "id": "b068e9a3.d4db4",
+    "id": "1b9180c4.9f766f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4954,
-    "y": 6676,
-    "z": "f8944603.71553",
+    "x": 4946.566665649414,
+    "y": 6687,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "be7eb0d3.672b2"
+        "901d20b6.63b228"
       ]
     ]
   },
   {
-    "id": "b79debc6.f268c",
+    "id": "3223a99b.bae36e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4937.490966796875,
-    "y": 6737.574035644531,
-    "z": "f8944603.71553",
+    "x": 4930.057632446289,
+    "y": 6748.574035644531,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7384abca.e83424"
+        "74136956.3d8c9"
       ]
     ]
   },
   {
-    "id": "599f79e1.6940a8",
+    "id": "f1d0a095.e9e33",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4935,
-    "y": 6781,
-    "z": "f8944603.71553",
+    "x": 4927.566665649414,
+    "y": 6792,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "5c72f79d.0cafa"
+        "c0df29cc.8ad0d8"
       ]
     ]
   },
   {
-    "id": "be7eb0d3.672b2",
+    "id": "901d20b6.63b228",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5110,
-    "y": 6690,
-    "z": "f8944603.71553",
+    "x": 5102.566665649414,
+    "y": 6701,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "477f7936.afbf38"
+        "1ef77bcc.af8c2c"
       ]
     ]
   },
   {
-    "id": "7384abca.e83424",
+    "id": "74136956.3d8c9",
     "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": 5100.0623779296875,
-    "y": 6737.859771728516,
-    "z": "f8944603.71553",
+    "x": 5092.629043579102,
+    "y": 6748.859771728516,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "5c72f79d.0cafa",
+    "id": "c0df29cc.8ad0d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5102,
-    "y": 6780,
-    "z": "f8944603.71553",
+    "x": 5094.566665649414,
+    "y": 6791,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "477f7936.afbf38",
+    "id": "1ef77bcc.af8c2c",
     "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": 5357,
-    "y": 6687,
-    "z": "f8944603.71553",
+    "x": 5349.566665649414,
+    "y": 6698,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8d0d8dd8.5dff18"
+        "77c4c783.c3eb4"
       ]
     ]
   },
   {
-    "id": "8d0d8dd8.5dff18",
+    "id": "77c4c783.c3eb4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5594,
-    "y": 6683,
-    "z": "f8944603.71553",
+    "x": 5586.566665649414,
+    "y": 6694,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "234239f1.092ec6"
+        "aa349c90.ef423"
       ]
     ]
   },
   {
-    "id": "af0f93b9.f63018",
+    "id": "41bd4d7e.8e8f9c",
     "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": 5837,
-    "y": 6655,
-    "z": "f8944603.71553",
+    "x": 5829.566665649414,
+    "y": 6666,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1906307e.4f6708",
-        "7e26fbb1.9c733c"
+        "858dc053.37b33",
+        "5e74f51.5b7928c"
       ]
     ]
   },
   {
-    "id": "1906307e.4f6708",
+    "id": "858dc053.37b33",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6042,
-    "y": 6675,
-    "z": "f8944603.71553",
+    "x": 6034.566665649414,
+    "y": 6686,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "234239f1.092ec6"
+        "aa349c90.ef423"
       ]
     ]
   },
   {
-    "id": "7e26fbb1.9c733c",
+    "id": "5e74f51.5b7928c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6041,
-    "y": 6628,
-    "z": "f8944603.71553",
+    "x": 6033.566665649414,
+    "y": 6639,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "234239f1.092ec6",
+    "id": "aa349c90.ef423",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4785,
-    "y": 6950,
-    "z": "f8944603.71553",
+    "x": 4777.566665649414,
+    "y": 6961,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9c243a63.6beae8"
+        "b674f90b.943ea8"
       ]
     ]
   },
   {
-    "id": "7d275a16.b90c94",
+    "id": "4b6f312b.4e491",
     "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": 6246.999969482422,
-    "y": 6887.999969482422,
-    "z": "f8944603.71553",
+    "x": 6239.566635131836,
+    "y": 6898.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "62c83b20.7bb344",
+    "id": "e9dae4fe.64e148",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4847,
-    "y": 6626,
-    "z": "f8944603.71553",
+    "x": 4839.566665649414,
+    "y": 6637,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cf9d9601.e8d088",
+    "id": "f1d05d51.ef74a8",
     "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": 4729,
-    "y": 6514,
-    "z": "f8944603.71553",
+    "x": 4721.566665649414,
+    "y": 6525,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "fb325d12.16a73",
+    "id": "87a0032d.5441b8",
     "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": 5074,
-    "y": 6345,
-    "z": "f8944603.71553",
+    "x": 5066.566665649414,
+    "y": 6356,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "2ae3447b.0a1c44"
+        "e7a622d1.3aac3"
       ]
     ]
   },
   {
-    "id": "2ae3447b.0a1c44",
+    "id": "e7a622d1.3aac3",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5294,
-    "y": 6351,
-    "z": "f8944603.71553",
+    "x": 5286.566665649414,
+    "y": 6362,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "47fb23b1.c734fc"
+        "d7851175.526278"
       ]
     ]
   },
   {
-    "id": "47fb23b1.c734fc",
+    "id": "d7851175.526278",
     "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": 5481,
-    "y": 6311,
-    "z": "f8944603.71553",
+    "x": 5473.566665649414,
+    "y": 6322,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "504a47cd.0300d8"
+        "56e3e30c.886de4"
       ]
     ]
   },
   {
-    "id": "504a47cd.0300d8",
+    "id": "56e3e30c.886de4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5673,
-    "y": 6314,
-    "z": "f8944603.71553",
+    "x": 5665.566665649414,
+    "y": 6325,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "70b7cd06.f487e4"
+        "c0a5fdcc.0dad4"
       ]
     ]
   },
   {
-    "id": "70b7cd06.f487e4",
+    "id": "c0a5fdcc.0dad4",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5882,
-    "y": 6312,
-    "z": "f8944603.71553",
+    "x": 5874.566665649414,
+    "y": 6323,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "19e51740.b8f8a1",
+    "id": "e3b520b5.76f3e",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4781,
-    "y": 6339,
-    "z": "f8944603.71553",
+    "x": 4773.566665649414,
+    "y": 6350,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fb325d12.16a73"
+        "87a0032d.5441b8"
       ]
     ]
   },
   {
-    "id": "252b791f.9db75e",
+    "id": "fa17bed2.102338",
     "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": 4789,
-    "y": 6232,
-    "z": "f8944603.71553",
+    "x": 4781.566665649414,
+    "y": 6243,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ab2e0e9b.e6e2a",
-        "175d6a26.e8f2ae",
-        "30472c6d.7bfeec"
+        "b854c35b.ab4dd8",
+        "6917c22f.3449c4",
+        "56393d6a.f28b34"
       ]
     ]
   },
   {
-    "id": "ab2e0e9b.e6e2a",
+    "id": "b854c35b.ab4dd8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5025,
-    "y": 6215,
-    "z": "f8944603.71553",
+    "x": 5017.566665649414,
+    "y": 6226,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "175d6a26.e8f2ae",
+    "id": "6917c22f.3449c4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5022,
-    "y": 6256,
-    "z": "f8944603.71553",
+    "x": 5014.566665649414,
+    "y": 6267,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "30472c6d.7bfeec",
+    "id": "56393d6a.f28b34",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5036,
-    "y": 6296,
-    "z": "f8944603.71553",
+    "x": 5028.566665649414,
+    "y": 6307,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "275b22ee.4a806e",
+    "id": "4394fc56.b0a524",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4725,
-    "y": 6391,
-    "z": "f8944603.71553",
+    "x": 4717.566665649414,
+    "y": 6402,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "331c47e0.bff598",
+    "id": "c58358a8.9796d8",
     "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": 4733,
-    "y": 6449,
-    "z": "f8944603.71553",
+    "x": 4725.566665649414,
+    "y": 6460,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "908326bd.db0de8",
+    "id": "684d5c9e.960e44",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4738,
-    "y": 6189,
-    "z": "f8944603.71553",
+    "x": 4730.566665649414,
+    "y": 6200,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "8ef1afe7.71ad38",
+    "id": "4f9189d2.f34a8",
     "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": 4853,
-    "y": 6141,
-    "z": "f8944603.71553",
+    "x": 4845.566665649414,
+    "y": 6152,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9c243a63.6beae8",
+    "id": "b674f90b.943ea8",
     "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": 5028,
-    "y": 6947,
-    "z": "f8944603.71553",
+    "x": 5020.566665649414,
+    "y": 6958,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "14533561.0c5673",
-        "af779ea0.7fb81"
+        "f695cd31.082f9",
+        "a92f49c6.640148"
       ]
     ]
   },
   {
-    "id": "14533561.0c5673",
+    "id": "f695cd31.082f9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5257,
-    "y": 6924,
-    "z": "f8944603.71553",
+    "x": 5249.566665649414,
+    "y": 6935,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "55635f65.d76ee8"
+        "fe65cd53.d11278"
       ]
     ]
   },
   {
-    "id": "af779ea0.7fb81",
+    "id": "a92f49c6.640148",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5257,
-    "y": 6973,
-    "z": "f8944603.71553",
+    "x": 5249.566665649414,
+    "y": 6984,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "494eed0f.99eb84",
+    "id": "8c69c55b.110248",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5989.999969482422,
-    "y": 6978.999969482422,
-    "z": "f8944603.71553",
+    "x": 5982.566635131836,
+    "y": 6989.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6ed262af.6482c4",
-        "7d275a16.b90c94",
-        "ea085aad.03ece"
+        "aeda0706.1d102",
+        "4b6f312b.4e491",
+        "eebb4557.9c03c"
       ]
     ]
   },
   {
-    "id": "eb8bdae2.80aaf8",
+    "id": "ca7dd8b0.fcddf",
     "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": 6374.999969482422,
-    "y": 6941.999969482422,
-    "z": "f8944603.71553",
+    "x": 6367.566635131836,
+    "y": 6952.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "ea085aad.03ece",
+    "id": "eebb4557.9c03c",
     "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": 6344.999969482422,
-    "y": 7001.999969482422,
-    "z": "f8944603.71553",
+    "x": 6337.566635131836,
+    "y": 7012.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "6ed262af.6482c4",
+    "id": "aeda0706.1d102",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 6251.999969482422,
-    "y": 6829.999969482422,
-    "z": "f8944603.71553",
+    "x": 6244.566635131836,
+    "y": 6840.999969482422,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b05d129.ef1b1f",
+    "id": "6c4c0ada.7452e4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3988,
-    "y": 5887,
-    "z": "f8944603.71553",
+    "x": 3980.566665649414,
+    "y": 5898,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "99207b39.65e8d8",
-        "f5cafc97.3be338",
-        "433677c1.52ee48",
-        "fabf4cab.b217e",
-        "7e1b41de.44cf5"
+        "5829dcc0.7722b4",
+        "b6d8895e.58d1b",
+        "c1456abb.063048",
+        "da4c1b48.fae9f8",
+        "778aa80b.aa4e1"
       ]
     ]
   },
   {
-    "id": "e2f1cfff.a8b258",
+    "id": "146e3d98.17031a",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4730,
-    "y": 6289,
-    "z": "f8944603.71553",
+    "x": 4722.566665649414,
+    "y": 6300,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "2ded21f8.219046",
+    "id": "1492db48.4787f5",
     "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": 4858,
-    "y": 6031,
-    "z": "f8944603.71553",
+    "x": 4850.566665649414,
+    "y": 6042,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a18264c.6d9e",
+    "id": "cc643bc5.4660a",
     "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": 4995,
-    "y": 5981,
-    "z": "f8944603.71553",
+    "x": 4987.566665649414,
+    "y": 5992,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "124ab46d.2d752c",
+    "id": "eb6eb29c.21a438",
     "type": "save",
     "name": "save ROOT UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3822,
-    "y": 3374,
-    "z": "f8944603.71553",
+    "x": 3814.566665649414,
+    "y": 3385,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "826efc02.44c7b",
+    "id": "3ddb9817.a2345",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3999.999969482422,
-    "y": 1608.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3992.566635131836,
+    "y": 1619.9999694824219,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3746cfac.cfad98",
+    "id": "87712f4d.617c48",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3978.9999389648438,
-    "y": 2120.9999389648438,
-    "z": "f8944603.71553",
+    "x": 3971.566604614258,
+    "y": 2131.9999389648438,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b5ea3d16.fd41f",
+    "id": "4a9500be.eb8d5",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 3814,
-    "y": 3995,
-    "z": "f8944603.71553",
+    "x": 3806.566665649414,
+    "y": 4006,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9d7f2116.baeda",
+    "id": "1cb779c6.3641ce",
     "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": 3904,
-    "y": 6375,
-    "z": "f8944603.71553",
+    "x": 3896.566665649414,
+    "y": 6386,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f2a7dc4a.68ede",
+    "id": "316110e0.e54cc",
     "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": 3706,
-    "y": 4904,
-    "z": "f8944603.71553",
+    "x": 3698.566665649414,
+    "y": 4915,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a789852e.51cd48",
+    "id": "b160de6d.e8ced8",
     "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": 3839,
-    "y": 4952,
-    "z": "f8944603.71553",
+    "x": 3831.566665649414,
+    "y": 4963,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "23762b83.94d65c",
+    "id": "f0982e54.06c37",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4385,
-    "y": 4580,
-    "z": "f8944603.71553",
+    "x": 4377.566665649414,
+    "y": 4591,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e4f34350.306628",
-        "84eda9bb.13e58"
+        "c8f13ad.170ba48",
+        "e5fec2af.744f18"
       ]
     ]
   },
   {
-    "id": "e4f34350.306628",
+    "id": "c8f13ad.170ba48",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4578,
-    "y": 4581,
-    "z": "f8944603.71553",
+    "x": 4570.566665649414,
+    "y": 4592,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d93f9a59.274b5"
+        "7d8426b0.28b2e8"
       ]
     ]
   },
   {
-    "id": "84eda9bb.13e58",
+    "id": "e5fec2af.744f18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4582,
-    "y": 4625,
-    "z": "f8944603.71553",
+    "x": 4574.566665649414,
+    "y": 4636,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "fa8add54.9c2898"
+        "bbb62c5.19c455"
       ]
     ]
   },
   {
-    "id": "fa8add54.9c2898",
+    "id": "bbb62c5.19c455",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4721,
-    "y": 4620,
-    "z": "f8944603.71553",
+    "x": 4713.566665649414,
+    "y": 4631,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "48346123.4f10a8",
-        "5e210590.033b4c",
-        "140ccb32.dd72dd"
+        "fdbb486.bd6db38",
+        "ecce0ba1.70791",
+        "5cdec210.c3723c"
       ]
     ]
   },
   {
-    "id": "d93f9a59.274b5",
+    "id": "7d8426b0.28b2e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4721,
-    "y": 4577,
-    "z": "f8944603.71553",
+    "x": 4713.566665649414,
+    "y": 4588,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a4406b4c.17bbc",
-        "18ca4a3.634f536",
-        "b4f57662.21d798",
-        "540d81b.ac8608"
+        "5a0b429f.b8f42c",
+        "5930a956.25a2b",
+        "8f7ba394.827068",
+        "4161f07f.2b4a78"
       ]
     ]
   },
   {
-    "id": "48346123.4f10a8",
+    "id": "fdbb486.bd6db38",
     "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": 5123.000244140625,
-    "y": 4842,
-    "z": "f8944603.71553",
+    "x": 5115.566909790039,
+    "y": 4853,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "54a11c60.7fd1ec",
+    "id": "1b42c685.843199",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5130.000244140625,
-    "y": 4796,
-    "z": "f8944603.71553",
+    "x": 5122.566909790039,
+    "y": 4807,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a0a762d0.469c28",
+    "id": "4433eaac.652284",
     "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": 4920,
-    "y": 6575,
-    "z": "f8944603.71553",
+    "x": 4912.566665649414,
+    "y": 6586,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "5e210590.033b4c",
+    "id": "ecce0ba1.70791",
     "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": 5241.000244140625,
-    "y": 4884,
-    "z": "f8944603.71553",
+    "x": 5233.566909790039,
+    "y": 4895,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "259aff1b.d97a1",
+    "id": "31466e0d.9a3dba",
     "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": 5116,
-    "y": 5142,
-    "z": "f8944603.71553",
+    "x": 5108.566665649414,
+    "y": 5153,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "80314ddc.393748",
+    "id": "c7cb9f6d.ac734",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3461,
-    "y": 4475,
-    "z": "f8944603.71553",
+    "x": 3453.566665649414,
+    "y": 4486,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d1326c21.abc33",
+    "id": "9ba8b5cc.a415f",
     "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": 3983,
-    "y": 4576,
-    "z": "f8944603.71553",
+    "x": 3975.566665649414,
+    "y": 4587,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "434bd8c2.bae4f8",
+    "id": "595e7f4b.3b8bd8",
     "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": 3440,
-    "y": 4519,
-    "z": "f8944603.71553",
+    "x": 3432.566665649414,
+    "y": 4530,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7ea7dff4.93abc",
-        "616c8d40.285e14",
-        "ffe0a536.7eaff8"
+        "2a6568f7.a02838",
+        "9843c265.208d4",
+        "db80e493.f550d"
       ]
     ]
   },
   {
-    "id": "616c8d40.285e14",
+    "id": "9843c265.208d4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3628.490966796875,
-    "y": 4487.57421875,
-    "z": "f8944603.71553",
+    "x": 3621.057632446289,
+    "y": 4498.57421875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "739b53.f4a4fcac"
+        "d1fd8036.140ed8"
       ]
     ]
   },
   {
-    "id": "ffe0a536.7eaff8",
+    "id": "db80e493.f550d",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3617,
-    "y": 4527,
-    "z": "f8944603.71553",
+    "x": 3609.566665649414,
+    "y": 4538,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "68d1064e.ebb3b8"
+        "b0bc7666.9d27d8"
       ]
     ]
   },
   {
-    "id": "739b53.f4a4fcac",
+    "id": "d1fd8036.140ed8",
     "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": 3788.0625,
-    "y": 4485.85986328125,
-    "z": "f8944603.71553",
+    "x": 3780.629165649414,
+    "y": 4496.85986328125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "68d1064e.ebb3b8",
+    "id": "b0bc7666.9d27d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3778,
-    "y": 4528,
-    "z": "f8944603.71553",
+    "x": 3770.566665649414,
+    "y": 4539,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "aedbd8f5.94f11",
+    "id": "aa03472e.31d4e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3780,
-    "y": 4572,
-    "z": "f8944603.71553",
+    "x": 3772.566665649414,
+    "y": 4583,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "530f885c.d5a28",
-        "d1326c21.abc33"
+        "4ba9a34f.8b45e4",
+        "9ba8b5cc.a415f"
       ]
     ]
   },
   {
-    "id": "7ea7dff4.93abc",
+    "id": "2a6568f7.a02838",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3622,
-    "y": 4564,
-    "z": "f8944603.71553",
+    "x": 3614.566665649414,
+    "y": 4575,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "aedbd8f5.94f11"
+        "aa03472e.31d4e8"
       ]
     ]
   },
   {
-    "id": "530f885c.d5a28",
+    "id": "4ba9a34f.8b45e4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3941,
-    "y": 4504,
-    "z": "f8944603.71553",
+    "x": 3933.566665649414,
+    "y": 4515,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cd1fc06c.124968",
+    "id": "8bf8bc6f.53ce6",
     "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": 3806,
-    "y": 4843,
-    "z": "f8944603.71553",
+    "x": 3798.566665649414,
+    "y": 4854,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "ac8fc812.ca8b88",
+    "id": "d58a2a07.e32878",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5920.88330078125,
-    "y": 6592.88330078125,
-    "z": "f8944603.71553",
+    "x": 5913.449966430664,
+    "y": 6603.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "140ccb32.dd72dd",
+    "id": "5cdec210.c3723c",
     "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": 5120.667236328125,
-    "y": 4980.08349609375,
-    "z": "f8944603.71553",
+    "x": 5113.233901977539,
+    "y": 4991.08349609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "60fccea7.c83a28",
+    "id": "7d691c73.0a445c",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5122.884033203125,
-    "y": 4939.88330078125,
-    "z": "f8944603.71553",
+    "x": 5115.450698852539,
+    "y": 4950.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b61f1c95.4694d",
+    "id": "19c788e0.a62557",
     "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": 4996.6669921875,
-    "y": 5230.08349609375,
-    "z": "f8944603.71553",
+    "x": 4989.233657836914,
+    "y": 5241.08349609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "82a40a13.767da8",
+    "id": "b53673c2.40ae68",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4998.8837890625,
-    "y": 5189.88330078125,
-    "z": "f8944603.71553",
+    "x": 4991.450454711914,
+    "y": 5200.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "91bd4596.74f628",
+    "id": "cb99e55a.09312",
     "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": 5086.466796875,
-    "y": 5592.5166015625,
-    "z": "f8944603.71553",
+    "x": 5079.033462524414,
+    "y": 5603.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f50c2a2e.93dfe8",
+    "id": "b6bbe449.e349b8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4913.466796875,
-    "y": 5649.5166015625,
-    "z": "f8944603.71553",
+    "x": 4906.033462524414,
+    "y": 5660.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8646fa93.554c38",
-        "a6ded94a.e3e54"
+        "9f020db8.9d3b98",
+        "42fb1006.cd98b"
       ]
     ]
   },
   {
-    "id": "8646fa93.554c38",
+    "id": "9f020db8.9d3b98",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5124.466796875,
-    "y": 5649.5166015625,
-    "z": "f8944603.71553",
+    "x": 5117.033462524414,
+    "y": 5660.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "258b63bd.85fb7c"
+        "406d3b53.ee3654"
       ]
     ]
   },
   {
-    "id": "a6ded94a.e3e54",
+    "id": "42fb1006.cd98b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5120.466796875,
-    "y": 5697.5166015625,
-    "z": "f8944603.71553",
+    "x": 5113.033462524414,
+    "y": 5708.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d925f9fa.8153b8"
+        "fa70895e.520cf8"
       ]
     ]
   },
   {
-    "id": "258b63bd.85fb7c",
+    "id": "406d3b53.ee3654",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5280.466796875,
-    "y": 5645.5166015625,
-    "z": "f8944603.71553",
+    "x": 5273.033462524414,
+    "y": 5656.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8d6cf51e.6059f8",
-        "44488697.cdb02",
-        "c9ce352b.46ce88"
+        "8249d2ac.0a73f8",
+        "2838a041.93c678",
+        "45d14641.c6458"
       ]
     ]
   },
   {
-    "id": "d925f9fa.8153b8",
+    "id": "fa70895e.520cf8",
     "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": 5268.466796875,
-    "y": 5692.5166015625,
-    "z": "f8944603.71553",
+    "x": 5261.033462524414,
+    "y": 5703.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "df7464c9.77f0d",
+    "id": "f332f23.f01a81",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5590.3505859375,
-    "y": 5746.39990234375,
-    "z": "f8944603.71553",
+    "x": 5582.917251586914,
+    "y": 5757.39990234375,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "c9ce352b.46ce88",
+    "id": "45d14641.c6458",
     "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": 5594.1337890625,
-    "y": 5784.60009765625,
-    "z": "f8944603.71553",
+    "x": 5586.700454711914,
+    "y": 5795.60009765625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "44488697.cdb02",
+    "id": "2838a041.93c678",
     "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": 5700.466796875,
-    "y": 5697.5166015625,
-    "z": "f8944603.71553",
+    "x": 5693.033462524414,
+    "y": 5708.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "8d6cf51e.6059f8",
+    "id": "8249d2ac.0a73f8",
     "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": 5584.466796875,
-    "y": 5645.5166015625,
-    "z": "f8944603.71553",
+    "x": 5577.033462524414,
+    "y": 5656.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7e224339.ebcda4",
+    "id": "3aa78165.d5c51e",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4975.466796875,
-    "y": 5550.5166015625,
-    "z": "f8944603.71553",
+    "x": 4968.033462524414,
+    "y": 5561.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "60c16c76.a98d34",
+    "id": "5e482e7e.e4be78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4687.7998046875,
-    "y": 5725.5166015625,
-    "z": "f8944603.71553",
+    "x": 4680.366470336914,
+    "y": 5736.5166015625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "91bd4596.74f628",
-        "f50c2a2e.93dfe8",
-        "b08c7802.5d204",
-        "7492e58a.da53dc"
+        "cb99e55a.09312",
+        "b6bbe449.e349b8",
+        "5021b590.5d75e4",
+        "316a2790.87ce5"
       ]
     ]
   },
   {
-    "id": "8396080f.a7f6c8",
+    "id": "b03c5831.d4c5f",
     "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": 4987.8330078125,
-    "y": 6086.2001953125,
-    "z": "f8944603.71553",
+    "x": 4980.399673461914,
+    "y": 6097.2001953125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "e07ba4bc.bfaae8",
+    "id": "b60a5a20.1568d",
     "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": 5794.116668701172,
-    "y": 6923.116668701172,
-    "z": "f8944603.71553",
+    "x": 5786.683334350586,
+    "y": 6934.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "55635f65.d76ee8",
+    "id": "fe65cd53.d11278",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5413.116668701172,
-    "y": 6926.116668701172,
-    "z": "f8944603.71553",
+    "x": 5405.683334350586,
+    "y": 6937.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e07ba4bc.bfaae8",
-        "d0282e45.27576",
-        "be279863.754a6"
+        "b60a5a20.1568d",
+        "364f2ed4.be66d2",
+        "3daa885e.628288"
       ]
     ]
   },
   {
-    "id": "d0282e45.27576",
+    "id": "364f2ed4.be66d2",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5639.116668701172,
-    "y": 6978.116668701172,
-    "z": "f8944603.71553",
+    "x": 5631.683334350586,
+    "y": 6989.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "adb0d898.09cba8"
+        "1f12c870.4650c"
       ]
     ]
   },
   {
-    "id": "adb0d898.09cba8",
+    "id": "1f12c870.4650c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5818.116668701172,
-    "y": 6977.116668701172,
-    "z": "f8944603.71553",
+    "x": 5810.683334350586,
+    "y": 6988.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "494eed0f.99eb84"
+        "8c69c55b.110248"
       ]
     ]
   },
   {
-    "id": "be279863.754a6",
+    "id": "3daa885e.628288",
     "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": 5640.116668701172,
-    "y": 6871.116668701172,
-    "z": "f8944603.71553",
+    "x": 5632.683334350586,
+    "y": 6882.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3cd9264c.3cdbea",
+    "id": "651f3c1e.ddf684",
     "type": "notify",
     "name": "notify",
     "xml": "<notify plugin='' resource='' action='' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2634.116668701172,
-    "y": 920.1166687011719,
-    "z": "f8944603.71553",
+    "x": 2626.683334350586,
+    "y": 931.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "d4db1de6.243c9",
+    "id": "f71bee39.3d2f68",
     "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": 3312.116668701172,
-    "y": 696.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3304.683334350586,
+    "y": 707.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b2eea3d4.d83b2",
+    "id": "1f090c0d.f20bac",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3528.116668701172,
-    "y": 1024.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3520.683334350586,
+    "y": 1035.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "c92a9c74.6d8cb",
+    "id": "4c96009f.d63af8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3523.625732421875,
-    "y": 1066.542724609375,
-    "z": "f8944603.71553",
+    "x": 3516.192398071289,
+    "y": 1077.542724609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "be6d3c2.c1bdfc",
+    "id": "30702b44.ca2744",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3527.625701904297,
-    "y": 1114.5426940917969,
-    "z": "f8944603.71553",
+    "x": 3520.192367553711,
+    "y": 1125.5426940917969,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "82044de7.824378"
+        "f0fe90c1.1ee158"
       ]
     ]
   },
   {
-    "id": "82044de7.824378",
+    "id": "f0fe90c1.1ee158",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3685.116668701172,
-    "y": 1114.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3677.683334350586,
+    "y": 1125.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9732d3c5.76e0c8"
+        "24f554c8.25b494"
       ]
     ]
   },
   {
-    "id": "9732d3c5.76e0c8",
+    "id": "24f554c8.25b494",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3855.11669921875,
-    "y": 1117.1168212890625,
-    "z": "f8944603.71553",
+    "x": 3847.683364868164,
+    "y": 1128.1168212890625,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7d1d73b.5c3fc8c",
-        "8cd6f95a.d7c4d",
-        "68098f91.a64618"
+        "92b753af.8b83b",
+        "e0d04b94.0a949",
+        "3f783acd.f1212e"
       ]
     ]
   },
   {
-    "id": "7d1d73b.5c3fc8c",
+    "id": "92b753af.8b83b",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4029.116668701172,
-    "y": 1055.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4021.683334350586,
+    "y": 1066.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a9479bec.894888"
+        "34be9217.24bb7e"
       ]
     ]
   },
   {
-    "id": "8cd6f95a.d7c4d",
+    "id": "e0d04b94.0a949",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4031.116668701172,
-    "y": 1109.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4023.683334350586,
+    "y": 1120.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d844935e.741748"
+        "1a5ec0d1.1d1527"
       ]
     ]
   },
   {
-    "id": "a9479bec.894888",
+    "id": "34be9217.24bb7e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4157.116668701172,
-    "y": 1055.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4149.683334350586,
+    "y": 1066.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7a232bae.539a2c",
-        "19f7263a.0f2e72"
+        "c2e9a46e.2fa128",
+        "d3171aa3.cb0078"
       ]
     ]
   },
   {
-    "id": "d844935e.741748",
+    "id": "1a5ec0d1.1d1527",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4160.116668701172,
-    "y": 1108.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4152.683334350586,
+    "y": 1119.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e31191f4.c7e44",
-        "c783c2e3.52d62"
+        "1fb8ea51.9b1c8e",
+        "b9df456c.24fc38"
       ]
     ]
   },
   {
-    "id": "19f7263a.0f2e72",
+    "id": "d3171aa3.cb0078",
     "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": 4318.116668701172,
-    "y": 1079.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4310.683334350586,
+    "y": 1090.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "e31191f4.c7e44",
+    "id": "1fb8ea51.9b1c8e",
     "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": 4335.116668701172,
-    "y": 1121.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4327.683334350586,
+    "y": 1132.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "c783c2e3.52d62",
+    "id": "b9df456c.24fc38",
     "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": 4320.116668701172,
-    "y": 1159.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4312.683334350586,
+    "y": 1170.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7a232bae.539a2c",
+    "id": "c2e9a46e.2fa128",
     "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": 4332.116668701172,
-    "y": 1039.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4324.683334350586,
+    "y": 1050.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "5dbb2ad5.55ee04",
+    "id": "dc69c361.915968",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4497.116668701172,
-    "y": 1055.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4489.683334350586,
+    "y": 1066.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "4c9f1a43.e137e4",
+    "id": "6cb3b80a.d81b1",
     "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": 3288.116668701172,
-    "y": 1041.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3280.683334350586,
+    "y": 1052.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b2eea3d4.d83b2",
-        "c92a9c74.6d8cb",
-        "be6d3c2.c1bdfc"
+        "1f090c0d.f20bac",
+        "4c96009f.d63af8",
+        "30702b44.ca2744"
       ]
     ]
   },
   {
-    "id": "68098f91.a64618",
+    "id": "3f783acd.f1212e",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3974.116668701172,
-    "y": 1173.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3966.683334350586,
+    "y": 1184.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "3baeb12d.78947e"
+        "ce69203c.a7c0d"
       ]
     ]
   },
   {
-    "id": "3baeb12d.78947e",
+    "id": "ce69203c.a7c0d",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4148.116668701172,
-    "y": 1168.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4140.683334350586,
+    "y": 1179.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f32a06d7.18ee6",
-        "9c8c5f6f.4f4828"
+        "77a19b24.92e3d4",
+        "6c3b4ea8.3b622"
       ]
     ]
   },
   {
-    "id": "9c8c5f6f.4f4828",
+    "id": "6c3b4ea8.3b622",
     "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": 4318.116668701172,
-    "y": 1241.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4310.683334350586,
+    "y": 1252.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "f32a06d7.18ee6",
+    "id": "77a19b24.92e3d4",
     "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": 4372.116668701172,
-    "y": 1201.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4364.683334350586,
+    "y": 1212.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "89b3411b.fe2cb",
+    "id": "a7c6adcc.5c3908",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4486.116668701172,
-    "y": 1226.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4478.683334350586,
+    "y": 1237.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "fe4b773c.0eae98",
+    "id": "cb966d3f.bcf358",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4045.116668701172,
-    "y": 929.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4037.683334350586,
+    "y": 940.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a6d4107d.6655f"
+        "359af935.19ef46"
       ]
     ]
   },
   {
-    "id": "e8ae3a08.56b988",
+    "id": "ca572ac1.2b94f8",
     "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": 4389.116668701172,
-    "y": 997.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4381.683334350586,
+    "y": 1008.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "8ecb2104.b1fc58",
+    "id": "60fff9bd.2ccfe",
     "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": 4443.116668701172,
-    "y": 957.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4435.683334350586,
+    "y": 968.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a817660e.e9d2",
+    "id": "74e2fab5.3910b4",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4587.116668701172,
-    "y": 986.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4579.683334350586,
+    "y": 997.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a6d4107d.6655f",
+    "id": "359af935.19ef46",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4219.116668701172,
-    "y": 924.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4211.683334350586,
+    "y": 935.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8ecb2104.b1fc58",
-        "e8ae3a08.56b988"
+        "60fff9bd.2ccfe",
+        "ca572ac1.2b94f8"
       ]
     ]
   },
   {
-    "id": "83ce05e.7f315f8",
+    "id": "dd62b4eb.26fb1",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4105.116668701172,
-    "y": 667.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4097.683334350586,
+    "y": 678.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d03cb873.c57328"
+        "eaab099.c2c5e78"
       ]
     ]
   },
   {
-    "id": "2049e56d.3172ca",
+    "id": "44f31aac.78bf4c",
     "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": 4449.116668701172,
-    "y": 735.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4441.683334350586,
+    "y": 746.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "6995e48e.171b9c",
+    "id": "e00b5614.1b212",
     "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": 4503.116668701172,
-    "y": 695.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4495.683334350586,
+    "y": 706.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "80fe4b30.9273d",
+    "id": "fb8145.224d2eb8",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4617.116668701172,
-    "y": 720.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4609.683334350586,
+    "y": 731.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d03cb873.c57328",
+    "id": "eaab099.c2c5e78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4279.116668701172,
-    "y": 662.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4271.683334350586,
+    "y": 673.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6995e48e.171b9c",
-        "2049e56d.3172ca"
+        "e00b5614.1b212",
+        "44f31aac.78bf4c"
       ]
     ]
   },
   {
-    "id": "d8eb368d.7e35e8",
+    "id": "47b6d6c0.771098",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3686.116668701172,
-    "y": 2544.116668701172,
-    "z": "f8944603.71553",
+    "x": 3678.683334350586,
+    "y": 2555.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9d31c4f.62b63b8",
-        "42d540.6e2552c"
+        "d5c762a3.e1b22",
+        "cd80f814.c17fb8"
       ]
     ]
   },
   {
-    "id": "4acebe87.51a2e",
+    "id": "6a53c92c.c39ad8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3513.450164794922,
-    "y": 2545.116668701172,
-    "z": "f8944603.71553",
+    "x": 3506.016830444336,
+    "y": 2556.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d8eb368d.7e35e8"
+        "47b6d6c0.771098"
       ]
     ]
   },
   {
-    "id": "faf79ca9.39c718",
+    "id": "15ee64d.915489b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3522.941131591797,
-    "y": 2587.690704345703,
-    "z": "f8944603.71553",
+    "x": 3515.507797241211,
+    "y": 2598.690704345703,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "760b8826.a76aa",
+    "id": "ffc72b13.54b308",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3511.450164794922,
-    "y": 2634.116668701172,
-    "z": "f8944603.71553",
+    "x": 3504.016830444336,
+    "y": 2645.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d31c4f.62b63b8",
+    "id": "d5c762a3.e1b22",
     "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": 3972.450164794922,
-    "y": 2548.1167907714844,
-    "z": "f8944603.71553",
+    "x": 3965.016830444336,
+    "y": 2559.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "beea1414.622ca8",
-        "e0900c85.f5153"
+        "39f97b3f.483dec",
+        "a10b377c.8904d8"
       ]
     ]
   },
   {
-    "id": "e0900c85.f5153",
+    "id": "a10b377c.8904d8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4195.450164794922,
-    "y": 2503.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4188.016830444336,
+    "y": 2514.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b1fce547.cdefa8"
+        "1c79745.54c4b0c"
       ]
     ]
   },
   {
-    "id": "beea1414.622ca8",
+    "id": "39f97b3f.483dec",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4197.450164794922,
-    "y": 2567.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4190.016830444336,
+    "y": 2578.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1f2077c9.d2f12"
+        "5e26eb53.994624"
       ]
     ]
   },
   {
-    "id": "1931dff5.72d728",
+    "id": "59ced5c4.1cbb54",
     "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": 3285.450164794922,
-    "y": 2580.116668701172,
-    "z": "f8944603.71553",
+    "x": 3278.016830444336,
+    "y": 2591.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4acebe87.51a2e",
-        "faf79ca9.39c718",
-        "760b8826.a76aa"
+        "6a53c92c.c39ad8",
+        "15ee64d.915489b",
+        "ffc72b13.54b308"
       ]
     ]
   },
   {
-    "id": "20a2805c.f7ce68",
+    "id": "bf53a639.73b6d8",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3246.450164794922,
-    "y": 2524.116668701172,
-    "z": "f8944603.71553",
+    "x": 3239.016830444336,
+    "y": 2535.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "f953800.9cf34",
+    "id": "7411f30.15b1c8c",
     "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": 3305.450164794922,
-    "y": 2320.116668701172,
-    "z": "f8944603.71553",
+    "x": 3298.016830444336,
+    "y": 2331.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "1523d633.28a802",
-        "23587c7d.fbba4c"
+        "dd801267.ae8a78",
+        "2c468159.26cb9e"
       ]
     ]
   },
   {
-    "id": "23587c7d.fbba4c",
+    "id": "2c468159.26cb9e",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3528.450164794922,
-    "y": 2306.116668701172,
-    "z": "f8944603.71553",
+    "x": 3521.016830444336,
+    "y": 2317.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c7b4b7e7.8e8b78"
+        "1f5c2f54.7e50d9"
       ]
     ]
   },
   {
-    "id": "1523d633.28a802",
+    "id": "dd801267.ae8a78",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3530.450164794922,
-    "y": 2339.116668701172,
-    "z": "f8944603.71553",
+    "x": 3523.016830444336,
+    "y": 2350.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7b4b7e7.8e8b78",
+    "id": "1f5c2f54.7e50d9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3676.450164794922,
-    "y": 2299.116668701172,
-    "z": "f8944603.71553",
+    "x": 3669.016830444336,
+    "y": 2310.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cb965cfe.67a2f",
-        "1a7add8d.af97ca"
+        "33d7ee91.be9492",
+        "2cd16653.cccd12"
       ]
     ]
   },
   {
-    "id": "cb965cfe.67a2f",
+    "id": "33d7ee91.be9492",
     "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": 3870.450164794922,
-    "y": 2302.1167907714844,
-    "z": "f8944603.71553",
+    "x": 3863.016830444336,
+    "y": 2313.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "42d540.6e2552c",
+    "id": "cd80f814.c17fb8",
     "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": 3923.4501342773438,
-    "y": 2671.1166381835938,
-    "z": "f8944603.71553",
+    "x": 3916.016799926758,
+    "y": 2682.1166381835938,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b84e7511.3844a8"
+        "f197c90a.b0bfd8"
       ]
     ]
   },
   {
-    "id": "b84e7511.3844a8",
+    "id": "f197c90a.b0bfd8",
     "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": 4129.450134277344,
-    "y": 2671.1166381835938,
-    "z": "f8944603.71553",
+    "x": 4122.016799926758,
+    "y": 2682.1166381835938,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ac19c527.29aaf8"
+        "ee87c14f.7e00c8"
       ]
     ]
   },
   {
-    "id": "1a7add8d.af97ca",
+    "id": "2cd16653.cccd12",
     "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": 3892.450164794922,
-    "y": 2370.1167907714844,
-    "z": "f8944603.71553",
+    "x": 3885.016830444336,
+    "y": 2381.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "c6c93f82.1aa228",
-        "f4da497f.0275c8",
-        "6e9758a5.eabec"
+        "b86ed6f1.7f482",
+        "f1a441ce.e5665",
+        "de4f03bc.b1dad"
       ]
     ]
   },
   {
-    "id": "c6c93f82.1aa228",
+    "id": "b86ed6f1.7f482",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4087.9502868652344,
-    "y": 2322.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4080.5169525146484,
+    "y": 2333.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a1f1dc1c.4be4e8"
+        "4728dd3.dc78424"
       ]
     ]
   },
   {
-    "id": "f4da497f.0275c8",
+    "id": "f1a441ce.e5665",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4079.9502868652344,
-    "y": 2377.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4072.5169525146484,
+    "y": 2388.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "dd2530b3.0ce388"
+        "250a014d.a07c5e"
       ]
     ]
   },
   {
-    "id": "6e9758a5.eabec",
+    "id": "de4f03bc.b1dad",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4084.9502868652344,
-    "y": 2434.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4077.5169525146484,
+    "y": 2445.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "35cb1b46.9ab3ac"
+        "c4850afb.039ba"
       ]
     ]
   },
   {
-    "id": "35cb1b46.9ab3ac",
+    "id": "c4850afb.039ba",
     "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": 4236.950286865234,
-    "y": 2435.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4229.516952514648,
+    "y": 2446.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a1f1dc1c.4be4e8",
+    "id": "4728dd3.dc78424",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4232.332611083984,
-    "y": 2319.7724609375,
-    "z": "f8944603.71553",
+    "x": 4224.899276733398,
+    "y": 2330.7724609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "807e8aa5.b5f288"
+        "f5f74636.92701"
       ]
     ]
   },
   {
-    "id": "be1fed24.75522",
+    "id": "b2338e3d.f752e8",
     "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": 3308.116668701172,
-    "y": 2659.116668701172,
-    "z": "f8944603.71553",
+    "x": 3300.683334350586,
+    "y": 2670.116668701172,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "89002347.f12fb8",
+    "id": "b3bc28cb.23625",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3983.1166381835938,
-    "y": 2623.1166381835938,
-    "z": "f8944603.71553",
+    "x": 3975.683303833008,
+    "y": 2634.1166381835938,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "1f2077c9.d2f12",
+    "id": "5e26eb53.994624",
     "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": 4356.450164794922,
-    "y": 2586.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4349.016830444336,
+    "y": 2597.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b1fce547.cdefa8",
+    "id": "1c79745.54c4b0c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4360.450164794922,
-    "y": 2500.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4353.016830444336,
+    "y": 2511.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9ddcbad2.3cd968",
-        "a4909c74.16b3c"
+        "fe7cdeb0.daac9",
+        "34c0d4b1.5c7dfc"
       ]
     ]
   },
   {
-    "id": "ac19c527.29aaf8",
+    "id": "ee87c14f.7e00c8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4346.735778808594,
-    "y": 2669.9384155273438,
-    "z": "f8944603.71553",
+    "x": 4339.302444458008,
+    "y": 2680.9384155273438,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "aecc45b1.07799"
+        "fc8a72d4.98e42"
       ]
     ]
   },
   {
-    "id": "dd2530b3.0ce388",
+    "id": "250a014d.a07c5e",
     "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": 4247.950286865234,
-    "y": 2380.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4240.516952514648,
+    "y": 2391.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "9ddcbad2.3cd968",
+    "id": "fe7cdeb0.daac9",
     "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": 4530.450164794922,
-    "y": 2461.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4523.016830444336,
+    "y": 2472.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a4909c74.16b3c",
+    "id": "34c0d4b1.5c7dfc",
     "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": 4531.450164794922,
-    "y": 2566.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4524.016830444336,
+    "y": 2577.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "90f369e0.1f5ea",
+    "id": "6a8cd207.c1e8c4",
     "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": 4526.450164794922,
-    "y": 2515.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4519.016830444336,
+    "y": 2526.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "aecc45b1.07799",
+    "id": "fc8a72d4.98e42",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4553.567321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4546.133987426758,
+    "y": 2670.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d7d46b6.f157298",
-        "a76ccf28.3b019",
-        "6d38c2ba.e73f94"
+        "8f4cacd5.ce6228",
+        "4e56644.a64779c",
+        "68f649.e92691b8"
       ]
     ]
   },
   {
-    "id": "d7d46b6.f157298",
+    "id": "8f4cacd5.ce6228",
     "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": 4768.567321777344,
-    "y": 2621.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4761.133987426758,
+    "y": 2632.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a76ccf28.3b019",
+    "id": "4e56644.a64779c",
     "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": 4765.567321777344,
-    "y": 2660.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4758.133987426758,
+    "y": 2671.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "af66a72d.a68048"
+        "9a6ae8ae.1adf3"
       ]
     ]
   },
   {
-    "id": "6d38c2ba.e73f94",
+    "id": "68f649.e92691b8",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4721.067321777344,
-    "y": 2702.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4713.633987426758,
+    "y": 2713.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "56aae750.4bf18",
+    "id": "d8d22b92.e3f9c8",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4814.450164794922,
-    "y": 2338.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4807.016830444336,
+    "y": 2349.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "df2c6ab5.f8c7a"
+        "8d5de697.738fb"
       ]
     ]
   },
   {
-    "id": "807e8aa5.b5f288",
+    "id": "f5f74636.92701",
     "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": 4416.450164794922,
-    "y": 2334.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4409.016830444336,
+    "y": 2345.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "83815f42.db62e8"
+        "458de584.eb17d4"
       ]
     ]
   },
   {
-    "id": "83815f42.db62e8",
+    "id": "458de584.eb17d4",
     "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": 4611.450164794922,
-    "y": 2334.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4604.016830444336,
+    "y": 2345.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "56aae750.4bf18",
-        "ace3955f.b78118"
+        "d8d22b92.e3f9c8",
+        "aa17b1cc.ebb808"
       ]
     ]
   },
   {
-    "id": "ace3955f.b78118",
+    "id": "aa17b1cc.ebb808",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4816.450164794922,
-    "y": 2411.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4809.016830444336,
+    "y": 2422.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "86fe5017.1c8158"
+        "74ed71f8.f337d8"
       ]
     ]
   },
   {
-    "id": "af66a72d.a68048",
+    "id": "9a6ae8ae.1adf3",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4946.067321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4938.633987426758,
+    "y": 2670.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "73b98dcb.d53e2c"
+        "48cbb65c.c75f18"
       ]
     ]
   },
   {
-    "id": "73b98dcb.d53e2c",
+    "id": "48cbb65c.c75f18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5104.067321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 5096.633987426758,
+    "y": 2670.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "35f64a50.ea71a6"
+        "5d1f9a1.a44f9e4"
       ]
     ]
   },
   {
-    "id": "35f64a50.ea71a6",
+    "id": "5d1f9a1.a44f9e4",
     "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": 5311.067321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 5303.633987426758,
+    "y": 2670.4570922851562,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "df2c6ab5.f8c7a",
+    "id": "8d5de697.738fb",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4991.450164794922,
-    "y": 2330.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4984.016830444336,
+    "y": 2341.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "b41095a1.9dd71",
-        "c294b821.4082d"
+        "557f2b2a.e4488c",
+        "b7eb9cb4.7bd228"
       ]
     ]
   },
   {
-    "id": "c294b821.4082d",
+    "id": "b7eb9cb4.7bd228",
     "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": 5199.450164794922,
-    "y": 2337.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5192.016830444336,
+    "y": 2348.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cbd53666.7a192",
-        "70f8105c.8c53c8",
-        "d07f4c5c.e57d28"
+        "2cc0f80f.8e664",
+        "e33c4c36.9c6408",
+        "decf6255.02de4"
       ]
     ]
   },
   {
-    "id": "86fe5017.1c8158",
+    "id": "74ed71f8.f337d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4993.450164794922,
-    "y": 2403.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4986.016830444336,
+    "y": 2414.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "29792fa0.312a5"
+        "ddc00f08.8fee3"
       ]
     ]
   },
   {
-    "id": "b41095a1.9dd71",
+    "id": "557f2b2a.e4488c",
     "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": 5229.450164794922,
-    "y": 2285.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5222.016830444336,
+    "y": 2296.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "29792fa0.312a5",
+    "id": "ddc00f08.8fee3",
     "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": 5228.450164794922,
-    "y": 2527.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5221.016830444336,
+    "y": 2538.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cbd53666.7a192",
+    "id": "2cc0f80f.8e664",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5409.450164794922,
-    "y": 2328.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5402.016830444336,
+    "y": 2339.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "12fe1a85.5f5265"
+        "aada8b04.37bbe"
       ]
     ]
   },
   {
-    "id": "70f8105c.8c53c8",
+    "id": "e33c4c36.9c6408",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5401.450164794922,
-    "y": 2383.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5394.016830444336,
+    "y": 2394.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "720591da.7ff908"
+        "52b0fc34.6385e4"
       ]
     ]
   },
   {
-    "id": "d07f4c5c.e57d28",
+    "id": "decf6255.02de4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5406.450164794922,
-    "y": 2440.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5399.016830444336,
+    "y": 2451.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "50fd00db.804e78"
+        "1d0f9aee.0f2085"
       ]
     ]
   },
   {
-    "id": "50fd00db.804e78",
+    "id": "1d0f9aee.0f2085",
     "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": 5558.450164794922,
-    "y": 2441.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5551.016830444336,
+    "y": 2452.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "720591da.7ff908",
+    "id": "52b0fc34.6385e4",
     "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": 5569.450164794922,
-    "y": 2386.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5562.016830444336,
+    "y": 2397.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "12fe1a85.5f5265",
+    "id": "aada8b04.37bbe",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5553.832489013672,
-    "y": 2325.7724609375,
-    "z": "f8944603.71553",
+    "x": 5546.399154663086,
+    "y": 2336.7724609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d4fbd78f.a8b058"
+        "b0a8403b.df77f8"
       ]
     ]
   },
   {
-    "id": "d4fbd78f.a8b058",
+    "id": "b0a8403b.df77f8",
     "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": 5768.450164794922,
-    "y": 2322.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5761.016830444336,
+    "y": 2333.1167907714844,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "3ab03c8.bdf8544",
+    "id": "8b07e19d.5f94",
     "type": "switchNode",
     "name": "switch secondary empty?",
     "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3282.116668701172,
-    "y": 795.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3274.683334350586,
+    "y": 806.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7806cbe6.64ea14",
-        "91bd4861.b38048"
+        "ba76d6d3.05fe9",
+        "fe627d30.e07a9"
       ]
     ]
   },
   {
-    "id": "7806cbe6.64ea14",
+    "id": "ba76d6d3.05fe9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3404.11669921875,
-    "y": 740.11669921875,
-    "z": "f8944603.71553",
+    "x": 3396.683364868164,
+    "y": 751.11669921875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4d1b7d4.397bf04"
+        "aae22e84.83191"
       ]
     ]
   },
   {
-    "id": "91bd4861.b38048",
+    "id": "fe627d30.e07a9",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3391.11669921875,
-    "y": 849.11669921875,
-    "z": "f8944603.71553",
+    "x": 3383.683364868164,
+    "y": 860.11669921875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "a8d8fc87.45b9a"
+        "652bcf4e.b1513"
       ]
     ]
   },
   {
-    "id": "4d1b7d4.397bf04",
+    "id": "aae22e84.83191",
     "type": "set",
     "name": "set hasSecondary false",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
     "comments": "",
-    "x": 3619.116668701172,
-    "y": 577.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3611.683334350586,
+    "y": 588.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "a8d8fc87.45b9a",
+    "id": "652bcf4e.b1513",
     "type": "set",
     "name": "set hasSecondary true",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 3615.116668701172,
-    "y": 621.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3607.683334350586,
+    "y": 632.1166687011719,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "87dcb71b.a618f",
+    "id": "8877dbf4.9fef7",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3812.11669921875,
-    "y": 3521.11669921875,
-    "z": "f8944603.71553",
+    "x": 3804.683364868164,
+    "y": 3532.11669921875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9a1c6f33.80c0c"
+        "8a807ecd.e2d688"
       ]
     ]
   },
   {
-    "id": "9a1c6f33.80c0c",
+    "id": "8a807ecd.e2d688",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4003.11669921875,
-    "y": 3525.11669921875,
-    "z": "f8944603.71553",
+    "x": 3995.683364868164,
+    "y": 3536.11669921875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8de09ee3.1f82b8"
+        "157127d1.cb4078"
       ]
     ]
   },
   {
-    "id": "8de09ee3.1f82b8",
+    "id": "157127d1.cb4078",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4130.11669921875,
-    "y": 3524.11669921875,
-    "z": "f8944603.71553",
+    "x": 4122.683364868164,
+    "y": 3535.11669921875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cc59ae49.952b8",
-        "3b72359b.f45e6a"
+        "75df7ed7.bf083",
+        "34e17ebd.74d332"
       ]
     ]
   },
   {
-    "id": "3b72359b.f45e6a",
+    "id": "34e17ebd.74d332",
     "type": "save",
     "name": "save SECONDARY-ROOT UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4352.11669921875,
-    "y": 3413.11669921875,
-    "z": "f8944603.71553",
+    "x": 4344.683364868164,
+    "y": 3424.11669921875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "d566dc7.835f6a",
+    "id": "877b276.88c73d8",
     "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": 3357,
-    "y": 453,
-    "z": "f8944603.71553",
+    "x": 3349.566665649414,
+    "y": 464,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "cc59ae49.952b8",
+    "id": "75df7ed7.bf083",
     "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": 4348,
-    "y": 3472,
-    "z": "f8944603.71553",
+    "x": 4340.566665649414,
+    "y": 3483,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e0cf290a.3bb57",
-        "91bee9e5.bd12c8"
+        "298158e5.1b02b8",
+        "8816a027.c5ad7"
       ]
     ]
   },
   {
-    "id": "e0cf290a.3bb57",
+    "id": "298158e5.1b02b8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4558,
-    "y": 3449,
-    "z": "f8944603.71553",
+    "x": 4550.566665649414,
+    "y": 3460,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "2e6c4f7b.89f37"
+        "2754d16a.8d72ae"
       ]
     ]
   },
   {
-    "id": "2e6c4f7b.89f37",
+    "id": "2754d16a.8d72ae",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4684,
-    "y": 3449,
-    "z": "f8944603.71553",
+    "x": 4676.566665649414,
+    "y": 3460,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e80cf077.13626"
+        "1ec26074.15dbf"
       ]
     ]
   },
   {
-    "id": "eb956f81.674a8",
+    "id": "7bc2899d.3cc8d",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4689,
-    "y": 3498,
-    "z": "f8944603.71553",
+    "x": 4681.566665649414,
+    "y": 3509,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "538ba095.13ecb8",
-        "a894e133.03a62",
-        "bbac82b0.611ad8",
-        "5d08bff9.d57b18"
+        "4336d7d0.b3e05",
+        "60df6ba0.591fdc",
+        "73d9646c.b91d7c",
+        "81cba3c.9ee8de"
       ]
     ]
   },
   {
-    "id": "91bee9e5.bd12c8",
+    "id": "8816a027.c5ad7",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4563,
-    "y": 3498,
-    "z": "f8944603.71553",
+    "x": 4555.566665649414,
+    "y": 3509,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "eb956f81.674a8"
+        "7bc2899d.3cc8d"
       ]
     ]
   },
   {
-    "id": "e80cf077.13626",
+    "id": "1ec26074.15dbf",
     "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": 5012,
-    "y": 3446,
-    "z": "f8944603.71553",
+    "x": 5004.566665649414,
+    "y": 3457,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "538ba095.13ecb8",
+    "id": "4336d7d0.b3e05",
     "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": 4965,
-    "y": 3537,
-    "z": "f8944603.71553",
+    "x": 4957.566665649414,
+    "y": 3548,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "a894e133.03a62",
+    "id": "60df6ba0.591fdc",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-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": 4913,
-    "y": 3579,
-    "z": "f8944603.71553",
+    "x": 4905.566665649414,
+    "y": 3590,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "bbac82b0.611ad8",
+    "id": "73d9646c.b91d7c",
     "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": 5042,
-    "y": 3621,
-    "z": "f8944603.71553",
+    "x": 5034.566665649414,
+    "y": 3632,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "7be6dab9.621efc",
+    "id": "63767aff.e83474",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 4928,
-    "y": 3494,
-    "z": "f8944603.71553",
+    "x": 4920.566665649414,
+    "y": 3505,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "5d08bff9.d57b18",
+    "id": "81cba3c.9ee8de",
     "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": 5020,
-    "y": 3669,
-    "z": "f8944603.71553",
+    "x": 5012.566665649414,
+    "y": 3680,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "748bc1ca.c78678",
+    "id": "238550a0.c6cd18",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3840,
-    "y": 3472,
-    "z": "f8944603.71553",
+    "x": 3832.566665649414,
+    "y": 3483,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "286f0ec8.852352",
+    "id": "374b533b.d2c934",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3815,
-    "y": 4143,
-    "z": "f8944603.71553",
+    "x": 3807.566665649414,
+    "y": 4154,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d7543b1f.0223a"
+        "42d7b44a.367424"
       ]
     ]
   },
   {
-    "id": "d7543b1f.0223a",
+    "id": "42d7b44a.367424",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4007,
-    "y": 4138,
-    "z": "f8944603.71553",
+    "x": 3999.566665649414,
+    "y": 4149,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "8aacb5a.7bd82c8"
+        "aa122d60.47dec8"
       ]
     ]
   },
   {
-    "id": "8aacb5a.7bd82c8",
+    "id": "aa122d60.47dec8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4136,
-    "y": 4138,
-    "z": "f8944603.71553",
+    "x": 4128.566665649414,
+    "y": 4149,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9ecf386c.da77f"
+        "bc496cc4.1ac428"
       ]
     ]
   },
   {
-    "id": "9ecf386c.da77f",
+    "id": "bc496cc4.1ac428",
     "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": 4468,
-    "y": 4136,
-    "z": "f8944603.71553",
+    "x": 4460.566665649414,
+    "y": 4147,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "2bbca6cc.0ec622",
+    "id": "e008f489.a45f08",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3803,
-    "y": 4367,
-    "z": "f8944603.71553",
+    "x": 3795.566665649414,
+    "y": 4378,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "85f62fba.be3af8"
+        "7e1de7f3.95bcb"
       ]
     ]
   },
   {
-    "id": "85f62fba.be3af8",
+    "id": "7e1de7f3.95bcb",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3983,
-    "y": 4366,
-    "z": "f8944603.71553",
+    "x": 3975.566665649414,
+    "y": 4377,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f0b10235.e7e788"
+        "5cd7b855.2a4ef"
       ]
     ]
   },
   {
-    "id": "f0b10235.e7e788",
+    "id": "5cd7b855.2a4ef",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4112,
-    "y": 4366,
-    "z": "f8944603.71553",
+    "x": 4104.566665649414,
+    "y": 4377,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "ccf3ecf0.96a2b"
+        "e3d19dba.c0bd7"
       ]
     ]
   },
   {
-    "id": "ccf3ecf0.96a2b",
+    "id": "e3d19dba.c0bd7",
     "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": 4329.88330078125,
-    "y": 4364.88330078125,
-    "z": "f8944603.71553",
+    "x": 4322.449966430664,
+    "y": 4375.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "cabe89a7.9d69e"
+        "53c7d161.8eb9"
       ]
     ]
   },
   {
-    "id": "cabe89a7.9d69e",
+    "id": "53c7d161.8eb9",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4544.88330078125,
-    "y": 4364.88330078125,
-    "z": "f8944603.71553",
+    "x": 4537.449966430664,
+    "y": 4375.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "760290ae.a21e"
+        "fbe01cc.5b1afe"
       ]
     ]
   },
   {
-    "id": "760290ae.a21e",
+    "id": "fbe01cc.5b1afe",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4676.88330078125,
-    "y": 4364.88330078125,
-    "z": "f8944603.71553",
+    "x": 4669.449966430664,
+    "y": 4375.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d0b7affb.c1db2"
+        "2bf4a87a.e670f8"
       ]
     ]
   },
   {
-    "id": "d0b7affb.c1db2",
+    "id": "2bf4a87a.e670f8",
     "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": 5041,
-    "y": 4364,
-    "z": "f8944603.71553",
+    "x": 5033.566665649414,
+    "y": 4375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "c32fbe2a.4ce3f",
+    "id": "1e2222c.7b917dd",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3478,
-    "y": 4622,
-    "z": "f8944603.71553",
+    "x": 3470.566665649414,
+    "y": 4633,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f2b98ff2.538df8"
+        "99a3a0e8.0b0e08"
       ]
     ]
   },
   {
-    "id": "f2b98ff2.538df8",
+    "id": "99a3a0e8.0b0e08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3658,
-    "y": 4621,
-    "z": "f8944603.71553",
+    "x": 3650.566665649414,
+    "y": 4632,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "44866831.1c971"
+        "34a5a7ab.8782f"
       ]
     ]
   },
   {
-    "id": "44866831.1c971",
+    "id": "34a5a7ab.8782f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3787,
-    "y": 4621,
-    "z": "f8944603.71553",
+    "x": 3779.566665649414,
+    "y": 4632,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "531a8e91.6c36e8"
+        "41dd40eb.c66e7"
       ]
     ]
   },
   {
-    "id": "6aa2083f.c88dc",
+    "id": "1e73a5a2.1f85da",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3523,
-    "y": 4680,
-    "z": "f8944603.71553",
+    "x": 3515.566665649414,
+    "y": 4691,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "5db121cf.f62b2",
+    "id": "d18a7342.6feac8",
     "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": 4089,
-    "y": 4779,
-    "z": "f8944603.71553",
+    "x": 4081.566665649414,
+    "y": 4790,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "531a8e91.6c36e8",
+    "id": "41dd40eb.c66e7",
     "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": 3553,
-    "y": 4713,
-    "z": "f8944603.71553",
+    "x": 3545.566665649414,
+    "y": 4724,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "5ffa37b0.a29d98",
-        "2e65d2b6.ac2056",
-        "b5462b77.92e368"
+        "f4cc70f5.9b6bc",
+        "ce8af9cd.332b9",
+        "130dfbc3.4a6c5c"
       ]
     ]
   },
   {
-    "id": "2e65d2b6.ac2056",
+    "id": "ce8af9cd.332b9",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3734.490966796875,
-    "y": 4690.57421875,
-    "z": "f8944603.71553",
+    "x": 3727.057632446289,
+    "y": 4701.57421875,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "5fe821cf.842878"
+        "3c80b807.6a4d88"
       ]
     ]
   },
   {
-    "id": "b5462b77.92e368",
+    "id": "130dfbc3.4a6c5c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3723,
-    "y": 4730,
-    "z": "f8944603.71553",
+    "x": 3715.566665649414,
+    "y": 4741,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "6ea658d1.17df7"
+        "c80f59b7.c8277"
       ]
     ]
   },
   {
-    "id": "5fe821cf.842878",
+    "id": "3c80b807.6a4d88",
     "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": 3894.0625,
-    "y": 4688.85986328125,
-    "z": "f8944603.71553",
+    "x": 3886.629165649414,
+    "y": 4699.85986328125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "6ea658d1.17df7",
+    "id": "c80f59b7.c8277",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3884,
-    "y": 4731,
-    "z": "f8944603.71553",
+    "x": 3876.566665649414,
+    "y": 4742,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "4792a0c5.aeb76",
+    "id": "96ee8bec.e5c4a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3886,
-    "y": 4775,
-    "z": "f8944603.71553",
+    "x": 3878.566665649414,
+    "y": 4786,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "78930237.780be4",
-        "5db121cf.f62b2"
+        "60b9b66c.eef658",
+        "d18a7342.6feac8"
       ]
     ]
   },
   {
-    "id": "5ffa37b0.a29d98",
+    "id": "f4cc70f5.9b6bc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3728,
-    "y": 4767,
-    "z": "f8944603.71553",
+    "x": 3720.566665649414,
+    "y": 4778,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "4792a0c5.aeb76"
+        "96ee8bec.e5c4a8"
       ]
     ]
   },
   {
-    "id": "78930237.780be4",
+    "id": "60b9b66c.eef658",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4047,
-    "y": 4707,
-    "z": "f8944603.71553",
+    "x": 4039.566665649414,
+    "y": 4718,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "74408c25.ef5164",
+    "id": "eedd5a70.956fd8",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4413,
-    "y": 5275,
-    "z": "f8944603.71553",
+    "x": 4405.566665649414,
+    "y": 5286,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "d1a4e2c9.15ac9",
+    "id": "76d94500.85b34c",
     "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": 4568,
-    "y": 5316,
-    "z": "f8944603.71553",
+    "x": 4560.566665649414,
+    "y": 5327,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "748b1299.fd2144",
+    "id": "5f94b51d.236064",
     "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": 5011,
-    "y": 5364,
-    "z": "f8944603.71553",
+    "x": 5003.566665649414,
+    "y": 5375,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "24040f90.d6a4",
+    "id": "66bf889f.a4f118",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4384,
-    "y": 5374,
-    "z": "f8944603.71553",
+    "x": 4376.566665649414,
+    "y": 5385,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f8d36d32.9ac71",
-        "9cd0c03a.a311a"
+        "b509f4ce.23c808",
+        "425be1a9.ccccd8"
       ]
     ]
   },
   {
-    "id": "f8d36d32.9ac71",
+    "id": "b509f4ce.23c808",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620,
-    "y": 5358,
-    "z": "f8944603.71553",
+    "x": 4612.566665649414,
+    "y": 5369,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "d753b8f.12e03c8"
+        "1cce9d9d.44252a"
       ]
     ]
   },
   {
-    "id": "d753b8f.12e03c8",
+    "id": "1cce9d9d.44252a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4764,
-    "y": 5360,
-    "z": "f8944603.71553",
+    "x": 4756.566665649414,
+    "y": 5371,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "748b1299.fd2144",
-        "9643625b.90e238",
-        "c3f4caa.3b73cb8"
+        "5f94b51d.236064",
+        "efe8a2f7.303938",
+        "b992a481.10f3f"
       ]
     ]
   },
   {
-    "id": "9cd0c03a.a311a",
+    "id": "425be1a9.ccccd8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4619,
-    "y": 5406,
-    "z": "f8944603.71553",
+    "x": 4611.566665649414,
+    "y": 5417,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "9643625b.90e238",
+    "id": "efe8a2f7.303938",
     "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": 5132,
-    "y": 5411,
-    "z": "f8944603.71553",
+    "x": 5124.566665649414,
+    "y": 5422,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "c3f4caa.3b73cb8",
+    "id": "b992a481.10f3f",
     "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": 5013.6669921875,
-    "y": 5496.08349609375,
-    "z": "f8944603.71553",
+    "x": 5006.233657836914,
+    "y": 5507.08349609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "433011d7.349ae8",
+    "id": "3dbfccd3.2b6904",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5014.8837890625,
-    "y": 5454.88330078125,
-    "z": "f8944603.71553",
+    "x": 5007.450454711914,
+    "y": 5465.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "e2691c6e.49966",
+    "id": "c4e3627c.f5b198",
     "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": 5546,
-    "y": 5843,
-    "z": "f8944603.71553",
+    "x": 5538.566665649414,
+    "y": 5854,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "7492e58a.da53dc",
+    "id": "316a2790.87ce5",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4919,
-    "y": 5853,
-    "z": "f8944603.71553",
+    "x": 4911.566665649414,
+    "y": 5864,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "7d7daf2e.06b168",
-        "1dddd00a.b82ef8"
+        "2b91cb0d.4b878c",
+        "b9e860d6.0863a"
       ]
     ]
   },
   {
-    "id": "7d7daf2e.06b168",
+    "id": "2b91cb0d.4b878c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5152,
-    "y": 5847,
-    "z": "f8944603.71553",
+    "x": 5144.566665649414,
+    "y": 5858,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "51e74c47.c309bc"
+        "617327bf.d18368"
       ]
     ]
   },
   {
-    "id": "51e74c47.c309bc",
+    "id": "617327bf.d18368",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5299,
-    "y": 5855,
-    "z": "f8944603.71553",
+    "x": 5291.566665649414,
+    "y": 5866,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "e2691c6e.49966",
-        "f2071b27.722968",
-        "ce8449a1.6c0af8"
+        "c4e3627c.f5b198",
+        "7767e038.8b5bf",
+        "5189b1c7.a8726"
       ]
     ]
   },
   {
-    "id": "1dddd00a.b82ef8",
+    "id": "b9e860d6.0863a",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5153,
-    "y": 5897,
-    "z": "f8944603.71553",
+    "x": 5145.566665649414,
+    "y": 5908,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "f2071b27.722968",
+    "id": "7767e038.8b5bf",
     "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": 5667,
-    "y": 5890,
-    "z": "f8944603.71553",
+    "x": 5659.566665649414,
+    "y": 5901,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce8449a1.6c0af8",
+    "id": "5189b1c7.a8726",
     "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": 5548.6669921875,
-    "y": 5975.08349609375,
-    "z": "f8944603.71553",
+    "x": 5541.233657836914,
+    "y": 5986.08349609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "6cf05b70.9ecfd4",
+    "id": "be3f8000.1758f8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5549.8837890625,
-    "y": 5933.88330078125,
-    "z": "f8944603.71553",
+    "x": 5542.450454711914,
+    "y": 5944.88330078125,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "b08c7802.5d204",
+    "id": "5021b590.5d75e4",
     "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": 5080,
-    "y": 5803,
-    "z": "f8944603.71553",
+    "x": 5072.566665649414,
+    "y": 5814,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "e97fbec2.db6de",
+    "id": "92959871.fa0e08",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4914,
-    "y": 5764,
-    "z": "f8944603.71553",
+    "x": 4906.566665649414,
+    "y": 5775,
+    "z": "8bc654d2.f0dde",
     "wires": []
   },
   {
-    "id": "651a17c0.63b678",
+    "id": "899de386.880988",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3241.25,
-    "y": 6373.25,
-    "z": "f8944603.71553",
+    "x": 3233.816665649414,
+    "y": 6384.25,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "74077cd7.2a1a94",
-        "f3174188.6084b"
+        "1f7a42c6.29cf15",
+        "5608d8df.18871"
       ]
     ]
   },
   {
-    "id": "74077cd7.2a1a94",
+    "id": "1f7a42c6.29cf15",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3432.25,
-    "y": 6377.25,
-    "z": "f8944603.71553",
+    "x": 3424.816665649414,
+    "y": 6388.25,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "f2351c78.3536d"
+        "d6990f3f.a131a8"
       ]
     ]
   },
   {
-    "id": "f2351c78.3536d",
+    "id": "d6990f3f.a131a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3559.25,
-    "y": 6376.25,
-    "z": "f8944603.71553",
+    "x": 3551.816665649414,
+    "y": 6387.25,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "9d7f2116.baeda"
+        "1cb779c6.3641ce"
       ]
     ]
   },
   {
-    "id": "f3174188.6084b",
+    "id": "5608d8df.18871",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3428.25,
-    "y": 6447.25,
-    "z": "f8944603.71553",
+    "x": 3420.816665649414,
+    "y": 6458.25,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "84ee4e22.34786"
+        "9d5d9d30.3fbe28"
       ]
     ]
   },
   {
-    "id": "bf4fd4bd.d3efb",
+    "id": "60292317.f03774",
     "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": 3977.75,
-    "y": 6446.33349609375,
-    "z": "f8944603.71553",
+    "x": 3970.316665649414,
+    "y": 6457.33349609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       []
     ]
   },
   {
-    "id": "84ee4e22.34786",
+    "id": "9d5d9d30.3fbe28",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3561.75,
-    "y": 6449.33349609375,
-    "z": "f8944603.71553",
+    "x": 3554.316665649414,
+    "y": 6460.33349609375,
+    "z": "8bc654d2.f0dde",
     "wires": [
       [
-        "bf4fd4bd.d3efb"
+        "60292317.f03774"
       ]
     ]
   }