X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json;h=f834a97350661ff85d485589afb174d3800a3dbc;hb=645b21298c9a4aff5f3f625eabb586fff40db732;hp=338c6456a7e9e364592f86fe890ceba33ccf0d89;hpb=48984c6121e6d97b9a3ac1ccf75b21d4ae516312;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..f834a973 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "eebfe6b4.36c4f8",
+    "id": "760c3032.024ec8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 140,
-    "y": 119,
-    "z": "f8944603.71553",
+    "x": 176.56666564941406,
+    "y": 129.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f39097a1.daa63"
+        "5c65c97e.4fcce"
       ]
     ]
   },
   {
-    "id": "f39097a1.daa63",
+    "id": "5c65c97e.4fcce",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,7886 +22,7886 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 424.2856903076172,
-    "y": 180.23810863494873,
-    "z": "f8944603.71553",
+    "x": 460.85235595703125,
+    "y": 190.8047742843628,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "af444c12.6df4"
+        "f52e4a2.8e9b7b8"
       ]
     ]
   },
   {
-    "id": "af444c12.6df4",
+    "id": "f52e4a2.8e9b7b8",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-create-clean",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-create-clean' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 430.42860412597656,
-    "y": 265.0000305175781,
-    "z": "f8944603.71553",
+    "x": 466.9952697753906,
+    "y": 275.5666961669922,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cd7fb41b.b80af8"
+        "f52145b6.00f26"
       ]
     ]
   },
   {
-    "id": "cd7fb41b.b80af8",
+    "id": "f52145b6.00f26",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 780,
-    "y": 324,
-    "z": "f8944603.71553",
+    "x": 816.5666656494141,
+    "y": 334.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1330d7b6.40f6",
-        "327e5a08.352bde",
-        "b36ceae.9917d98"
+        "b781570d.1bdc6",
+        "a3b9d436.7cd37",
+        "916ad2e4.da3bd"
       ]
     ]
   },
   {
-    "id": "1330d7b6.40f6",
+    "id": "b781570d.1bdc6",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 1081.33349609375,
-    "y": 594.9302978515625,
-    "z": "f8944603.71553",
+    "x": 1117.900161743164,
+    "y": 605.4969635009766,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "327e5a08.352bde",
+    "id": "a3b9d436.7cd37",
     "type": "save",
     "name": "get service-instance from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
     "comments": "",
     "outputs": 1,
-    "x": 1102.761962890625,
-    "y": 297.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1139.328628540039,
+    "y": 307.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "393ddb72.9cdaac",
-        "27423ab.7bf7dc6",
-        "e70357b.8e78fa8"
+        "a44b76d8.232f78",
+        "2fc87770.5a98b8",
+        "d48f40d3.37656"
       ]
     ]
   },
   {
-    "id": "393ddb72.9cdaac",
+    "id": "a44b76d8.232f78",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1327.761962890625,
-    "y": 155.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1364.328628540039,
+    "y": 165.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "db827fdb.ec8a7"
+        "a9f7ac5b.dc2e28"
       ]
     ]
   },
   {
-    "id": "27423ab.7bf7dc6",
+    "id": "2fc87770.5a98b8",
     "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": 1359.819595336914,
+    "y": 235.47401428222656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2aba6522.745fa2"
+        "87351fcb.5849e"
       ]
     ]
   },
   {
-    "id": "e70357b.8e78fa8",
+    "id": "d48f40d3.37656",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1311.761962890625,
-    "y": 271.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1348.328628540039,
+    "y": 281.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "85c2ab27.5d7c"
+        "81b461.b8b3eba"
       ]
     ]
   },
   {
-    "id": "d67dd652.2acc48",
+    "id": "ed4dfd16.f55a8",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1081.761962890625,
-    "y": 185.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1118.328628540039,
+    "y": 195.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b36ceae.9917d98",
+    "id": "916ad2e4.da3bd",
     "type": "execute",
     "name": "execute properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
     "comments": "",
     "outputs": 1,
-    "x": 1069.761962890625,
-    "y": 237.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1106.328628540039,
+    "y": 247.8999786376953,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "db827fdb.ec8a7",
+    "id": "a9f7ac5b.dc2e28",
     "type": "switchNode",
     "name": "switch allotted-resources_length != 0",
     "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1568,
-    "y": 152,
-    "z": "f8944603.71553",
+    "x": 1604.566665649414,
+    "y": 162.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cb5b5e94.b15ef8",
-        "b997ad22.d70e8"
+        "9413aaeb.d092f",
+        "4243f2e3.377954"
       ]
     ]
   },
   {
-    "id": "2aba6522.745fa2",
+    "id": "87351fcb.5849e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 1478.0623779296875,
-    "y": 227.85977172851562,
-    "z": "f8944603.71553",
+    "x": 1514.6290435791016,
+    "y": 238.4264373779297,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "85c2ab27.5d7c",
+    "id": "81b461.b8b3eba",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1482,
-    "y": 272,
-    "z": "f8944603.71553",
+    "x": 1518.566665649414,
+    "y": 282.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cb5b5e94.b15ef8",
+    "id": "9413aaeb.d092f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1773,
-    "y": 189,
-    "z": "f8944603.71553",
+    "x": 1809.566665649414,
+    "y": 199.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3cb72715.02a808"
+        "41ee935e.7af694"
       ]
     ]
   },
   {
-    "id": "b997ad22.d70e8",
+    "id": "4243f2e3.377954",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783,
-    "y": 116,
-    "z": "f8944603.71553",
+    "x": 1819.566665649414,
+    "y": 126.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "3cb72715.02a808",
+    "id": "41ee935e.7af694",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1766,
-    "y": 264,
-    "z": "f8944603.71553",
+    "x": 1802.566665649414,
+    "y": 274.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ebf5f2d6.b4c7b8",
-        "490f1cae.a20b64",
-        "b4dd975f.8385a8",
-        "43a803a5.2842f4",
-        "651a17c0.63b678"
+        "48c9f8b7.accfc",
+        "4b70868c.ca77",
+        "33568fb6.bac76",
+        "ed1c5832.299138",
+        "629500a0.f350c"
       ]
     ]
   },
   {
-    "id": "d707b8ba.d22b28",
+    "id": "911385ff.dcfb6",
     "type": "save",
     "name": "get allotted-resource from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2252,
-    "y": 315,
-    "z": "f8944603.71553",
+    "x": 2288.566665649414,
+    "y": 325.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3717142f.9eacbc",
-        "81f224b1.8ce278",
-        "360e18d9.8e8878"
+        "7bf84f8a.19dac",
+        "e93a24fd.89bb98",
+        "b3019feb.2307b"
       ]
     ]
   },
   {
-    "id": "3717142f.9eacbc",
+    "id": "7bf84f8a.19dac",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2468,
-    "y": 382,
-    "z": "f8944603.71553",
+    "x": 2504.566665649414,
+    "y": 392.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "90fe9f39.2d3b48"
+        "28ff285d.675018"
       ]
     ]
   },
   {
-    "id": "81f224b1.8ce278",
+    "id": "e93a24fd.89bb98",
     "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": 2505.057632446289,
+    "y": 292.14064025878906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fa7677d5.848dd"
+        "4ef0e01e.f3cdf"
       ]
     ]
   },
   {
-    "id": "360e18d9.8e8878",
+    "id": "b3019feb.2307b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2464,
-    "y": 331,
-    "z": "f8944603.71553",
+    "x": 2500.566665649414,
+    "y": 341.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "72c2923b.56a34c"
+        "2913a1dc.ae6786"
       ]
     ]
   },
   {
-    "id": "ebf5f2d6.b4c7b8",
+    "id": "48c9f8b7.accfc",
     "type": "for",
     "name": "for each allotted-resource",
     "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1969,
-    "y": 296,
-    "z": "f8944603.71553",
+    "x": 2005.566665649414,
+    "y": 306.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "618e3f4f.a42bf",
-        "d707b8ba.d22b28",
-        "e8527008.db6228",
-        "a669b945.663408"
+        "8b66b4b0.d208d8",
+        "911385ff.dcfb6",
+        "79257077.5f1ff8",
+        "8a55fb57.dfc438"
       ]
     ]
   },
   {
-    "id": "618e3f4f.a42bf",
+    "id": "8b66b4b0.d208d8",
     "type": "set",
     "name": "set the current allotted-resource-id",
     "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
     "comments": "",
-    "x": 2249,
-    "y": 234,
-    "z": "f8944603.71553",
+    "x": 2285.566665649414,
+    "y": 244.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "43a803a5.2842f4",
+    "id": "ed1c5832.299138",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
     "comments": "",
-    "x": 1943,
-    "y": 246,
-    "z": "f8944603.71553",
+    "x": 1979.566665649414,
+    "y": 256.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "490f1cae.a20b64",
+    "id": "4b70868c.ca77",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/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": 2022.566665649414,
+    "y": 115.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b4dd975f.8385a8",
+    "id": "33568fb6.bac76",
     "type": "get-resource",
     "name": "get-resource logical-links",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/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": 2034.566665649414,
+    "y": 156.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d38afd8a.8bc96",
+    "id": "2a477cee.98364c",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2023,
-    "y": 58,
-    "z": "f8944603.71553",
+    "x": 2059.566665649414,
+    "y": 68.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8fedb211.a1c3d8",
+    "id": "11e969ea.04e966",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
     "comments": "",
-    "x": 1943,
-    "y": 192,
-    "z": "f8944603.71553",
+    "x": 1979.566665649414,
+    "y": 202.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fa7677d5.848dd",
+    "id": "4ef0e01e.f3cdf",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 2647,
-    "y": 284,
-    "z": "f8944603.71553",
+    "x": 2683.566665649414,
+    "y": 294.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "72c2923b.56a34c",
+    "id": "2913a1dc.ae6786",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2646.9375,
-    "y": 333.1402587890625,
-    "z": "f8944603.71553",
+    "x": 2683.504165649414,
+    "y": 343.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "90fe9f39.2d3b48",
+    "id": "28ff285d.675018",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2648.9375,
-    "y": 384.1402587890625,
-    "z": "f8944603.71553",
+    "x": 2685.504165649414,
+    "y": 394.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "458d5965.a3abf"
+        "ef99d74f.4057d"
       ]
     ]
   },
   {
-    "id": "458d5965.a3abf",
+    "id": "ef99d74f.4057d",
     "type": "save",
     "name": "get allotted-resource relationship from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2941.9375,
-    "y": 331.1402587890625,
-    "z": "f8944603.71553",
+    "x": 2978.504165649414,
+    "y": 341.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9e8135ff.08a04",
-        "11480c56.53825c",
-        "c18b528b.950eb"
+        "e456d5f.a155828",
+        "7848fc63.19f06c",
+        "64a94fba.40e7a"
       ]
     ]
   },
   {
-    "id": "11480c56.53825c",
+    "id": "7848fc63.19f06c",
     "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": 3281.995101928711,
+    "y": 74.28089904785156,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fafa91c8.b89"
+        "afcd1c40.b768f"
       ]
     ]
   },
   {
-    "id": "fafa91c8.b89",
+    "id": "afcd1c40.b768f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3422.999969482422,
-    "y": 64,
-    "z": "f8944603.71553",
+    "x": 3459.566635131836,
+    "y": 74.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c18b528b.950eb",
+    "id": "64a94fba.40e7a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3240.937469482422,
-    "y": 113.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3277.504135131836,
+    "y": 123.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c9c4d95e.e78bc8"
+        "9649b9cd.238c78"
       ]
     ]
   },
   {
-    "id": "c9c4d95e.e78bc8",
+    "id": "9649b9cd.238c78",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3422.937469482422,
-    "y": 113.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3459.504135131836,
+    "y": 123.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9e8135ff.08a04",
+    "id": "e456d5f.a155828",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3244.937469482422,
-    "y": 164.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3281.504135131836,
+    "y": 174.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "249c683e.fa6548"
+        "8fd753ef.f9f648"
       ]
     ]
   },
   {
-    "id": "249c683e.fa6548",
+    "id": "8fd753ef.f9f648",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3424.937469482422,
-    "y": 164.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3461.504135131836,
+    "y": 174.70692443847656,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8380148b.ccdda"
+        "f37cd8dc.622f28"
       ]
     ]
   },
   {
-    "id": "8380148b.ccdda",
+    "id": "f37cd8dc.622f28",
     "type": "switchNode",
     "name": "switch allotted-resource.relationship-list not empty",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2961,
-    "y": 459,
-    "z": "f8944603.71553",
+    "x": 2997.566665649414,
+    "y": 469.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f9f860ee.48ada",
-        "3ee71a32.7e39ae"
+        "d8de60b.2b55ea",
+        "6b2e15a0.33589c"
       ]
     ]
   },
   {
-    "id": "3ee71a32.7e39ae",
+    "id": "6b2e15a0.33589c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3300.999969482422,
-    "y": 306,
-    "z": "f8944603.71553",
+    "x": 3337.566635131836,
+    "y": 316.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f9f860ee.48ada",
+    "id": "d8de60b.2b55ea",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3299.999969482422,
-    "y": 360,
-    "z": "f8944603.71553",
+    "x": 3336.566635131836,
+    "y": 370.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "88c3b86.63e2c48"
+        "41425976.6167f8"
       ]
     ]
   },
   {
-    "id": "b0fb22ca.f9ce1",
+    "id": "d54e5594.aff43",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4044.999969482422,
-    "y": 314,
-    "z": "f8944603.71553",
+    "x": 4081.566635131836,
+    "y": 324.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5f3f920d.e5225c"
+        "20569ac4.3ebdd6"
       ]
     ]
   },
   {
-    "id": "5f3f920d.e5225c",
+    "id": "20569ac4.3ebdd6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4221.999847412109,
-    "y": 306.9998779296875,
-    "z": "f8944603.71553",
+    "x": 4258.566513061523,
+    "y": 317.56654357910156,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8197a230.f5fc28",
-        "add943b3.661de"
+        "f7578f2.98aaff",
+        "fec27249.f43818"
       ]
     ]
   },
   {
-    "id": "88c3b86.63e2c48",
+    "id": "41425976.6167f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3463.999969482422,
-    "y": 286,
-    "z": "f8944603.71553",
+    "x": 3500.566635131836,
+    "y": 296.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b1327250.c3733",
-        "de9a0d51.d824a"
+        "bf1caed6.dba4d",
+        "7892547.06584ac"
       ]
     ]
   },
   {
-    "id": "b1327250.c3733",
+    "id": "bf1caed6.dba4d",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3744.999969482422,
-    "y": 242,
-    "z": "f8944603.71553",
+    "x": 3781.566635131836,
+    "y": 252.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "64d386dc.4f4038"
+        "37857fb8.f82a48"
       ]
     ]
   },
   {
-    "id": "64d386dc.4f4038",
+    "id": "37857fb8.f82a48",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4006.999969482422,
-    "y": 242,
-    "z": "f8944603.71553",
+    "x": 4043.566635131836,
+    "y": 252.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b0fb22ca.f9ce1"
+        "d54e5594.aff43"
       ]
     ]
   },
   {
-    "id": "8197a230.f5fc28",
+    "id": "f7578f2.98aaff",
     "type": "set",
     "name": "set the 1st network-policy-id",
     "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 4464.999847412109,
-    "y": 263.9998779296875,
-    "z": "f8944603.71553",
+    "x": 4501.566513061523,
+    "y": 274.56654357910156,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "add943b3.661de",
+    "id": "fec27249.f43818",
     "type": "save",
     "name": "get network-policy from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
     "comments": "",
     "outputs": 1,
-    "x": 4453.999847412109,
-    "y": 318.9998779296875,
-    "z": "f8944603.71553",
+    "x": 4490.566513061523,
+    "y": 329.56654357910156,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "584012e4.8af54c",
-        "84e11e56.e2a698",
-        "b5114711.48fe28"
+        "7d11439b.9c402c",
+        "1159889c.e4b977",
+        "672fe755.7cac68"
       ]
     ]
   },
   {
-    "id": "b5114711.48fe28",
+    "id": "672fe755.7cac68",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4705.000213623047,
-    "y": 260,
-    "z": "f8944603.71553",
+    "x": 4741.566879272461,
+    "y": 270.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3ff18282.41fa7e"
+        "8e6a85a9.42bd58"
       ]
     ]
   },
   {
-    "id": "3ff18282.41fa7e",
+    "id": "8e6a85a9.42bd58",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4853.571746826172,
-    "y": 260.2857666015625,
-    "z": "f8944603.71553",
+    "x": 4890.138412475586,
+    "y": 270.85243225097656,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "576f251.536f1dc",
+    "id": "d22f2789.6a3cb",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4852.509246826172,
-    "y": 304.426025390625,
-    "z": "f8944603.71553",
+    "x": 4889.075912475586,
+    "y": 314.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "84e11e56.e2a698",
+    "id": "1159889c.e4b977",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4693.509246826172,
-    "y": 304.426025390625,
-    "z": "f8944603.71553",
+    "x": 4730.075912475586,
+    "y": 314.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "576f251.536f1dc"
+        "d22f2789.6a3cb"
       ]
     ]
   },
   {
-    "id": "584012e4.8af54c",
+    "id": "7d11439b.9c402c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4700.509246826172,
-    "y": 383.426025390625,
-    "z": "f8944603.71553",
+    "x": 4737.075912475586,
+    "y": 393.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "84e0295.fec0058"
+        "1927fc16.6351c4"
       ]
     ]
   },
   {
-    "id": "84e0295.fec0058",
+    "id": "1927fc16.6351c4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4839.509246826172,
-    "y": 383.426025390625,
-    "z": "f8944603.71553",
+    "x": 4876.075912475586,
+    "y": 393.99269104003906,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "40dc732c.a37574",
-        "72f9e36c.5c6004"
+        "4ec1a8d7.67b3c8",
+        "4af48fa4.c20fa"
       ]
     ]
   },
   {
-    "id": "40dc732c.a37574",
+    "id": "4ec1a8d7.67b3c8",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5045.000213623047,
-    "y": 381,
-    "z": "f8944603.71553",
+    "x": 5081.566879272461,
+    "y": 391.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "72f9e36c.5c6004",
+    "id": "4af48fa4.c20fa",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5044.000213623047,
-    "y": 427,
-    "z": "f8944603.71553",
+    "x": 5080.566879272461,
+    "y": 437.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "de9a0d51.d824a",
+    "id": "7892547.06584ac",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3561.999969482422,
-    "y": 358,
-    "z": "f8944603.71553",
+    "x": 3598.566635131836,
+    "y": 368.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1f9cf648.b23842"
+        "ea9b4d5b.2a42f8"
       ]
     ]
   },
   {
-    "id": "1f9cf648.b23842",
+    "id": "ea9b4d5b.2a42f8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3841.999969482422,
-    "y": 358,
-    "z": "f8944603.71553",
+    "x": 3878.566635131836,
+    "y": 368.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9a7f86a9.e4bc3"
+        "476ea684.13443"
       ]
     ]
   },
   {
-    "id": "9a7f86a9.e4bc3",
+    "id": "476ea684.13443",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2225.0001220703125,
-    "y": 771.0001220703125,
-    "z": "f8944603.71553",
+    "x": 2261.5667877197266,
+    "y": 781.5667877197266,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a00c69ca.adce48"
+        "c7ca0b2.bde93f8"
       ]
     ]
   },
   {
-    "id": "a00c69ca.adce48",
+    "id": "c7ca0b2.bde93f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2402,
-    "y": 764,
-    "z": "f8944603.71553",
+    "x": 2438.566665649414,
+    "y": 774.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b1915aed.463e4",
-        "2d618162.692d86"
+        "86b11ccc.07eb1",
+        "5c684ea4.22866"
       ]
     ]
   },
   {
-    "id": "b1915aed.463e4",
+    "id": "86b11ccc.07eb1",
     "type": "set",
     "name": "set the current logical-link-name",
     "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 2645,
-    "y": 721,
-    "z": "f8944603.71553",
+    "x": 2681.566665649414,
+    "y": 731.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2d618162.692d86",
+    "id": "5c684ea4.22866",
     "type": "save",
     "name": "get logical-link from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
     "comments": "",
     "outputs": 1,
-    "x": 2634,
-    "y": 776,
-    "z": "f8944603.71553",
+    "x": 2670.566665649414,
+    "y": 786.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e482931e.42ecd",
-        "ed5f6487.2f87b",
-        "f8d33751.7b5a4"
+        "2c2754a5.0b7c2c",
+        "9ab044d8.9332",
+        "6aa476a7.c1db08"
       ]
     ]
   },
   {
-    "id": "e482931e.42ecd",
+    "id": "2c2754a5.0b7c2c",
     "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": 2962.057632446289,
+    "y": 765.1406402587891,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "57635b4b.26640c"
+        "606104a3.7d17dc"
       ]
     ]
   },
   {
-    "id": "ed5f6487.2f87b",
+    "id": "9ab044d8.9332",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2914,
-    "y": 799,
-    "z": "f8944603.71553",
+    "x": 2950.566665649414,
+    "y": 809.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a7b92e8f.8c52e8"
+        "187a718c.4bcdf6"
       ]
     ]
   },
   {
-    "id": "57635b4b.26640c",
+    "id": "606104a3.7d17dc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3074.0625,
-    "y": 754.8597412109375,
-    "z": "f8944603.71553",
+    "x": 3110.629165649414,
+    "y": 765.4264068603516,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a7b92e8f.8c52e8",
+    "id": "187a718c.4bcdf6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3073,
-    "y": 799,
-    "z": "f8944603.71553",
+    "x": 3109.566665649414,
+    "y": 809.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f8d33751.7b5a4",
+    "id": "6aa476a7.c1db08",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2921,
-    "y": 878,
-    "z": "f8944603.71553",
+    "x": 2957.566665649414,
+    "y": 888.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "98a40400.3efa78"
+        "9fd32ca0.d84048"
       ]
     ]
   },
   {
-    "id": "98a40400.3efa78",
+    "id": "9fd32ca0.d84048",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3060,
-    "y": 878,
-    "z": "f8944603.71553",
+    "x": 3096.566665649414,
+    "y": 888.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "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"
+        "7a7db7d4.95d8d",
+        "95e88e5b.59dc68",
+        "ccbad682.f9f6e",
+        "51c5f691.62046",
+        "c524ae07.05ca4",
+        "573995f0.c3e824",
+        "40c97410.34efdc",
+        "3ceacdf9.dad772",
+        "37ff3aef.9a54ee",
+        "a62852b2.29136",
+        "e4c9b14e.e493e",
+        "a5e91f89.51e28",
+        "6a1545ce.c6f074",
+        "fcc163b9.6d6e2",
+        "c9e93381.966988",
+        "5fc9799.82ba788",
+        "7ebd6769.0b5428",
+        "9fbb56ee.c43378",
+        "387e5bde.fd50e4",
+        "a78822a6.5321b",
+        "a4c94b0b.1b4718"
       ]
     ]
   },
   {
-    "id": "8992052.d396a78",
+    "id": "8a5fb9f9.eee92",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3409,
-    "y": 411.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3445.566665649414,
+    "y": 422.56663513183594,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "71736994.8ef448",
+    "id": "7a7db7d4.95d8d",
     "type": "execute",
     "name": "execute UUID generator for otn-tunnel-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3389.9999389648438,
-    "y": 490.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3426.566604614258,
+    "y": 501.56663513183594,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "5fc2699f.6720b8",
+    "id": "fcc163b9.6d6e2",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 3346.9999389648438,
-    "y": 535.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3383.566604614258,
+    "y": 546.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "262a2cdd.1722ec",
+    "id": "95e88e5b.59dc68",
     "type": "set",
     "name": "set network-route-one",
     "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
     "comments": "",
-    "x": 3311.999969482422,
-    "y": 589.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3348.566635131836,
+    "y": 600.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6dffa8a4.87ef28",
+    "id": "ccbad682.f9f6e",
     "type": "set",
     "name": "set network-route-two",
     "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
     "comments": "",
-    "x": 3312.999969482422,
-    "y": 644.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3349.566635131836,
+    "y": 655.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "19dc8ab.73ff975",
+    "id": "51c5f691.62046",
     "type": "save",
     "name": "get network-route-one from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
     "comments": "",
     "outputs": 1,
-    "x": 3310.999969482422,
-    "y": 908.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3347.566635131836,
+    "y": 919.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6a238476.e2fb94",
-        "535decdf.f72024",
-        "ae1cf5c7.80a6f8"
+        "ab7d525c.39024",
+        "e9514e17.b4663",
+        "e95aa54a.0cb1c8"
       ]
     ]
   },
   {
-    "id": "442ee5c4.7ebc14",
+    "id": "c524ae07.05ca4",
     "type": "save",
     "name": "get network-route-two from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
     "comments": "",
     "outputs": 1,
-    "x": 3305.999969482422,
-    "y": 969.9998474121094,
-    "z": "f8944603.71553",
+    "x": 3342.566635131836,
+    "y": 980.5665130615234,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3acf80af.f43f8",
-        "d256cf0d.9aea78",
-        "e101efde.aba"
+        "ba38cd77.3ddd8",
+        "3fe85825.5036d",
+        "4b77c928.b0503"
       ]
     ]
   },
   {
-    "id": "6a238476.e2fb94",
+    "id": "ab7d525c.39024",
     "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": 3658.566635131836,
+    "y": 690.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ab9f09fe.f29c98"
+        "a41dfa2.144c608"
       ]
     ]
   },
   {
-    "id": "535decdf.f72024",
+    "id": "e9514e17.b4663",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3617.509002685547,
-    "y": 729.4259948730469,
-    "z": "f8944603.71553",
+    "x": 3654.075668334961,
+    "y": 739.9926605224609,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e4e6f924.884bf"
+        "88fea61b.80803"
       ]
     ]
   },
   {
-    "id": "ae1cf5c7.80a6f8",
+    "id": "e95aa54a.0cb1c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3621.509002685547,
-    "y": 782.4259948730469,
-    "z": "f8944603.71553",
+    "x": 3658.075668334961,
+    "y": 792.9926605224609,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ab5ff9c2.10c8a"
+        "5f495b77.8e475c"
       ]
     ]
   },
   {
-    "id": "ab9f09fe.f29c98",
+    "id": "a41dfa2.144c608",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3770.571502685547,
-    "y": 679.2857360839844,
-    "z": "f8944603.71553",
+    "x": 3807.138168334961,
+    "y": 689.8524017333984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e4e6f924.884bf",
+    "id": "88fea61b.80803",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3760.509002685547,
-    "y": 729.4259948730469,
-    "z": "f8944603.71553",
+    "x": 3797.075668334961,
+    "y": 739.9926605224609,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3acf80af.f43f8",
+    "id": "ba38cd77.3ddd8",
     "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": 3620.566604614258,
+    "y": 880.5664825439453,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "87a2e14c.f364a"
+        "5d8c160b.0c4ea8"
       ]
     ]
   },
   {
-    "id": "d256cf0d.9aea78",
+    "id": "3fe85825.5036d",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3579.509002685547,
-    "y": 912.4258728027344,
-    "z": "f8944603.71553",
+    "x": 3616.075668334961,
+    "y": 922.9925384521484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "98a18e9a.d4f5a"
+        "b6433621.de36a"
       ]
     ]
   },
   {
-    "id": "e101efde.aba",
+    "id": "4b77c928.b0503",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3580.509002685547,
-    "y": 965.4258728027344,
-    "z": "f8944603.71553",
+    "x": 3617.075668334961,
+    "y": 975.9925384521484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4d45fe17.38da58"
+        "999aafa8.043a8"
       ]
     ]
   },
   {
-    "id": "87a2e14c.f364a",
+    "id": "5d8c160b.0c4ea8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3732.5714721679688,
-    "y": 869.2855834960938,
-    "z": "f8944603.71553",
+    "x": 3769.138137817383,
+    "y": 879.8522491455078,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "98a18e9a.d4f5a",
+    "id": "b6433621.de36a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3722.509002685547,
-    "y": 912.4258728027344,
-    "z": "f8944603.71553",
+    "x": 3759.075668334961,
+    "y": 922.9925384521484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ab5ff9c2.10c8a",
+    "id": "5f495b77.8e475c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3782.999969482422,
-    "y": 781.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3819.566635131836,
+    "y": 792.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "84478c6a.6d587"
+        "f4d50ce3.687d98"
       ]
     ]
   },
   {
-    "id": "4d45fe17.38da58",
+    "id": "999aafa8.043a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3733.999969482422,
-    "y": 964.9998474121094,
-    "z": "f8944603.71553",
+    "x": 3770.566635131836,
+    "y": 975.5665130615234,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2dfc998d.a2b3e6"
+        "6c0d4a32.4f3524"
       ]
     ]
   },
   {
-    "id": "84478c6a.6d587",
+    "id": "f4d50ce3.687d98",
     "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": 3994.566635131836,
+    "y": 766.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "be084505.b458",
-        "5b2d2057.dd8c4",
-        "83ce05e.7f315f8"
+        "e8eddbb7.6cfbd",
+        "54846c0d.33a74c",
+        "b03ebc69.8e68d8"
       ]
     ]
   },
   {
-    "id": "2dfc998d.a2b3e6",
+    "id": "6c0d4a32.4f3524",
     "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": 3954.566635131836,
+    "y": 883.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "27a94561.e70e32",
-        "e39a6c9c.1e6dd8",
-        "fe4b773c.0eae98"
+        "4f37a3d1.2e362c",
+        "efd815b8.8e6db8",
+        "65095290.735c7c"
       ]
     ]
   },
   {
-    "id": "be084505.b458",
+    "id": "e8eddbb7.6cfbd",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4079.999969482422,
-    "y": 540.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4116.566635131836,
+    "y": 551.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "86b880d.ad45d"
+        "c7edad0e.b216"
       ]
     ]
   },
   {
-    "id": "5b2d2057.dd8c4",
+    "id": "54846c0d.33a74c",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4081.999969482422,
-    "y": 594.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4118.566635131836,
+    "y": 605.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "10eaea8a.998afd"
+        "d5f61daa.4b4388"
       ]
     ]
   },
   {
-    "id": "27a94561.e70e32",
+    "id": "4f37a3d1.2e362c",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4099,
-    "y": 811,
-    "z": "f8944603.71553",
+    "x": 4135.566665649414,
+    "y": 821.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e84921e.f8ecce"
+        "81e90993.f1d9a8"
       ]
     ]
   },
   {
-    "id": "e39a6c9c.1e6dd8",
+    "id": "efd815b8.8e6db8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4101,
-    "y": 865,
-    "z": "f8944603.71553",
+    "x": 4137.566665649414,
+    "y": 875.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b7ebf9b7.e2f348"
+        "da2103e1.15169"
       ]
     ]
   },
   {
-    "id": "4ebe65d0.3ec92c",
+    "id": "f5d37541.2d47c8",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4389.999969482422,
-    "y": 492.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4426.566635131836,
+    "y": 503.56663513183594,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b5b3e89e.18b28",
+    "id": "2bfe954c.51473a",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4382.999969482422,
-    "y": 590.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4419.566635131836,
+    "y": 601.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "81270995.5d712",
+    "id": "9391f162.46d07",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4401,
-    "y": 784,
-    "z": "f8944603.71553",
+    "x": 4437.566665649414,
+    "y": 794.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7db54dd4.f36624",
+    "id": "8da0410.b4be6c",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4405,
-    "y": 877,
-    "z": "f8944603.71553",
+    "x": 4441.566665649414,
+    "y": 887.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3464c217.ddf82e",
+    "id": "c685a00a.7f3668",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3548,
-    "y": 1549,
-    "z": "f8944603.71553",
+    "x": 3584.566665649414,
+    "y": 1559.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5c2f3801.4eed3"
+        "3e8c64de.c5d6ac"
       ]
     ]
   },
   {
-    "id": "e12bcc6e.caae8",
+    "id": "c307eb50.c4efc",
     "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": 3594.057632446289,
+    "y": 1602.1407012939453,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fb3f4046.01bc4"
+        "a457c21e.dc24c"
       ]
     ]
   },
   {
-    "id": "a3a68564.d1334",
+    "id": "fe413554.38fd68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3546,
-    "y": 1638,
-    "z": "f8944603.71553",
+    "x": 3582.566665649414,
+    "y": 1648.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9f68f9be.d7aab8"
+        "f7393df4.54a488"
       ]
     ]
   },
   {
-    "id": "8a9b7f74.e3a568",
+    "id": "940c17a9.af2df",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3248,
-    "y": 1511,
-    "z": "f8944603.71553",
+    "x": 3284.566665649414,
+    "y": 1521.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "22efa8c9.c8576",
+    "id": "40c97410.34efdc",
     "type": "save",
     "name": "get p-interface-src from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3291,
-    "y": 1576,
-    "z": "f8944603.71553",
+    "x": 3327.566665649414,
+    "y": 1586.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3464c217.ddf82e",
-        "e12bcc6e.caae8",
-        "a3a68564.d1334"
+        "c685a00a.7f3668",
+        "c307eb50.c4efc",
+        "fe413554.38fd68"
       ]
     ]
   },
   {
-    "id": "55e39af5.a2b61c",
+    "id": "573995f0.c3e824",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3292,
-    "y": 1246,
-    "z": "f8944603.71553",
+    "x": 3328.566665649414,
+    "y": 1256.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cbe70d53.b79168",
-        "9e0cb899.0e0f"
+        "ce053797.967e5",
+        "1d8318a4.118f1f"
       ]
     ]
   },
   {
-    "id": "9e0cb899.0e0f",
+    "id": "1d8318a4.118f1f",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3512.999969482422,
-    "y": 1298.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3549.566635131836,
+    "y": 1309.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "300fab87.54654c"
+        "d7acba72.b8d088"
       ]
     ]
   },
   {
-    "id": "cbe70d53.b79168",
+    "id": "ce053797.967e5",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3514.999969482422,
-    "y": 1331.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3551.566635131836,
+    "y": 1342.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ad0b83ff.4cb308"
+        "b936608f.415c9"
       ]
     ]
   },
   {
-    "id": "5c2f3801.4eed3",
+    "id": "3e8c64de.c5d6ac",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3720.66650390625,
-    "y": 1548,
-    "z": "f8944603.71553",
+    "x": 3757.233169555664,
+    "y": 1558.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fe2c6692.47101",
-        "9af14a91.b12a68"
+        "61a62886.979d9",
+        "69747a1f.4d36a4"
       ]
     ]
   },
   {
-    "id": "fb3f4046.01bc4",
+    "id": "a457c21e.dc24c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3711.0623779296875,
-    "y": 1594.8597717285156,
-    "z": "f8944603.71553",
+    "x": 3747.6290435791016,
+    "y": 1605.4264373779297,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9f68f9be.d7aab8",
+    "id": "f7393df4.54a488",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3715,
-    "y": 1639,
-    "z": "f8944603.71553",
+    "x": 3751.566665649414,
+    "y": 1649.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fe2c6692.47101",
+    "id": "61a62886.979d9",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3985,
-    "y": 1532,
-    "z": "f8944603.71553",
+    "x": 4021.566665649414,
+    "y": 1542.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "37956c14.cf1964",
-        "7f26a273.a5f25c"
+        "d27c3919.e4f1e8",
+        "744ce69a.cd2cd"
       ]
     ]
   },
   {
-    "id": "7f26a273.a5f25c",
+    "id": "744ce69a.cd2cd",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4208,
-    "y": 1487,
-    "z": "f8944603.71553",
+    "x": 4244.566665649414,
+    "y": 1497.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d180abab.fe69a"
+        "d24d75df.899958"
       ]
     ]
   },
   {
-    "id": "37956c14.cf1964",
+    "id": "d27c3919.e4f1e8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4210,
-    "y": 1551,
-    "z": "f8944603.71553",
+    "x": 4246.566665649414,
+    "y": 1561.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "11875f6b.e538c1"
+        "195cae09.6a270a"
       ]
     ]
   },
   {
-    "id": "11875f6b.e538c1",
+    "id": "195cae09.6a270a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4372,
-    "y": 1547,
-    "z": "f8944603.71553",
+    "x": 4408.566665649414,
+    "y": 1557.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d180abab.fe69a",
+    "id": "d24d75df.899958",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4373,
-    "y": 1484,
-    "z": "f8944603.71553",
+    "x": 4409.566665649414,
+    "y": 1494.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c42ee54d.ec9ea",
-        "e2dee17e.90746"
+        "64761578.742944",
+        "545ae19b.2a1238"
       ]
     ]
   },
   {
-    "id": "ad0b83ff.4cb308",
+    "id": "b936608f.415c9",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3657.999969482422,
-    "y": 1328.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3694.566635131836,
+    "y": 1339.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "300fab87.54654c",
+    "id": "d7acba72.b8d088",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3660.999969482422,
-    "y": 1291.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3697.566635131836,
+    "y": 1302.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "844bb618.6c32e8",
-        "99a55ff.3057da"
+        "66afead4.578fec",
+        "d914a00d.43d42"
       ]
     ]
   },
   {
-    "id": "844bb618.6c32e8",
+    "id": "66afead4.578fec",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3834.999969482422,
-    "y": 1247.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3871.566635131836,
+    "y": 1258.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9af14a91.b12a68",
+    "id": "69747a1f.4d36a4",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3933.999969482422,
-    "y": 1641.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3970.566635131836,
+    "y": 1652.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1b19176e.822411"
+        "6692ad9d.63a244"
       ]
     ]
   },
   {
-    "id": "1b19176e.822411",
+    "id": "6692ad9d.63a244",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4139.999969482422,
-    "y": 1641.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4176.566635131836,
+    "y": 1652.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c875ac48.6e9"
+        "efeaf290.376e48"
       ]
     ]
   },
   {
-    "id": "c875ac48.6e9",
+    "id": "efeaf290.376e48",
     "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": 4391.852279663086,
+    "y": 1652.388412475586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6e0bf03.4de201"
+        "9388038d.e5f508"
       ]
     ]
   },
   {
-    "id": "99a55ff.3057da",
+    "id": "d914a00d.43d42",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3849.999969482422,
-    "y": 1358.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3886.566635131836,
+    "y": 1369.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "26c5a31d.0e26c4",
-        "1dba38b8.e09647",
-        "703777cb.7523f"
+        "3150a2ed.678f16",
+        "5769f8b6.da962",
+        "c8b63edf.598bb8"
       ]
     ]
   },
   {
-    "id": "26c5a31d.0e26c4",
+    "id": "3150a2ed.678f16",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4045.5000915527344,
-    "y": 1310.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4082.0667572021484,
+    "y": 1321.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3f157e84.d62172"
+        "47f6939a.0cca7c"
       ]
     ]
   },
   {
-    "id": "1dba38b8.e09647",
+    "id": "5769f8b6.da962",
     "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": 4074.0667572021484,
+    "y": 1376.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7126adde.e76d1c"
+        "dfce5624.4d0e8"
       ]
     ]
   },
   {
-    "id": "703777cb.7523f",
+    "id": "c8b63edf.598bb8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4042.5000915527344,
-    "y": 1422.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4079.0667572021484,
+    "y": 1433.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f85ce86b.434b48"
+        "16d53904.a69817"
       ]
     ]
   },
   {
-    "id": "f85ce86b.434b48",
+    "id": "16d53904.a69817",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4194.500091552734,
-    "y": 1423.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4231.066757202148,
+    "y": 1434.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7126adde.e76d1c",
+    "id": "dfce5624.4d0e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4205.500091552734,
-    "y": 1368.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4242.066757202148,
+    "y": 1379.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3f157e84.d62172",
+    "id": "47f6939a.0cca7c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4189.882415771484,
-    "y": 1308.6556396484375,
-    "z": "f8944603.71553",
+    "x": 4226.449081420898,
+    "y": 1319.2223052978516,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "61a6617b.c1f918"
+        "57719ed2.829e5"
       ]
     ]
   },
   {
-    "id": "61a6617b.c1f918",
+    "id": "57719ed2.829e5",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4373.999969482422,
-    "y": 1322.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4410.566635131836,
+    "y": 1333.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c94ffafa.dcbd38"
+        "8b55301b.b943a8"
       ]
     ]
   },
   {
-    "id": "e2dee17e.90746",
+    "id": "545ae19b.2a1238",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
     "comments": "",
-    "x": 4543,
-    "y": 1442,
-    "z": "f8944603.71553",
+    "x": 4579.566665649414,
+    "y": 1452.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c42ee54d.ec9ea",
+    "id": "64761578.742944",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
     "comments": "",
-    "x": 4544,
-    "y": 1550,
-    "z": "f8944603.71553",
+    "x": 4580.566665649414,
+    "y": 1560.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a1e5e819.9ba388",
+    "id": "3bbb3a78.1e825e",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4545,
-    "y": 1499,
-    "z": "f8944603.71553",
+    "x": 4581.566665649414,
+    "y": 1509.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6e0bf03.4de201",
+    "id": "9388038d.e5f508",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4562.117156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4598.683822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "663b6226.995afc",
-        "dd7e9ff0.ed3a48",
-        "21e8d5ce.795f42"
+        "13805827.ade3d",
+        "a9502d93.1e2b78",
+        "a1b1941b.f9c738"
       ]
     ]
   },
   {
-    "id": "663b6226.995afc",
+    "id": "13805827.ade3d",
     "type": "set",
     "name": "set source ttp-id",
     "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4777.117156982422,
-    "y": 1604.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4813.683822631836,
+    "y": 1614.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "dd7e9ff0.ed3a48",
+    "id": "a9502d93.1e2b78",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4774.117156982422,
-    "y": 1643.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4810.683822631836,
+    "y": 1653.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "49a01492.84fe34"
+        "b0dee9b7.4f5918"
       ]
     ]
   },
   {
-    "id": "21e8d5ce.795f42",
+    "id": "a1b1941b.f9c738",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4729.617156982422,
-    "y": 1685.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4766.183822631836,
+    "y": 1695.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "49a01492.84fe34",
+    "id": "b0dee9b7.4f5918",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4954.617156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4991.183822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "292cacf5.882694"
+        "915aa3e1.c4697"
       ]
     ]
   },
   {
-    "id": "ccfcf164.268f1",
+    "id": "25f4a2bf.12e7a6",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4774,
-    "y": 1260,
-    "z": "f8944603.71553",
+    "x": 4810.566665649414,
+    "y": 1270.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c88ef5fa.00d8b"
+        "5118de9a.01dd88"
       ]
     ]
   },
   {
-    "id": "c88ef5fa.00d8b",
+    "id": "5118de9a.01dd88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4951,
-    "y": 1252,
-    "z": "f8944603.71553",
+    "x": 4987.566665649414,
+    "y": 1262.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "889b0a64.f04af",
-        "b7b819bd.9ab3a"
+        "94a9a0f9.c59e58",
+        "85408268.2c3368"
       ]
     ]
   },
   {
-    "id": "c94ffafa.dcbd38",
+    "id": "8b55301b.b943a8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4568.999969482422,
-    "y": 1322.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4605.566635131836,
+    "y": 1333.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ccfcf164.268f1",
-        "109fb904.331fef"
+        "25f4a2bf.12e7a6",
+        "95e8d812.cc8ca8"
       ]
     ]
   },
   {
-    "id": "109fb904.331fef",
+    "id": "95e8d812.cc8ca8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4777,
-    "y": 1334,
-    "z": "f8944603.71553",
+    "x": 4813.566665649414,
+    "y": 1344.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c72b69fd.2d015"
+        "f38eef5.12b7d1"
       ]
     ]
   },
   {
-    "id": "c72b69fd.2d015",
+    "id": "f38eef5.12b7d1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4954,
-    "y": 1326,
-    "z": "f8944603.71553",
+    "x": 4990.566665649414,
+    "y": 1336.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7fcaaf72.ffd618"
+        "c816565f.10d5d"
       ]
     ]
   },
   {
-    "id": "292cacf5.882694",
+    "id": "915aa3e1.c4697",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5112.617156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 5149.183822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "63e30873.d5c4b8"
+        "6c003d6.b17f944"
       ]
     ]
   },
   {
-    "id": "63e30873.d5c4b8",
+    "id": "6c003d6.b17f944",
     "type": "set",
     "name": "set source tunnel tp ip",
     "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5319.617156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 5356.183822631836,
+    "y": 1652.906967163086,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b7b819bd.9ab3a",
+    "id": "85408268.2c3368",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5159,
-    "y": 1259,
-    "z": "f8944603.71553",
+    "x": 5195.566665649414,
+    "y": 1269.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b062763c.d2a4c",
-        "54b52301.01aeac",
-        "c657b443.273d9"
+        "53b236d8.1b02c",
+        "4083b24b.fff034",
+        "39446af.e663d96"
       ]
     ]
   },
   {
-    "id": "889b0a64.f04af",
+    "id": "94a9a0f9.c59e58",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainA id",
     "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5189,
-    "y": 1207,
-    "z": "f8944603.71553",
+    "x": 5225.566665649414,
+    "y": 1217.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b062763c.d2a4c",
+    "id": "53b236d8.1b02c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5369,
-    "y": 1250,
-    "z": "f8944603.71553",
+    "x": 5405.566665649414,
+    "y": 1260.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "be5642b7.4ae158"
+        "85a67c1c.71be78"
       ]
     ]
   },
   {
-    "id": "54b52301.01aeac",
+    "id": "4083b24b.fff034",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5361,
-    "y": 1305,
-    "z": "f8944603.71553",
+    "x": 5397.566665649414,
+    "y": 1315.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4c818fe4.79442"
+        "ef1cd568.ee18"
       ]
     ]
   },
   {
-    "id": "c657b443.273d9",
+    "id": "39446af.e663d96",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5366,
-    "y": 1362,
-    "z": "f8944603.71553",
+    "x": 5402.566665649414,
+    "y": 1372.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "efb52045.6ba93"
+        "9b4ff565.a53cd"
       ]
     ]
   },
   {
-    "id": "efb52045.6ba93",
+    "id": "9b4ff565.a53cd",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5518,
-    "y": 1363,
-    "z": "f8944603.71553",
+    "x": 5554.566665649414,
+    "y": 1373.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4c818fe4.79442",
+    "id": "ef1cd568.ee18",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5529,
-    "y": 1308,
-    "z": "f8944603.71553",
+    "x": 5565.566665649414,
+    "y": 1318.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "be5642b7.4ae158",
+    "id": "85a67c1c.71be78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5513.38232421875,
-    "y": 1247.6556701660156,
-    "z": "f8944603.71553",
+    "x": 5549.948989868164,
+    "y": 1258.2223358154297,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6763b660.709548"
+        "53e9aeb2.242928"
       ]
     ]
   },
   {
-    "id": "7fcaaf72.ffd618",
+    "id": "c816565f.10d5d",
     "type": "set",
     "name": "set domainA ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5189,
-    "y": 1450,
-    "z": "f8944603.71553",
+    "x": 5225.566665649414,
+    "y": 1460.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6763b660.709548",
+    "id": "53e9aeb2.242928",
     "type": "set",
     "name": "set controller domainA data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5728,
-    "y": 1244,
-    "z": "f8944603.71553",
+    "x": 5764.566665649414,
+    "y": 1254.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1bc82fcd.e38b3",
+    "id": "bd4af2f9.e804e",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4377.999969482422,
-    "y": 528.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4414.566635131836,
+    "y": 539.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1ea9819.2a7577e",
+    "id": "ff102e0b.75a238",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4368.999969482422,
-    "y": 626.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4405.566635131836,
+    "y": 637.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "86b880d.ad45d",
+    "id": "c7edad0e.b216",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4202.999969482422,
-    "y": 534.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4239.566635131836,
+    "y": 545.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4ebe65d0.3ec92c",
-        "1bc82fcd.e38b3"
+        "f5d37541.2d47c8",
+        "bd4af2f9.e804e"
       ]
     ]
   },
   {
-    "id": "10eaea8a.998afd",
+    "id": "d5f61daa.4b4388",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4208.999969482422,
-    "y": 598.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4245.566635131836,
+    "y": 609.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b5b3e89e.18b28",
-        "1ea9819.2a7577e"
+        "2bfe954c.51473a",
+        "ff102e0b.75a238"
       ]
     ]
   },
   {
-    "id": "e84921e.f8ecce",
+    "id": "81e90993.f1d9a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4227,
-    "y": 811,
-    "z": "f8944603.71553",
+    "x": 4263.566665649414,
+    "y": 821.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "81270995.5d712",
-        "aacd9933.603dc8"
+        "9391f162.46d07",
+        "cb81a4f3.d6156"
       ]
     ]
   },
   {
-    "id": "b7ebf9b7.e2f348",
+    "id": "da2103e1.15169",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4230,
-    "y": 864,
-    "z": "f8944603.71553",
+    "x": 4266.566665649414,
+    "y": 874.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7db54dd4.f36624",
-        "bffe7efa.872038"
+        "8da0410.b4be6c",
+        "e6103926.96cb88"
       ]
     ]
   },
   {
-    "id": "aacd9933.603dc8",
+    "id": "cb81a4f3.d6156",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4387,
-    "y": 824,
-    "z": "f8944603.71553",
+    "x": 4423.566665649414,
+    "y": 834.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "bffe7efa.872038",
+    "id": "e6103926.96cb88",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4390,
-    "y": 915,
-    "z": "f8944603.71553",
+    "x": 4426.566665649414,
+    "y": 925.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "786dd6d1.bb9f",
+    "id": "9fb68dad.7c92d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3681.999969482422,
-    "y": 2041.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3718.566635131836,
+    "y": 2052.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ced1d6e7.1761a",
-        "debfaec3.11449"
+        "931d0e50.a84728",
+        "4385be6.d4f41c"
       ]
     ]
   },
   {
-    "id": "4b469f00.bbd698",
+    "id": "62a0ff40.3fa718",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3509.333465576172,
-    "y": 2042.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3545.900131225586,
+    "y": 2053.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "786dd6d1.bb9f"
+        "9fb68dad.7c92d"
       ]
     ]
   },
   {
-    "id": "abe29976.f7b82",
+    "id": "a9db3cf5.8c98a8",
     "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": 3555.391098022461,
+    "y": 2096.140670776367,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fd5b7bb5.9eb778"
+        "b1d5af05.b8b6a"
       ]
     ]
   },
   {
-    "id": "df5e24e1.4bbfc8",
+    "id": "e64b0ffd.d5764",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3507.333465576172,
-    "y": 2131.999969482422,
-    "z": "f8944603.71553",
+    "x": 3543.900131225586,
+    "y": 2142.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8efc96df.7aca9"
+        "c5461a06.0ba95"
       ]
     ]
   },
   {
-    "id": "fd5b7bb5.9eb778",
+    "id": "b1d5af05.b8b6a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3672.3958435058594,
-    "y": 2088.8597412109375,
-    "z": "f8944603.71553",
+    "x": 3708.9625091552734,
+    "y": 2099.4264068603516,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8efc96df.7aca9",
+    "id": "c5461a06.0ba95",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3676.333465576172,
-    "y": 2132.999969482422,
-    "z": "f8944603.71553",
+    "x": 3712.900131225586,
+    "y": 2143.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ced1d6e7.1761a",
+    "id": "931d0e50.a84728",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3968.333465576172,
-    "y": 2046.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4004.900131225586,
+    "y": 2056.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8ff8205e.94493",
-        "d23599ca.696b88"
+        "ff2f7e35.94528",
+        "ccece71a.073de8"
       ]
     ]
   },
   {
-    "id": "d23599ca.696b88",
+    "id": "ccece71a.073de8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4191.333465576172,
-    "y": 2001.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4227.900131225586,
+    "y": 2011.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9c58fe22.c1b4f8"
+        "c18c40eb.b59cb8"
       ]
     ]
   },
   {
-    "id": "8ff8205e.94493",
+    "id": "ff2f7e35.94528",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4193.333465576172,
-    "y": 2065.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4229.900131225586,
+    "y": 2075.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f9f53a1b.e6879"
+        "a47e6ec9.683da"
       ]
     ]
   },
   {
-    "id": "f9f53a1b.e6879",
+    "id": "a47e6ec9.683da",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4352.333465576172,
-    "y": 2084.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4388.900131225586,
+    "y": 2094.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9c58fe22.c1b4f8",
+    "id": "c18c40eb.b59cb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4356.333465576172,
-    "y": 1998.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4392.900131225586,
+    "y": 2008.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a3891ddf.35707",
-        "dedb2135.03f5b8"
+        "50191e6c.286e58",
+        "e564295c.7502a8"
       ]
     ]
   },
   {
-    "id": "b18620c8.640928",
+    "id": "37ff3aef.9a54ee",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3281.333465576172,
-    "y": 2077.999969482422,
-    "z": "f8944603.71553",
+    "x": 3317.900131225586,
+    "y": 2088.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4b469f00.bbd698",
-        "abe29976.f7b82",
-        "df5e24e1.4bbfc8"
+        "62a0ff40.3fa718",
+        "a9db3cf5.8c98a8",
+        "e64b0ffd.d5764"
       ]
     ]
   },
   {
-    "id": "2363f2d1.c22566",
+    "id": "e2a5ba2c.d267c",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3242.333465576172,
-    "y": 2021.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3278.900131225586,
+    "y": 2032.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d6e1611b.9ddcf",
+    "id": "3ceacdf9.dad772",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3301.333465576172,
-    "y": 1817.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3337.900131225586,
+    "y": 1828.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cf2f2f41.e3b378",
-        "39e668ff.f44578"
+        "fc191473.db2cb8",
+        "44d4fd2b.8896cc"
       ]
     ]
   },
   {
-    "id": "39e668ff.f44578",
+    "id": "44d4fd2b.8896cc",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3524.333465576172,
-    "y": 1803.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3560.900131225586,
+    "y": 1814.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a19c910d.573ee"
+        "e4dd083d.cd18f8"
       ]
     ]
   },
   {
-    "id": "cf2f2f41.e3b378",
+    "id": "fc191473.db2cb8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3526.333465576172,
-    "y": 1836.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3562.900131225586,
+    "y": 1847.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "13f310d4.058aff"
+        "28eac456.f04cbc"
       ]
     ]
   },
   {
-    "id": "13f310d4.058aff",
+    "id": "28eac456.f04cbc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3669.333465576172,
-    "y": 1833.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3705.900131225586,
+    "y": 1844.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a19c910d.573ee",
+    "id": "e4dd083d.cd18f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3672.333465576172,
-    "y": 1796.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3708.900131225586,
+    "y": 1807.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f7d74c47.1bc978",
-        "f5bac544.61fa48"
+        "c8368cdf.b15f18",
+        "26325ab5.37c516"
       ]
     ]
   },
   {
-    "id": "f7d74c47.1bc978",
+    "id": "c8368cdf.b15f18",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3866.333465576172,
-    "y": 1800.0000915527344,
-    "z": "f8944603.71553",
+    "x": 3902.900131225586,
+    "y": 1810.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "debfaec3.11449",
+    "id": "4385be6.d4f41c",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3919.3334350585938,
-    "y": 2168.9999389648438,
-    "z": "f8944603.71553",
+    "x": 3955.900100708008,
+    "y": 2179.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9615e6c.711fd18"
+        "ab5afaa2.b8a2e"
       ]
     ]
   },
   {
-    "id": "9615e6c.711fd18",
+    "id": "ab5afaa2.b8a2e",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4125.333435058594,
-    "y": 2168.9999389648438,
-    "z": "f8944603.71553",
+    "x": 4161.900100708008,
+    "y": 2179.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cbe4341f.004078"
+        "8b90a37d.df48a8"
       ]
     ]
   },
   {
-    "id": "cbe4341f.004078",
+    "id": "8b90a37d.df48a8",
     "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": 4379.185745239258,
+    "y": 2178.388381958008,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c7f950c4.309208"
+        "9497250f.2d9438"
       ]
     ]
   },
   {
-    "id": "f5bac544.61fa48",
+    "id": "26325ab5.37c516",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3888.333465576172,
-    "y": 1868.0000915527344,
-    "z": "f8944603.71553",
+    "x": 3924.900131225586,
+    "y": 1878.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2c3b0cc0.e9a8bc",
-        "964d0d68.ea7238",
-        "c9fecb15.92dc4"
+        "572475c6.9df474",
+        "8a4bcee9.a6e838",
+        "52414e68.698aa8"
       ]
     ]
   },
   {
-    "id": "2c3b0cc0.e9a8bc",
+    "id": "572475c6.9df474",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4083.8335876464844,
-    "y": 1820.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4120.400253295898,
+    "y": 1830.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d8e08a6a.bad6c"
+        "cc04a6ba.577058"
       ]
     ]
   },
   {
-    "id": "964d0d68.ea7238",
+    "id": "8a4bcee9.a6e838",
     "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": 4112.400253295898,
+    "y": 1885.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "30330606.c5c78a"
+        "5bcad340.b7a94c"
       ]
     ]
   },
   {
-    "id": "c9fecb15.92dc4",
+    "id": "52414e68.698aa8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.8335876464844,
-    "y": 1932.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4117.400253295898,
+    "y": 1942.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7d5217b1.764cf"
+        "78c91f5c.6a81a"
       ]
     ]
   },
   {
-    "id": "7d5217b1.764cf",
+    "id": "78c91f5c.6a81a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4232.833587646484,
-    "y": 1933.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4269.400253295898,
+    "y": 1943.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "30330606.c5c78a",
+    "id": "5bcad340.b7a94c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4243.833587646484,
-    "y": 1878.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4280.400253295898,
+    "y": 1888.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d8e08a6a.bad6c",
+    "id": "cc04a6ba.577058",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4228.215911865234,
-    "y": 1817.65576171875,
-    "z": "f8944603.71553",
+    "x": 4264.782577514648,
+    "y": 1828.222427368164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "57c065bf.a4bd5c"
+        "b056f70a.5ef0e"
       ]
     ]
   },
   {
-    "id": "a3891ddf.35707",
+    "id": "50191e6c.286e58",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
     "comments": "",
-    "x": 4526.333465576172,
-    "y": 1959.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4562.900131225586,
+    "y": 1969.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "dedb2135.03f5b8",
+    "id": "e564295c.7502a8",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
     "comments": "",
-    "x": 4527.333465576172,
-    "y": 2064.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4563.900131225586,
+    "y": 2074.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cd4b037.d584a",
+    "id": "4a5f1f34.b170c",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4522.333465576172,
-    "y": 2013.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4558.900131225586,
+    "y": 2023.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c7f950c4.309208",
+    "id": "9497250f.2d9438",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4549.450622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4586.017288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dd90bf13.7024b8",
-        "71302a26.8b2194",
-        "1d143619.b4c942"
+        "dc5203d6.63ee88",
+        "bfaf928b.d789b",
+        "75ef4dfa.4963fc"
       ]
     ]
   },
   {
-    "id": "dd90bf13.7024b8",
+    "id": "dc5203d6.63ee88",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4764.450622558594,
-    "y": 2119.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4801.017288208008,
+    "y": 2129.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "71302a26.8b2194",
+    "id": "bfaf928b.d789b",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4761.450622558594,
-    "y": 2158.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4798.017288208008,
+    "y": 2168.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d8986410.1ab67"
+        "6dd4b7bc.60078"
       ]
     ]
   },
   {
-    "id": "1d143619.b4c942",
+    "id": "75ef4dfa.4963fc",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4716.950622558594,
-    "y": 2200.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4753.517288208008,
+    "y": 2210.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d8986410.1ab67",
+    "id": "6dd4b7bc.60078",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4941.950622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4978.517288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ce977a1e.eca43"
+        "f825fb77.fb7bc8"
       ]
     ]
   },
   {
-    "id": "ce977a1e.eca43",
+    "id": "f825fb77.fb7bc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5099.950622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 5136.517288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fad51809.c9b758"
+        "aa2ab587.72eca"
       ]
     ]
   },
   {
-    "id": "fad51809.c9b758",
+    "id": "aa2ab587.72eca",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5306.950622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 5343.517288208008,
+    "y": 2167.9070587158203,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3e817052.af0e48",
+    "id": "5ec77bbd.698654",
     "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": 4846.900131225586,
+    "y": 1846.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "41d964fa.bed18c"
+        "ef66532c.d6746"
       ]
     ]
   },
   {
-    "id": "41d964fa.bed18c",
+    "id": "ef66532c.d6746",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4987.333465576172,
-    "y": 1828.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5023.900131225586,
+    "y": 1838.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "286abe4.161a1c2",
-        "51859ea0.e5a788"
+        "f7a2f11b.7a291",
+        "d2b30e12.01e548"
       ]
     ]
   },
   {
-    "id": "57c065bf.a4bd5c",
+    "id": "b056f70a.5ef0e",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4412.333465576172,
-    "y": 1832.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4448.900131225586,
+    "y": 1842.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "89b46226.1281f"
+        "658c9b9.fce64e4"
       ]
     ]
   },
   {
-    "id": "89b46226.1281f",
+    "id": "658c9b9.fce64e4",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4607.333465576172,
-    "y": 1832.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4643.900131225586,
+    "y": 1842.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3e817052.af0e48",
-        "56bdf4f5.249c24"
+        "5ec77bbd.698654",
+        "d91be682.fd9ed8"
       ]
     ]
   },
   {
-    "id": "51859ea0.e5a788",
+    "id": "d2b30e12.01e548",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5195.333465576172,
-    "y": 1835.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5231.900131225586,
+    "y": 1845.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d1ce3d2f.531928",
-        "ba2a8dba.a8d52",
-        "4ba192d1.030d84"
+        "5cd3941f.991a64",
+        "72be6080.49369",
+        "27b21fad.3c3a98"
       ]
     ]
   },
   {
-    "id": "f8a3b14d.675a5",
+    "id": "a895224b.6a3d58",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4989.333465576172,
-    "y": 1901.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5025.900131225586,
+    "y": 1911.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "25c16268.66f006"
+        "de5c0fa7.2ddfe8"
       ]
     ]
   },
   {
-    "id": "56bdf4f5.249c24",
+    "id": "d91be682.fd9ed8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4812.333465576172,
-    "y": 1909.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4848.900131225586,
+    "y": 1919.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f8a3b14d.675a5"
+        "a895224b.6a3d58"
       ]
     ]
   },
   {
-    "id": "286abe4.161a1c2",
+    "id": "f7a2f11b.7a291",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainB id",
     "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5225.333465576172,
-    "y": 1783.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5261.900131225586,
+    "y": 1793.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "25c16268.66f006",
+    "id": "de5c0fa7.2ddfe8",
     "type": "set",
     "name": "set domainB ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5224.333465576172,
-    "y": 2025.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5260.900131225586,
+    "y": 2035.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d1ce3d2f.531928",
+    "id": "5cd3941f.991a64",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5405.333465576172,
-    "y": 1826.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5441.900131225586,
+    "y": 1836.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9d788655.20f98"
+        "2d963acb.7812d6"
       ]
     ]
   },
   {
-    "id": "ba2a8dba.a8d52",
+    "id": "72be6080.49369",
     "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": 5433.900131225586,
+    "y": 1891.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "96363bdc.091"
+        "7809e6f0.3ba7a"
       ]
     ]
   },
   {
-    "id": "4ba192d1.030d84",
+    "id": "27b21fad.3c3a98",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5402.333465576172,
-    "y": 1938.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5438.900131225586,
+    "y": 1948.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6a0588e1.3fd2b8"
+        "76fc1345.ebf534"
       ]
     ]
   },
   {
-    "id": "6a0588e1.3fd2b8",
+    "id": "76fc1345.ebf534",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5554.333465576172,
-    "y": 1939.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5590.900131225586,
+    "y": 1949.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "96363bdc.091",
+    "id": "7809e6f0.3ba7a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5565.333465576172,
-    "y": 1884.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5601.900131225586,
+    "y": 1894.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9d788655.20f98",
+    "id": "2d963acb.7812d6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5549.715789794922,
-    "y": 1823.65576171875,
-    "z": "f8944603.71553",
+    "x": 5586.282455444336,
+    "y": 1834.222427368164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f42174ac.a42b5"
+        "3e96d581.6be972"
       ]
     ]
   },
   {
-    "id": "f42174ac.a42b5",
+    "id": "3e96d581.6be972",
     "type": "set",
     "name": "set controller domainB data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5764.333465576172,
-    "y": 1820.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5800.900131225586,
+    "y": 1830.5667572021484,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "11e0f934.faeab7",
+    "id": "a62852b2.29136",
     "type": "set",
     "name": "set LEAF stuff",
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
     "comments": "",
-    "x": 3248.999969482422,
-    "y": 1638.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3285.566635131836,
+    "y": 1649.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "87d62238.4ede38",
+    "id": "906a6d5d.cfc198",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4544.999969482422,
-    "y": 612.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4581.566635131836,
+    "y": 623.5666351318359,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "da6b2335.2cb2",
+    "id": "c5fcfc8e.70af78",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4555,
-    "y": 809,
-    "z": "f8944603.71553",
+    "x": 4591.566665649414,
+    "y": 819.5666656494141,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b71f57a7.e2a288",
+    "id": "e4c9b14e.e493e",
     "type": "set",
     "name": "set ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
     "comments": "",
-    "x": 3251.9999389648438,
-    "y": 2146.9999389648438,
-    "z": "f8944603.71553",
+    "x": 3288.566604614258,
+    "y": 2157.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f7d11626.bd108",
+    "id": "a5e91f89.51e28",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3389,
-    "y": 2803,
-    "z": "f8944603.71553",
+    "x": 3425.566665649414,
+    "y": 2813.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "7d22810d.66642",
+    "id": "6a1545ce.c6f074",
     "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": 3302.566665649414,
+    "y": 2923.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "74458dfb.e82acc",
-        "6d43d493.c2ab14"
+        "2a58524.cf6ab2e",
+        "b22f43e3.b228e"
       ]
     ]
   },
   {
-    "id": "74458dfb.e82acc",
+    "id": "2a58524.cf6ab2e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3450,
-    "y": 2892,
-    "z": "f8944603.71553",
+    "x": 3486.566665649414,
+    "y": 2902.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bd8c7362.5e86a8"
+        "1fd47368.eaee3d"
       ]
     ]
   },
   {
-    "id": "6d43d493.c2ab14",
+    "id": "b22f43e3.b228e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3342,
-    "y": 5070,
-    "z": "f8944603.71553",
+    "x": 3378.566665649414,
+    "y": 5080.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f235a0e0.02a8"
+        "bb1800d1.b22838"
       ]
     ]
   },
   {
-    "id": "f235a0e0.02a8",
+    "id": "bb1800d1.b22838",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3497,
-    "y": 5063,
-    "z": "f8944603.71553",
+    "x": 3533.566665649414,
+    "y": 5073.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "69d3ed18.577c3c",
-        "f2a7dc4a.68ede",
-        "a789852e.51cd48",
-        "434bd8c2.bae4f8",
-        "cd1fc06c.124968",
-        "c32fbe2a.4ce3f"
+        "eb692208.605d48",
+        "fa1a129b.8e1e58",
+        "8f8ab353.277fd8",
+        "e967635e.d5f898",
+        "a7e951fd.34174",
+        "147222b6.72d4a5"
       ]
     ]
   },
   {
-    "id": "bd8c7362.5e86a8",
+    "id": "1fd47368.eaee3d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3593,
-    "y": 2892,
-    "z": "f8944603.71553",
+    "x": 3629.566665649414,
+    "y": 2902.566665649414,
+    "z": "c7b9cd35.bfac88",
     "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"
+        "13be4810.27374",
+        "2088078d.cb1e2",
+        "e3bae41.89a4a98",
+        "ed9405a6.bcc818",
+        "fe194fc5.986bf",
+        "c94ba2a6.6d9dc",
+        "49793ec.cd6ce4",
+        "5e8a3143.8db73",
+        "faf103f5.4614f8",
+        "88431892.8e89b8",
+        "cac051ff.1079b",
+        "8ab931f2.10742",
+        "38387e07.eee06a",
+        "c16c558d.bd7fa8",
+        "773efcf1.a16054",
+        "4610b0f7.2e9108",
+        "9860b974.593a3",
+        "e82d41b7.567df",
+        "763bc2b5.d71f9c",
+        "3cc87f7.3864a",
+        "5fefabc6.f62f5c",
+        "dbd95dbb.cf097"
       ]
     ]
   },
   {
-    "id": "5bfaebb4.b0d114",
+    "id": "faf103f5.4614f8",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainB",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3903,
-    "y": 3207,
-    "z": "f8944603.71553",
+    "x": 3939.566665649414,
+    "y": 3217.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "edf6563f.502118",
+    "id": "13be4810.27374",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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": 3887.566665649414,
+    "y": 3259.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "59e68189.ade8e8",
+    "id": "2088078d.cb1e2",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3980,
-    "y": 3291,
-    "z": "f8944603.71553",
+    "x": 4016.566665649414,
+    "y": 3301.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c425c4b.b5f8838",
+    "id": "c56513f7.9839c8",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 3826,
-    "y": 3166,
-    "z": "f8944603.71553",
+    "x": 3862.566665649414,
+    "y": 3176.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "78e08e98.7c634",
+    "id": "cb0612e7.fab918",
     "type": "comment",
     "name": "create middle man connectivity and ...",
     "info": "1- create middle man connectivity\n2- create relation with all connectivities\n   in the path\n3- put srcTtp (+dstTtp) somewhere in the\n   vpn-binding -> this is for later on to find\n   which OTN tunnel's bandwidth has to be increased.\n5- create UNIs\n4- create relationship to UNIs",
     "comments": "",
-    "x": 4351,
-    "y": 3687,
-    "z": "f8944603.71553",
+    "x": 4387.566665649414,
+    "y": 3697.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "39d89d00.a48b3c",
+    "id": "e3bae41.89a4a98",
     "type": "execute",
     "name": "execute UUID generator for connectivity middle-man",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3915,
-    "y": 3726,
-    "z": "f8944603.71553",
+    "x": 3951.566665649414,
+    "y": 3736.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f51c657e.c3fcc8",
+    "id": "ed9405a6.bcc818",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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": 3899.566665649414,
+    "y": 3787.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "3b5e2d55.c49c42",
+    "id": "fe194fc5.986bf",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-middle-man-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-middle-man-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3999,
-    "y": 3824,
-    "z": "f8944603.71553",
+    "x": 4035.566665649414,
+    "y": 3834.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "62d7e2a.9cbc61c",
+    "id": "3a844032.bf9ac",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 3856,
-    "y": 3686,
-    "z": "f8944603.71553",
+    "x": 3892.566665649414,
+    "y": 3696.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1f0597e7.f750d8",
+    "id": "debaf07d.db6d5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4286,
-    "y": 3883,
-    "z": "f8944603.71553",
+    "x": 4322.566665649414,
+    "y": 3893.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c40c923d.ffb318",
+    "id": "c94ba2a6.6d9dc",
     "type": "save",
     "name": "get middle-man connectivity from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $prop.connectivity-middle-man-uuid\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"middle-man-conn\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3877,
-    "y": 3930,
-    "z": "f8944603.71553",
+    "x": 3913.566665649414,
+    "y": 3940.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b2dc6149.43ec28",
-        "f8c162ee.8e2a8",
-        "a8c36503.377908"
+        "34b4bb6d.84f2ec",
+        "39b05e8d.991162",
+        "b7823394.4e1968"
       ]
     ]
   },
   {
-    "id": "b2dc6149.43ec28",
+    "id": "34b4bb6d.84f2ec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4124,
-    "y": 3884,
-    "z": "f8944603.71553",
+    "x": 4160.566665649414,
+    "y": 3894.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1f0597e7.f750d8"
+        "debaf07d.db6d5"
       ]
     ]
   },
   {
-    "id": "f8c162ee.8e2a8",
+    "id": "39b05e8d.991162",
     "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": 4161.057632446289,
+    "y": 3940.1407012939453,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "244505cb.7c97da"
+        "483dd1d6.aa392"
       ]
     ]
   },
   {
-    "id": "a8c36503.377908",
+    "id": "b7823394.4e1968",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4122,
-    "y": 3973,
-    "z": "f8944603.71553",
+    "x": 4158.566665649414,
+    "y": 3983.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fac0a6c3.57a578"
+        "59b157ce.93edc"
       ]
     ]
   },
   {
-    "id": "244505cb.7c97da",
+    "id": "483dd1d6.aa392",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4287.0623779296875,
-    "y": 3929.8597717285156,
-    "z": "f8944603.71553",
+    "x": 4323.629043579102,
+    "y": 3940.4264373779297,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fac0a6c3.57a578",
+    "id": "59b157ce.93edc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4291,
-    "y": 3974,
-    "z": "f8944603.71553",
+    "x": 4327.566665649414,
+    "y": 3984.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f9369eb9.dd61b",
+    "id": "773efcf1.a16054",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3931,
-    "y": 4272,
-    "z": "f8944603.71553",
+    "x": 3967.566665649414,
+    "y": 4282.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "dad20130.739d78",
+    "id": "4610b0f7.2e9108",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3934,
-    "y": 4317,
-    "z": "f8944603.71553",
+    "x": 3970.566665649414,
+    "y": 4327.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "fdfcc8c4.b3e8a8",
+    "id": "e82d41b7.567df",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3926,
-    "y": 4045,
-    "z": "f8944603.71553",
+    "x": 3962.566665649414,
+    "y": 4055.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "8b9dcfa3.01c508",
+    "id": "763bc2b5.d71f9c",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3928,
-    "y": 4092,
-    "z": "f8944603.71553",
+    "x": 3964.566665649414,
+    "y": 4102.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ed841a30.7664d",
+    "id": "e3efee4c.cbd228",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 3847,
-    "y": 4225,
-    "z": "f8944603.71553",
+    "x": 3883.566665649414,
+    "y": 4235.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7144ff5f.c519e8",
+    "id": "a86d756f.b96748",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4457,
-    "y": 4891,
-    "z": "f8944603.71553",
+    "x": 4493.566665649414,
+    "y": 4901.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "69d3ed18.577c3c",
+    "id": "eb692208.605d48",
     "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": 3748.566665649414,
+    "y": 5054.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ae7574f4.3ebe3",
-        "8bd2d4fd.8c4f1"
+        "35961804.034dd",
+        "1c6960fb.af77c7"
       ]
     ]
   },
   {
-    "id": "8bd2d4fd.8c4f1",
+    "id": "1c6960fb.af77c7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3884,
-    "y": 5041,
-    "z": "f8944603.71553",
+    "x": 3920.566665649414,
+    "y": 5051.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "439959aa.a8d0e"
+        "44ac8602.f7b438"
       ]
     ]
   },
   {
-    "id": "ae7574f4.3ebe3",
+    "id": "35961804.034dd",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3836,
-    "y": 5888,
-    "z": "f8944603.71553",
+    "x": 3872.566665649414,
+    "y": 5898.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b05d129.ef1b1f"
+        "e66ef561.f9598"
       ]
     ]
   },
   {
-    "id": "bbd89123.3c84c8",
+    "id": "a7546f8d.e642f8",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3897,
-    "y": 5011,
-    "z": "f8944603.71553",
+    "x": 3933.566665649414,
+    "y": 5021.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "88e636e4.0ad278",
+    "id": "7377305c.6344e",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3907,
-    "y": 5846,
-    "z": "f8944603.71553",
+    "x": 3943.566665649414,
+    "y": 5856.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3d1335ab.d13122",
+    "id": "49793ec.cd6ce4",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3930,
-    "y": 4420,
-    "z": "f8944603.71553",
+    "x": 3966.566665649414,
+    "y": 4430.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "439959aa.a8d0e",
+    "id": "44ac8602.f7b438",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4060,
-    "y": 5043,
-    "z": "f8944603.71553",
+    "x": 4096.566665649414,
+    "y": 5053.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "398ca5b9.10ae92",
-        "26315d76.5ba5da",
-        "70413194.4e4218",
-        "36f7b692.fe5f9a",
-        "23762b83.94d65c",
-        "1981b041.f96778",
-        "7144ff5f.c519e8",
-        "d1a4e2c9.15ac9",
-        "24040f90.d6a4"
+        "f2639d5b.9b3268",
+        "eb43383.cb911c8",
+        "b431bc46.f09eb8",
+        "3f007800.f3335",
+        "6651db46.728784",
+        "ec10a332.513d58",
+        "a86d756f.b96748",
+        "128b476.c3c24b9",
+        "b1e27ce1.629f7"
       ]
     ]
   },
   {
-    "id": "9b6d23e8.2f4c1",
+    "id": "3a4a9e77.4fc502",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5505,
-    "y": 4516,
-    "z": "f8944603.71553",
+    "x": 5541.566665649414,
+    "y": 4526.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "398ca5b9.10ae92",
+    "id": "f2639d5b.9b3268",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4438,
-    "y": 5546,
-    "z": "f8944603.71553",
+    "x": 4474.566665649414,
+    "y": 5556.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "441ba30c.ae2a1c",
+    "id": "5e8a3143.8db73",
     "type": "save",
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3909,
-    "y": 3420,
-    "z": "f8944603.71553",
+    "x": 3945.566665649414,
+    "y": 3430.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "32f3c697.c51f22",
+    "id": "88431892.8e89b8",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3907,
-    "y": 2877,
-    "z": "f8944603.71553",
+    "x": 3943.566665649414,
+    "y": 2887.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f60b0d1b.343218",
+    "id": "cac051ff.1079b",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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": 3891.566665649414,
+    "y": 2935.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "51fbee04.79f4f",
+    "id": "8ab931f2.10742",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3983,
-    "y": 2972,
-    "z": "f8944603.71553",
+    "x": 4019.566665649414,
+    "y": 2982.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f3326814.1ece9",
+    "id": "be22c48f.b88288",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 3820,
-    "y": 2835,
-    "z": "f8944603.71553",
+    "x": 3856.566665649414,
+    "y": 2845.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a2a5771a.032e88",
+    "id": "38387e07.eee06a",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />",
     "comments": "",
     "outputs": 1,
-    "x": 3817,
-    "y": 3063,
-    "z": "f8944603.71553",
+    "x": 3853.566665649414,
+    "y": 3073.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "a39c337f.4b8598",
+    "id": "c16c558d.bd7fa8",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3910,
-    "y": 3116,
-    "z": "f8944603.71553",
+    "x": 3946.566665649414,
+    "y": 3126.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "71641615.6f44c8",
+    "id": "8249248d.fd861",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 3801,
-    "y": 3019,
-    "z": "f8944603.71553",
+    "x": 3837.566665649414,
+    "y": 3029.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "11067d29.f83e4b",
+    "id": "8a8f5ba9.d4da6",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3805,
-    "y": 3335,
-    "z": "f8944603.71553",
+    "x": 3841.566665649414,
+    "y": 3345.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "36f7b692.fe5f9a",
+    "id": "3f007800.f3335",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4374,
-    "y": 4524,
-    "z": "f8944603.71553",
+    "x": 4410.566665649414,
+    "y": 4534.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "fa6ec7f0.b5b858",
+    "id": "5bce380a.32d878",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4358,
-    "y": 4480,
-    "z": "f8944603.71553",
+    "x": 4394.566665649414,
+    "y": 4490.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "87e40dc2.3dae2",
+    "id": "1b090d31.1314e3",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5105,
-    "y": 4511,
-    "z": "f8944603.71553",
+    "x": 5141.566665649414,
+    "y": 4521.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a4406b4c.17bbc",
+    "id": "c30363c7.dd0dc",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5192,
-    "y": 4553,
-    "z": "f8944603.71553",
+    "x": 5228.566665649414,
+    "y": 4563.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "18ca4a3.634f536",
+    "id": "10271018.94b4f8",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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": 5176.566665649414,
+    "y": 4611.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "b4f57662.21d798",
+    "id": "285754a8.44159c",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5268,
-    "y": 4648,
-    "z": "f8944603.71553",
+    "x": 5304.566665649414,
+    "y": 4658.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "1981b041.f96778",
+    "id": "ec10a332.513d58",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4445,
-    "y": 4933,
-    "z": "f8944603.71553",
+    "x": 4481.566665649414,
+    "y": 4943.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "1ff0ab3b.554fd5",
+    "id": "572f6814.fa386",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4428,
-    "y": 4995,
-    "z": "f8944603.71553",
+    "x": 4464.566665649414,
+    "y": 5005.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "26315d76.5ba5da",
+    "id": "eb43383.cb911c8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4539,
-    "y": 5037,
-    "z": "f8944603.71553",
+    "x": 4575.566665649414,
+    "y": 5047.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "99476299.d65948",
+    "id": "8c58cbc3.7f4b88",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 4987,
-    "y": 5090,
-    "z": "f8944603.71553",
+    "x": 5023.566665649414,
+    "y": 5100.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7e1b41de.44cf5",
+    "id": "be5aff94.f7d12",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4297,
-    "y": 5788,
-    "z": "f8944603.71553",
+    "x": 4333.566665649414,
+    "y": 5798.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "99207b39.65e8d8",
+    "id": "526f34d0.18befc",
     "type": "save",
     "name": "save LEAF UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />",
     "comments": "",
     "outputs": 1,
-    "x": 4195,
-    "y": 5737,
-    "z": "f8944603.71553",
+    "x": 4231.566665649414,
+    "y": 5747.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "fc9d3b48.0b961",
+    "id": "6826024b.ca723c",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4179,
-    "y": 5693,
-    "z": "f8944603.71553",
+    "x": 4215.566665649414,
+    "y": 5703.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cdbca407.a3714",
+    "id": "be0ba193.2dd698",
     "type": "save",
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4965,
-    "y": 5950,
-    "z": "f8944603.71553",
+    "x": 5001.566665649414,
+    "y": 5960.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "70413194.4e4218",
+    "id": "b431bc46.f09eb8",
     "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": 4402.566665649414,
+    "y": 5104.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9e68e3f9.d79778",
-        "3f3ed24c.0decee"
+        "baf822c4.3f205",
+        "32a48883.ef2b98"
       ]
     ]
   },
   {
-    "id": "9e68e3f9.d79778",
+    "id": "baf822c4.3f205",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4577,
-    "y": 5094,
-    "z": "f8944603.71553",
+    "x": 4613.566665649414,
+    "y": 5104.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e924e4da.1f13b"
+        "58c9a296.a42094"
       ]
     ]
   },
   {
-    "id": "e924e4da.1f13b",
+    "id": "58c9a296.a42094",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4733,
-    "y": 5090,
-    "z": "f8944603.71553",
+    "x": 4769.566665649414,
+    "y": 5100.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "99476299.d65948",
-        "259aff1b.d97a1",
-        "b61f1c95.4694d"
+        "8c58cbc3.7f4b88",
+        "3aab431e.930194",
+        "c5e59db3.c67ea"
       ]
     ]
   },
   {
-    "id": "3f3ed24c.0decee",
+    "id": "32a48883.ef2b98",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4573,
-    "y": 5142,
-    "z": "f8944603.71553",
+    "x": 4609.566665649414,
+    "y": 5152.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6bc2c49e.5247fc"
+        "255e5d4d.31482a"
       ]
     ]
   },
   {
-    "id": "6bc2c49e.5247fc",
+    "id": "255e5d4d.31482a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 4721,
-    "y": 5137,
-    "z": "f8944603.71553",
+    "x": 4757.566665649414,
+    "y": 5147.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "540d81b.ac8608",
+    "id": "3647078f.866d7",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5229,
-    "y": 4719,
-    "z": "f8944603.71553",
+    "x": 5265.566665649414,
+    "y": 4729.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e8527008.db6228",
+    "id": "79257077.5f1ff8",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2395,
-    "y": 130,
-    "z": "f8944603.71553",
+    "x": 2431.566665649414,
+    "y": 140.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "a669b945.663408",
+    "id": "8a55fb57.dfc438",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 2329,
-    "y": 166,
-    "z": "f8944603.71553",
+    "x": 2365.566665649414,
+    "y": 176.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ba20200a.599368",
+    "id": "d0423030.a4fb7",
     "type": "comment",
     "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
     "info": "",
     "comments": "",
-    "x": 2514,
-    "y": 93,
-    "z": "f8944603.71553",
+    "x": 2550.566665649414,
+    "y": 103.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f5cafc97.3be338",
+    "id": "fad64a40.999cd8",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 4264,
-    "y": 5854,
-    "z": "f8944603.71553",
+    "x": 4300.566665649414,
+    "y": 5864.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "433677c1.52ee48",
+    "id": "1f999717.41db99",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4397,
-    "y": 5902,
-    "z": "f8944603.71553",
+    "x": 4433.566665649414,
+    "y": 5912.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "fabf4cab.b217e",
+    "id": "c52167d8.94938",
     "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": 4252.566665649414,
+    "y": 5970.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d58843e6.45b67",
-        "5480ce12.618198"
+        "19e438e0.03d147",
+        "34d88bae.811d0c"
       ]
     ]
   },
   {
-    "id": "d58843e6.45b67",
+    "id": "19e438e0.03d147",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4409,
-    "y": 5961,
-    "z": "f8944603.71553",
+    "x": 4445.566665649414,
+    "y": 5971.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3584d606.ea3b92"
+        "41319fcd.d8b348"
       ]
     ]
   },
   {
-    "id": "3584d606.ea3b92",
+    "id": "41319fcd.d8b348",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",
     "comments": "",
-    "x": 4565,
-    "y": 5958,
-    "z": "f8944603.71553",
+    "x": 4601.566665649414,
+    "y": 5968.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5480ce12.618198",
+    "id": "34d88bae.811d0c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4413,
-    "y": 6005,
-    "z": "f8944603.71553",
+    "x": 4449.566665649414,
+    "y": 6015.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2c5800b.fe6138"
+        "9cc4dc7d.174798"
       ]
     ]
   },
   {
-    "id": "2c5800b.fe6138",
+    "id": "9cc4dc7d.174798",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4552,
-    "y": 6000,
-    "z": "f8944603.71553",
+    "x": 4588.566665649414,
+    "y": 6010.566665649414,
+    "z": "c7b9cd35.bfac88",
     "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"
+        "be0ba193.2dd698",
+        "9b687ead.d5262",
+        "bb8d3610.613d68",
+        "89f249f3.3e5608",
+        "1d656b5f.37186d",
+        "90bf2cc6.ca2d58",
+        "517a964c.5fa06",
+        "c8b3b99a.24ee1",
+        "2487bbac.e2018c",
+        "203e33ee.d272e4",
+        "3c1017d1.449bb",
+        "21e17170.9d1c4e"
       ]
     ]
   },
   {
-    "id": "b92b2881.bc3e18",
+    "id": "517a964c.5fa06",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4749,
-    "y": 6679,
-    "z": "f8944603.71553",
+    "x": 4785.566665649414,
+    "y": 6689.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b068e9a3.d4db4",
-        "b79debc6.f268c",
-        "599f79e1.6940a8"
+        "f455e87a.bb05c8",
+        "dc467c76.6e0b1",
+        "26412110.73f856"
       ]
     ]
   },
   {
-    "id": "b068e9a3.d4db4",
+    "id": "f455e87a.bb05c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4954,
-    "y": 6676,
-    "z": "f8944603.71553",
+    "x": 4990.566665649414,
+    "y": 6686.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "be7eb0d3.672b2"
+        "8ff8217a.525ad8"
       ]
     ]
   },
   {
-    "id": "b79debc6.f268c",
+    "id": "dc467c76.6e0b1",
     "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": 4974.057632446289,
+    "y": 6748.140701293945,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7384abca.e83424"
+        "2b587a1.cfe3f86"
       ]
     ]
   },
   {
-    "id": "599f79e1.6940a8",
+    "id": "26412110.73f856",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4935,
-    "y": 6781,
-    "z": "f8944603.71553",
+    "x": 4971.566665649414,
+    "y": 6791.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5c72f79d.0cafa"
+        "b747b55e.88ecf8"
       ]
     ]
   },
   {
-    "id": "be7eb0d3.672b2",
+    "id": "8ff8217a.525ad8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5110,
-    "y": 6690,
-    "z": "f8944603.71553",
+    "x": 5146.566665649414,
+    "y": 6700.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "477f7936.afbf38"
+        "8429b279.d4cdf"
       ]
     ]
   },
   {
-    "id": "7384abca.e83424",
+    "id": "2b587a1.cfe3f86",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5100.0623779296875,
-    "y": 6737.859771728516,
-    "z": "f8944603.71553",
+    "x": 5136.629043579102,
+    "y": 6748.42643737793,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5c72f79d.0cafa",
+    "id": "b747b55e.88ecf8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5102,
-    "y": 6780,
-    "z": "f8944603.71553",
+    "x": 5138.566665649414,
+    "y": 6790.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "477f7936.afbf38",
+    "id": "8429b279.d4cdf",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5357,
-    "y": 6687,
-    "z": "f8944603.71553",
+    "x": 5393.566665649414,
+    "y": 6697.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8d0d8dd8.5dff18"
+        "1ddbd038.9357b"
       ]
     ]
   },
   {
-    "id": "8d0d8dd8.5dff18",
+    "id": "1ddbd038.9357b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5594,
-    "y": 6683,
-    "z": "f8944603.71553",
+    "x": 5630.566665649414,
+    "y": 6693.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "234239f1.092ec6"
+        "7922b60b.c6e31"
       ]
     ]
   },
   {
-    "id": "af0f93b9.f63018",
+    "id": "e0649c96.67ff88",
     "type": "switchNode",
     "name": "switch vpnuuid is for this slice",
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5837,
-    "y": 6655,
-    "z": "f8944603.71553",
+    "x": 5873.566665649414,
+    "y": 6665.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1906307e.4f6708",
-        "7e26fbb1.9c733c"
+        "6697bde5.6a73ec",
+        "f1cd44ef.865458"
       ]
     ]
   },
   {
-    "id": "1906307e.4f6708",
+    "id": "6697bde5.6a73ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6042,
-    "y": 6675,
-    "z": "f8944603.71553",
+    "x": 6078.566665649414,
+    "y": 6685.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "234239f1.092ec6"
+        "7922b60b.c6e31"
       ]
     ]
   },
   {
-    "id": "7e26fbb1.9c733c",
+    "id": "f1cd44ef.865458",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6041,
-    "y": 6628,
-    "z": "f8944603.71553",
+    "x": 6077.566665649414,
+    "y": 6638.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "234239f1.092ec6",
+    "id": "7922b60b.c6e31",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4785,
-    "y": 6950,
-    "z": "f8944603.71553",
+    "x": 4821.566665649414,
+    "y": 6960.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9c243a63.6beae8"
+        "b0b5d457.a97bd"
       ]
     ]
   },
   {
-    "id": "7d275a16.b90c94",
+    "id": "1fa90257.6a5f2e",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 6246.999969482422,
-    "y": 6887.999969482422,
-    "z": "f8944603.71553",
+    "x": 6283.566635131836,
+    "y": 6898.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "62c83b20.7bb344",
+    "id": "a2de4936.eeff58",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4847,
-    "y": 6626,
-    "z": "f8944603.71553",
+    "x": 4883.566665649414,
+    "y": 6636.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cf9d9601.e8d088",
+    "id": "90bf2cc6.ca2d58",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4729,
-    "y": 6514,
-    "z": "f8944603.71553",
+    "x": 4765.566665649414,
+    "y": 6524.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fb325d12.16a73",
+    "id": "917753a8.ea741",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5074,
-    "y": 6345,
-    "z": "f8944603.71553",
+    "x": 5110.566665649414,
+    "y": 6355.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2ae3447b.0a1c44"
+        "ddf721ac.b7eef8"
       ]
     ]
   },
   {
-    "id": "2ae3447b.0a1c44",
+    "id": "ddf721ac.b7eef8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5294,
-    "y": 6351,
-    "z": "f8944603.71553",
+    "x": 5330.566665649414,
+    "y": 6361.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "47fb23b1.c734fc"
+        "ff49769d.1bd52"
       ]
     ]
   },
   {
-    "id": "47fb23b1.c734fc",
+    "id": "ff49769d.1bd52",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5481,
-    "y": 6311,
-    "z": "f8944603.71553",
+    "x": 5517.566665649414,
+    "y": 6321.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "504a47cd.0300d8"
+        "4e069c0d.3968f4"
       ]
     ]
   },
   {
-    "id": "504a47cd.0300d8",
+    "id": "4e069c0d.3968f4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5673,
-    "y": 6314,
-    "z": "f8944603.71553",
+    "x": 5709.566665649414,
+    "y": 6324.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "70b7cd06.f487e4"
+        "2305c4b2.be932c"
       ]
     ]
   },
   {
-    "id": "70b7cd06.f487e4",
+    "id": "2305c4b2.be932c",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5882,
-    "y": 6312,
-    "z": "f8944603.71553",
+    "x": 5918.566665649414,
+    "y": 6322.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "19e51740.b8f8a1",
+    "id": "c8b3b99a.24ee1",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4781,
-    "y": 6339,
-    "z": "f8944603.71553",
+    "x": 4817.566665649414,
+    "y": 6349.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fb325d12.16a73"
+        "917753a8.ea741"
       ]
     ]
   },
   {
-    "id": "252b791f.9db75e",
+    "id": "bb8d3610.613d68",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4789,
-    "y": 6232,
-    "z": "f8944603.71553",
+    "x": 4825.566665649414,
+    "y": 6242.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ab2e0e9b.e6e2a",
-        "175d6a26.e8f2ae",
-        "30472c6d.7bfeec"
+        "ae57a65a.f0c818",
+        "d5c36a0.e7a9398",
+        "2780984c.5a15a"
       ]
     ]
   },
   {
-    "id": "ab2e0e9b.e6e2a",
+    "id": "ae57a65a.f0c818",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5025,
-    "y": 6215,
-    "z": "f8944603.71553",
+    "x": 5061.566665649414,
+    "y": 6225.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "175d6a26.e8f2ae",
+    "id": "d5c36a0.e7a9398",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5022,
-    "y": 6256,
-    "z": "f8944603.71553",
+    "x": 5058.566665649414,
+    "y": 6266.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "30472c6d.7bfeec",
+    "id": "2780984c.5a15a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5036,
-    "y": 6296,
-    "z": "f8944603.71553",
+    "x": 5072.566665649414,
+    "y": 6306.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "275b22ee.4a806e",
+    "id": "89f249f3.3e5608",
     "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": 4761.566665649414,
+    "y": 6401.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "331c47e0.bff598",
+    "id": "1d656b5f.37186d",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4733,
-    "y": 6449,
-    "z": "f8944603.71553",
+    "x": 4769.566665649414,
+    "y": 6459.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "908326bd.db0de8",
+    "id": "9b687ead.d5262",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4738,
-    "y": 6189,
-    "z": "f8944603.71553",
+    "x": 4774.566665649414,
+    "y": 6199.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8ef1afe7.71ad38",
+    "id": "201d95ad.f7c612",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4853,
-    "y": 6141,
-    "z": "f8944603.71553",
+    "x": 4889.566665649414,
+    "y": 6151.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9c243a63.6beae8",
+    "id": "b0b5d457.a97bd",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5028,
-    "y": 6947,
-    "z": "f8944603.71553",
+    "x": 5064.566665649414,
+    "y": 6957.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "14533561.0c5673",
-        "af779ea0.7fb81"
+        "46f9fbf7.fbe6cc",
+        "bab2d066.0ad5b"
       ]
     ]
   },
   {
-    "id": "14533561.0c5673",
+    "id": "46f9fbf7.fbe6cc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5257,
-    "y": 6924,
-    "z": "f8944603.71553",
+    "x": 5293.566665649414,
+    "y": 6934.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "55635f65.d76ee8"
+        "66be0922.f0399"
       ]
     ]
   },
   {
-    "id": "af779ea0.7fb81",
+    "id": "bab2d066.0ad5b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5257,
-    "y": 6973,
-    "z": "f8944603.71553",
+    "x": 5293.566665649414,
+    "y": 6983.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "494eed0f.99eb84",
+    "id": "646b562c.1751a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5989.999969482422,
-    "y": 6978.999969482422,
-    "z": "f8944603.71553",
+    "x": 6026.566635131836,
+    "y": 6989.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6ed262af.6482c4",
-        "7d275a16.b90c94",
-        "ea085aad.03ece"
+        "898afc0c.eb00d8",
+        "1fa90257.6a5f2e",
+        "9d2bedee.a23cf"
       ]
     ]
   },
   {
-    "id": "eb8bdae2.80aaf8",
+    "id": "5bb30070.2c2c98",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6374.999969482422,
-    "y": 6941.999969482422,
-    "z": "f8944603.71553",
+    "x": 6411.566635131836,
+    "y": 6952.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "ea085aad.03ece",
+    "id": "9d2bedee.a23cf",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\n\n<parameter name='operational-status' value='Modified' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6344.999969482422,
-    "y": 7001.999969482422,
-    "z": "f8944603.71553",
+    "x": 6381.566635131836,
+    "y": 7012.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "6ed262af.6482c4",
+    "id": "898afc0c.eb00d8",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 6251.999969482422,
-    "y": 6829.999969482422,
-    "z": "f8944603.71553",
+    "x": 6288.566635131836,
+    "y": 6840.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b05d129.ef1b1f",
+    "id": "e66ef561.f9598",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3988,
-    "y": 5887,
-    "z": "f8944603.71553",
+    "x": 4024.566665649414,
+    "y": 5897.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "99207b39.65e8d8",
-        "f5cafc97.3be338",
-        "433677c1.52ee48",
-        "fabf4cab.b217e",
-        "7e1b41de.44cf5"
+        "526f34d0.18befc",
+        "fad64a40.999cd8",
+        "1f999717.41db99",
+        "c52167d8.94938",
+        "be5aff94.f7d12"
       ]
     ]
   },
   {
-    "id": "e2f1cfff.a8b258",
+    "id": "55c4563d.130918",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4730,
-    "y": 6289,
-    "z": "f8944603.71553",
+    "x": 4766.566665649414,
+    "y": 6299.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "2ded21f8.219046",
+    "id": "2487bbac.e2018c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4858,
-    "y": 6031,
-    "z": "f8944603.71553",
+    "x": 4894.566665649414,
+    "y": 6041.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a18264c.6d9e",
+    "id": "eef6a242.86b638",
     "type": "comment",
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "comments": "",
-    "x": 4995,
-    "y": 5981,
-    "z": "f8944603.71553",
+    "x": 5031.566665649414,
+    "y": 5991.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "124ab46d.2d752c",
+    "id": "9860b974.593a3",
     "type": "save",
     "name": "save ROOT UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3822,
-    "y": 3374,
-    "z": "f8944603.71553",
+    "x": 3858.566665649414,
+    "y": 3384.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "826efc02.44c7b",
+    "id": "c96fd773.2e2468",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3999.999969482422,
-    "y": 1608.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4036.566635131836,
+    "y": 1619.566635131836,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3746cfac.cfad98",
+    "id": "e5b482c4.4ff96",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3978.9999389648438,
-    "y": 2120.9999389648438,
-    "z": "f8944603.71553",
+    "x": 4015.566604614258,
+    "y": 2131.566604614258,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b5ea3d16.fd41f",
+    "id": "58efc802.973c9",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 3814,
-    "y": 3995,
-    "z": "f8944603.71553",
+    "x": 3850.566665649414,
+    "y": 4005.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9d7f2116.baeda",
+    "id": "517fe5d1.d6143c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3904,
-    "y": 6375,
-    "z": "f8944603.71553",
+    "x": 3940.566665649414,
+    "y": 6385.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f2a7dc4a.68ede",
+    "id": "fa1a129b.8e1e58",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 3706,
-    "y": 4904,
-    "z": "f8944603.71553",
+    "x": 3742.566665649414,
+    "y": 4914.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a789852e.51cd48",
+    "id": "8f8ab353.277fd8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3839,
-    "y": 4952,
-    "z": "f8944603.71553",
+    "x": 3875.566665649414,
+    "y": 4962.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "23762b83.94d65c",
+    "id": "6651db46.728784",
     "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": 4421.566665649414,
+    "y": 4590.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e4f34350.306628",
-        "84eda9bb.13e58"
+        "894780c2.49e69",
+        "859a7332.ec6f6"
       ]
     ]
   },
   {
-    "id": "e4f34350.306628",
+    "id": "894780c2.49e69",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4578,
-    "y": 4581,
-    "z": "f8944603.71553",
+    "x": 4614.566665649414,
+    "y": 4591.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d93f9a59.274b5"
+        "ba88b5a5.1ae688"
       ]
     ]
   },
   {
-    "id": "84eda9bb.13e58",
+    "id": "859a7332.ec6f6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4582,
-    "y": 4625,
-    "z": "f8944603.71553",
+    "x": 4618.566665649414,
+    "y": 4635.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "fa8add54.9c2898"
+        "99dc491a.da7278"
       ]
     ]
   },
   {
-    "id": "fa8add54.9c2898",
+    "id": "99dc491a.da7278",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4721,
-    "y": 4620,
-    "z": "f8944603.71553",
+    "x": 4757.566665649414,
+    "y": 4630.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "48346123.4f10a8",
-        "5e210590.033b4c",
-        "140ccb32.dd72dd"
+        "8cf9ac68.b6fb08",
+        "b04660b8.eae2",
+        "fb45e770.b6fb4"
       ]
     ]
   },
   {
-    "id": "d93f9a59.274b5",
+    "id": "ba88b5a5.1ae688",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4721,
-    "y": 4577,
-    "z": "f8944603.71553",
+    "x": 4757.566665649414,
+    "y": 4587.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a4406b4c.17bbc",
-        "18ca4a3.634f536",
-        "b4f57662.21d798",
-        "540d81b.ac8608"
+        "c30363c7.dd0dc",
+        "10271018.94b4f8",
+        "285754a8.44159c",
+        "3647078f.866d7"
       ]
     ]
   },
   {
-    "id": "48346123.4f10a8",
+    "id": "8cf9ac68.b6fb08",
     "type": "set",
     "name": "set prop.connectivity-domainA-uuid",
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5123.000244140625,
-    "y": 4842,
-    "z": "f8944603.71553",
+    "x": 5159.566909790039,
+    "y": 4852.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "54a11c60.7fd1ec",
+    "id": "f52716f7.92c318",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5130.000244140625,
-    "y": 4796,
-    "z": "f8944603.71553",
+    "x": 5166.566909790039,
+    "y": 4806.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a0a762d0.469c28",
+    "id": "203e33ee.d272e4",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4920,
-    "y": 6575,
-    "z": "f8944603.71553",
+    "x": 4956.566665649414,
+    "y": 6585.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "5e210590.033b4c",
+    "id": "b04660b8.eae2",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5241.000244140625,
-    "y": 4884,
-    "z": "f8944603.71553",
+    "x": 5277.566909790039,
+    "y": 4894.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "259aff1b.d97a1",
+    "id": "3aab431e.930194",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5116,
-    "y": 5142,
-    "z": "f8944603.71553",
+    "x": 5152.566665649414,
+    "y": 5152.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "80314ddc.393748",
+    "id": "b6e6466d.f535c8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3461,
-    "y": 4475,
-    "z": "f8944603.71553",
+    "x": 3497.566665649414,
+    "y": 4485.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d1326c21.abc33",
+    "id": "eb0222bd.49b5a",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3983,
-    "y": 4576,
-    "z": "f8944603.71553",
+    "x": 4019.566665649414,
+    "y": 4586.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "434bd8c2.bae4f8",
+    "id": "e967635e.d5f898",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3440,
-    "y": 4519,
-    "z": "f8944603.71553",
+    "x": 3476.566665649414,
+    "y": 4529.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7ea7dff4.93abc",
-        "616c8d40.285e14",
-        "ffe0a536.7eaff8"
+        "a0645295.c076d8",
+        "9cfd1461.a062b8",
+        "c3fd0eeb.1191a"
       ]
     ]
   },
   {
-    "id": "616c8d40.285e14",
+    "id": "9cfd1461.a062b8",
     "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": 3665.057632446289,
+    "y": 4498.140884399414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "739b53.f4a4fcac"
+        "763a574e.7131"
       ]
     ]
   },
   {
-    "id": "ffe0a536.7eaff8",
+    "id": "c3fd0eeb.1191a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3617,
-    "y": 4527,
-    "z": "f8944603.71553",
+    "x": 3653.566665649414,
+    "y": 4537.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "68d1064e.ebb3b8"
+        "64809ae2.7e048c"
       ]
     ]
   },
   {
-    "id": "739b53.f4a4fcac",
+    "id": "763a574e.7131",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3788.0625,
-    "y": 4485.85986328125,
-    "z": "f8944603.71553",
+    "x": 3824.629165649414,
+    "y": 4496.426528930664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "68d1064e.ebb3b8",
+    "id": "64809ae2.7e048c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3778,
-    "y": 4528,
-    "z": "f8944603.71553",
+    "x": 3814.566665649414,
+    "y": 4538.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "aedbd8f5.94f11",
+    "id": "9a196ab1.500e98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3780,
-    "y": 4572,
-    "z": "f8944603.71553",
+    "x": 3816.566665649414,
+    "y": 4582.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "530f885c.d5a28",
-        "d1326c21.abc33"
+        "6eb0cd28.22b8f4",
+        "eb0222bd.49b5a"
       ]
     ]
   },
   {
-    "id": "7ea7dff4.93abc",
+    "id": "a0645295.c076d8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3622,
-    "y": 4564,
-    "z": "f8944603.71553",
+    "x": 3658.566665649414,
+    "y": 4574.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "aedbd8f5.94f11"
+        "9a196ab1.500e98"
       ]
     ]
   },
   {
-    "id": "530f885c.d5a28",
+    "id": "6eb0cd28.22b8f4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3941,
-    "y": 4504,
-    "z": "f8944603.71553",
+    "x": 3977.566665649414,
+    "y": 4514.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cd1fc06c.124968",
+    "id": "a7e951fd.34174",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $middle-man-conn.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$middle-man-conn.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3806,
-    "y": 4843,
-    "z": "f8944603.71553",
+    "x": 3842.566665649414,
+    "y": 4853.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ac8fc812.ca8b88",
+    "id": "a3ce23a7.48a0c8",
     "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": 5957.449966430664,
+    "y": 6603.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "140ccb32.dd72dd",
+    "id": "fb45e770.b6fb4",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5120.667236328125,
-    "y": 4980.08349609375,
-    "z": "f8944603.71553",
+    "x": 5157.233901977539,
+    "y": 4990.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "60fccea7.c83a28",
+    "id": "7a5a11e8.fe41c8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5122.884033203125,
-    "y": 4939.88330078125,
-    "z": "f8944603.71553",
+    "x": 5159.450698852539,
+    "y": 4950.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b61f1c95.4694d",
+    "id": "c5e59db3.c67ea",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4996.6669921875,
-    "y": 5230.08349609375,
-    "z": "f8944603.71553",
+    "x": 5033.233657836914,
+    "y": 5240.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "82a40a13.767da8",
+    "id": "57dbe634.714a18",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4998.8837890625,
-    "y": 5189.88330078125,
-    "z": "f8944603.71553",
+    "x": 5035.450454711914,
+    "y": 5200.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "91bd4596.74f628",
+    "id": "aa096a62.a00c18",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5086.466796875,
-    "y": 5592.5166015625,
-    "z": "f8944603.71553",
+    "x": 5123.033462524414,
+    "y": 5603.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f50c2a2e.93dfe8",
+    "id": "a1684c9.099dc3",
     "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": 4950.033462524414,
+    "y": 5660.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8646fa93.554c38",
-        "a6ded94a.e3e54"
+        "322ec37b.7f462c",
+        "a4688844.be2738"
       ]
     ]
   },
   {
-    "id": "8646fa93.554c38",
+    "id": "322ec37b.7f462c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5124.466796875,
-    "y": 5649.5166015625,
-    "z": "f8944603.71553",
+    "x": 5161.033462524414,
+    "y": 5660.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "258b63bd.85fb7c"
+        "32e06877.2a572"
       ]
     ]
   },
   {
-    "id": "a6ded94a.e3e54",
+    "id": "a4688844.be2738",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5120.466796875,
-    "y": 5697.5166015625,
-    "z": "f8944603.71553",
+    "x": 5157.033462524414,
+    "y": 5708.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d925f9fa.8153b8"
+        "748c1810.be501"
       ]
     ]
   },
   {
-    "id": "258b63bd.85fb7c",
+    "id": "32e06877.2a572",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5280.466796875,
-    "y": 5645.5166015625,
-    "z": "f8944603.71553",
+    "x": 5317.033462524414,
+    "y": 5656.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8d6cf51e.6059f8",
-        "44488697.cdb02",
-        "c9ce352b.46ce88"
+        "c380fc3b.e6c15",
+        "4e971f2e.5d2078",
+        "7fabceea.e8bd9"
       ]
     ]
   },
   {
-    "id": "d925f9fa.8153b8",
+    "id": "748c1810.be501",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 5268.466796875,
-    "y": 5692.5166015625,
-    "z": "f8944603.71553",
+    "x": 5305.033462524414,
+    "y": 5703.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "df7464c9.77f0d",
+    "id": "bf0ec53.d08f2b8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5590.3505859375,
-    "y": 5746.39990234375,
-    "z": "f8944603.71553",
+    "x": 5626.917251586914,
+    "y": 5756.966567993164,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c9ce352b.46ce88",
+    "id": "7fabceea.e8bd9",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5594.1337890625,
-    "y": 5784.60009765625,
-    "z": "f8944603.71553",
+    "x": 5630.700454711914,
+    "y": 5795.166763305664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "44488697.cdb02",
+    "id": "4e971f2e.5d2078",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5700.466796875,
-    "y": 5697.5166015625,
-    "z": "f8944603.71553",
+    "x": 5737.033462524414,
+    "y": 5708.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "8d6cf51e.6059f8",
+    "id": "c380fc3b.e6c15",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5584.466796875,
-    "y": 5645.5166015625,
-    "z": "f8944603.71553",
+    "x": 5621.033462524414,
+    "y": 5656.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7e224339.ebcda4",
+    "id": "ddfb9582.3445a8",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4975.466796875,
-    "y": 5550.5166015625,
-    "z": "f8944603.71553",
+    "x": 5012.033462524414,
+    "y": 5561.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "60c16c76.a98d34",
+    "id": "3c1017d1.449bb",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4687.7998046875,
-    "y": 5725.5166015625,
-    "z": "f8944603.71553",
+    "x": 4724.366470336914,
+    "y": 5736.083267211914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "91bd4596.74f628",
-        "f50c2a2e.93dfe8",
-        "b08c7802.5d204",
-        "7492e58a.da53dc"
+        "aa096a62.a00c18",
+        "a1684c9.099dc3",
+        "a4cbceb2.4df788",
+        "9c03eaae.aa875"
       ]
     ]
   },
   {
-    "id": "8396080f.a7f6c8",
+    "id": "21e17170.9d1c4e",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 4987.8330078125,
-    "y": 6086.2001953125,
-    "z": "f8944603.71553",
+    "x": 5024.399673461914,
+    "y": 6096.766860961914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e07ba4bc.bfaae8",
+    "id": "bfe53aa3.d585a8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5794.116668701172,
-    "y": 6923.116668701172,
-    "z": "f8944603.71553",
+    "x": 5830.683334350586,
+    "y": 6933.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "55635f65.d76ee8",
+    "id": "66be0922.f0399",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5413.116668701172,
-    "y": 6926.116668701172,
-    "z": "f8944603.71553",
+    "x": 5449.683334350586,
+    "y": 6936.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e07ba4bc.bfaae8",
-        "d0282e45.27576",
-        "be279863.754a6"
+        "bfe53aa3.d585a8",
+        "f8b29486.7e71d",
+        "bf54edf8.ad3758"
       ]
     ]
   },
   {
-    "id": "d0282e45.27576",
+    "id": "f8b29486.7e71d",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5639.116668701172,
-    "y": 6978.116668701172,
-    "z": "f8944603.71553",
+    "x": 5675.683334350586,
+    "y": 6988.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "adb0d898.09cba8"
+        "45d6980.5fa0ee8"
       ]
     ]
   },
   {
-    "id": "adb0d898.09cba8",
+    "id": "45d6980.5fa0ee8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5818.116668701172,
-    "y": 6977.116668701172,
-    "z": "f8944603.71553",
+    "x": 5854.683334350586,
+    "y": 6987.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "494eed0f.99eb84"
+        "646b562c.1751a8"
       ]
     ]
   },
   {
-    "id": "be279863.754a6",
+    "id": "bf54edf8.ad3758",
     "type": "set",
     "name": "set vpnNameToSearch",
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
     "comments": "",
-    "x": 5640.116668701172,
-    "y": 6871.116668701172,
-    "z": "f8944603.71553",
+    "x": 5676.683334350586,
+    "y": 6881.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3cd9264c.3cdbea",
+    "id": "7c0aae65.c25f7",
     "type": "notify",
     "name": "notify",
     "xml": "<notify plugin='' resource='' action='' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2634.116668701172,
-    "y": 920.1166687011719,
-    "z": "f8944603.71553",
+    "x": 2670.683334350586,
+    "y": 930.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d4db1de6.243c9",
+    "id": "c9e93381.966988",
     "type": "set",
     "name": "set network-route-three",
     "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",
     "comments": "",
-    "x": 3312.116668701172,
-    "y": 696.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3348.683334350586,
+    "y": 706.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b2eea3d4.d83b2",
+    "id": "18d11d50.cb3a7b",
     "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": 3564.683334350586,
+    "y": 1034.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c92a9c74.6d8cb",
+    "id": "e2e500c.35b568",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3523.625732421875,
-    "y": 1066.542724609375,
-    "z": "f8944603.71553",
+    "x": 3560.192398071289,
+    "y": 1077.109390258789,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "be6d3c2.c1bdfc",
+    "id": "ac92425e.1b5228",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3527.625701904297,
-    "y": 1114.5426940917969,
-    "z": "f8944603.71553",
+    "x": 3564.192367553711,
+    "y": 1125.109359741211,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "82044de7.824378"
+        "74bd1e76.c1a798"
       ]
     ]
   },
   {
-    "id": "82044de7.824378",
+    "id": "74bd1e76.c1a798",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3685.116668701172,
-    "y": 1114.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3721.683334350586,
+    "y": 1124.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9732d3c5.76e0c8"
+        "75cda54f.508c54"
       ]
     ]
   },
   {
-    "id": "9732d3c5.76e0c8",
+    "id": "75cda54f.508c54",
     "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": 3891.683364868164,
+    "y": 1127.6834869384766,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7d1d73b.5c3fc8c",
-        "8cd6f95a.d7c4d",
-        "68098f91.a64618"
+        "b5759425.3c5bd",
+        "a5689d25.4480b8",
+        "32c4f78e.6013e8"
       ]
     ]
   },
   {
-    "id": "7d1d73b.5c3fc8c",
+    "id": "b5759425.3c5bd",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4029.116668701172,
-    "y": 1055.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4065.683334350586,
+    "y": 1065.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a9479bec.894888"
+        "e254226b.74faf"
       ]
     ]
   },
   {
-    "id": "8cd6f95a.d7c4d",
+    "id": "a5689d25.4480b8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4031.116668701172,
-    "y": 1109.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4067.683334350586,
+    "y": 1119.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d844935e.741748"
+        "b214dc3a.ed1eb8"
       ]
     ]
   },
   {
-    "id": "a9479bec.894888",
+    "id": "e254226b.74faf",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4157.116668701172,
-    "y": 1055.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4193.683334350586,
+    "y": 1065.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7a232bae.539a2c",
-        "19f7263a.0f2e72"
+        "1e63a796.08e87",
+        "c1790587.ac9f08"
       ]
     ]
   },
   {
-    "id": "d844935e.741748",
+    "id": "b214dc3a.ed1eb8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4160.116668701172,
-    "y": 1108.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4196.683334350586,
+    "y": 1118.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e31191f4.c7e44",
-        "c783c2e3.52d62"
+        "ea9630d6.e1db68",
+        "7cd0ca92.870d14"
       ]
     ]
   },
   {
-    "id": "19f7263a.0f2e72",
+    "id": "c1790587.ac9f08",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4318.116668701172,
-    "y": 1079.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4354.683334350586,
+    "y": 1089.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e31191f4.c7e44",
+    "id": "ea9630d6.e1db68",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4335.116668701172,
-    "y": 1121.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4371.683334350586,
+    "y": 1131.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "c783c2e3.52d62",
+    "id": "7cd0ca92.870d14",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4320.116668701172,
-    "y": 1159.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4356.683334350586,
+    "y": 1169.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7a232bae.539a2c",
+    "id": "1e63a796.08e87",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4332.116668701172,
-    "y": 1039.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4368.683334350586,
+    "y": 1049.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5dbb2ad5.55ee04",
+    "id": "5b64a8f4.eea95",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4497.116668701172,
-    "y": 1055.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4533.683334350586,
+    "y": 1065.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4c9f1a43.e137e4",
+    "id": "5fc9799.82ba788",
     "type": "save",
     "name": "get network-route-three from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
     "comments": "",
     "outputs": 1,
-    "x": 3288.116668701172,
-    "y": 1041.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3324.683334350586,
+    "y": 1051.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b2eea3d4.d83b2",
-        "c92a9c74.6d8cb",
-        "be6d3c2.c1bdfc"
+        "18d11d50.cb3a7b",
+        "e2e500c.35b568",
+        "ac92425e.1b5228"
       ]
     ]
   },
   {
-    "id": "68098f91.a64618",
+    "id": "32c4f78e.6013e8",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3974.116668701172,
-    "y": 1173.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4010.683334350586,
+    "y": 1183.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "3baeb12d.78947e"
+        "e8d5048b.eb9908"
       ]
     ]
   },
   {
-    "id": "3baeb12d.78947e",
+    "id": "e8d5048b.eb9908",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4148.116668701172,
-    "y": 1168.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4184.683334350586,
+    "y": 1178.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f32a06d7.18ee6",
-        "9c8c5f6f.4f4828"
+        "cbdde789.933e38",
+        "ff9c265d.ccb66"
       ]
     ]
   },
   {
-    "id": "9c8c5f6f.4f4828",
+    "id": "ff9c265d.ccb66",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4318.116668701172,
-    "y": 1241.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4354.683334350586,
+    "y": 1251.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f32a06d7.18ee6",
+    "id": "cbdde789.933e38",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4372.116668701172,
-    "y": 1201.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4408.683334350586,
+    "y": 1211.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "89b3411b.fe2cb",
+    "id": "fa28f519.9b734",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4486.116668701172,
-    "y": 1226.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4522.683334350586,
+    "y": 1236.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "fe4b773c.0eae98",
+    "id": "65095290.735c7c",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4045.116668701172,
-    "y": 929.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4081.683334350586,
+    "y": 939.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a6d4107d.6655f"
+        "6a27287d.2ebf6"
       ]
     ]
   },
   {
-    "id": "e8ae3a08.56b988",
+    "id": "d7809ac8.28364",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4389.116668701172,
-    "y": 997.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4425.683334350586,
+    "y": 1007.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "8ecb2104.b1fc58",
+    "id": "38b369ba.8d91fe",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4443.116668701172,
-    "y": 957.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4479.683334350586,
+    "y": 967.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a817660e.e9d2",
+    "id": "7d1c2c8b.bd9814",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4587.116668701172,
-    "y": 986.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4623.683334350586,
+    "y": 996.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a6d4107d.6655f",
+    "id": "6a27287d.2ebf6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4219.116668701172,
-    "y": 924.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4255.683334350586,
+    "y": 934.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8ecb2104.b1fc58",
-        "e8ae3a08.56b988"
+        "38b369ba.8d91fe",
+        "d7809ac8.28364"
       ]
     ]
   },
   {
-    "id": "83ce05e.7f315f8",
+    "id": "b03ebc69.8e68d8",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4105.116668701172,
-    "y": 667.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4141.683334350586,
+    "y": 677.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d03cb873.c57328"
+        "e58f35e3.4b6a2"
       ]
     ]
   },
   {
-    "id": "2049e56d.3172ca",
+    "id": "6a2c136e.692edc",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4449.116668701172,
-    "y": 735.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4485.683334350586,
+    "y": 745.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6995e48e.171b9c",
+    "id": "66ae94b1.018af4",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4503.116668701172,
-    "y": 695.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4539.683334350586,
+    "y": 705.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "80fe4b30.9273d",
+    "id": "33be367d.fbce62",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4617.116668701172,
-    "y": 720.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4653.683334350586,
+    "y": 730.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d03cb873.c57328",
+    "id": "e58f35e3.4b6a2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4279.116668701172,
-    "y": 662.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4315.683334350586,
+    "y": 672.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6995e48e.171b9c",
-        "2049e56d.3172ca"
+        "66ae94b1.018af4",
+        "6a2c136e.692edc"
       ]
     ]
   },
   {
-    "id": "d8eb368d.7e35e8",
+    "id": "64cdb464.83135c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3686.116668701172,
-    "y": 2544.116668701172,
-    "z": "f8944603.71553",
+    "x": 3722.683334350586,
+    "y": 2554.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9d31c4f.62b63b8",
-        "42d540.6e2552c"
+        "7a3829d.42a01d8",
+        "d03e5e53.5cee58"
       ]
     ]
   },
   {
-    "id": "4acebe87.51a2e",
+    "id": "6e42edd4.58cd0c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3513.450164794922,
-    "y": 2545.116668701172,
-    "z": "f8944603.71553",
+    "x": 3550.016830444336,
+    "y": 2555.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d8eb368d.7e35e8"
+        "64cdb464.83135c"
       ]
     ]
   },
   {
-    "id": "faf79ca9.39c718",
+    "id": "b61e07a3.0e4238",
     "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": 3559.507797241211,
+    "y": 2598.257369995117,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "760b8826.a76aa",
+    "id": "2df3a08e.41f4c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3511.450164794922,
-    "y": 2634.116668701172,
-    "z": "f8944603.71553",
+    "x": 3548.016830444336,
+    "y": 2644.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d31c4f.62b63b8",
+    "id": "7a3829d.42a01d8",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3972.450164794922,
-    "y": 2548.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4009.016830444336,
+    "y": 2558.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "beea1414.622ca8",
-        "e0900c85.f5153"
+        "38c64779.e618f",
+        "14f81708.27e459"
       ]
     ]
   },
   {
-    "id": "e0900c85.f5153",
+    "id": "14f81708.27e459",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4195.450164794922,
-    "y": 2503.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4232.016830444336,
+    "y": 2513.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b1fce547.cdefa8"
+        "2753f3be.c9c924"
       ]
     ]
   },
   {
-    "id": "beea1414.622ca8",
+    "id": "38c64779.e618f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4197.450164794922,
-    "y": 2567.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4234.016830444336,
+    "y": 2577.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1f2077c9.d2f12"
+        "43ad3093.31a088"
       ]
     ]
   },
   {
-    "id": "1931dff5.72d728",
+    "id": "9fbb56ee.c43378",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3285.450164794922,
-    "y": 2580.116668701172,
-    "z": "f8944603.71553",
+    "x": 3322.016830444336,
+    "y": 2590.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4acebe87.51a2e",
-        "faf79ca9.39c718",
-        "760b8826.a76aa"
+        "6e42edd4.58cd0c",
+        "b61e07a3.0e4238",
+        "2df3a08e.41f4c"
       ]
     ]
   },
   {
-    "id": "20a2805c.f7ce68",
+    "id": "ac1718b4.765b78",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3246.450164794922,
-    "y": 2524.116668701172,
-    "z": "f8944603.71553",
+    "x": 3283.016830444336,
+    "y": 2534.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "f953800.9cf34",
+    "id": "7ebd6769.0b5428",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3305.450164794922,
-    "y": 2320.116668701172,
-    "z": "f8944603.71553",
+    "x": 3342.016830444336,
+    "y": 2330.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "1523d633.28a802",
-        "23587c7d.fbba4c"
+        "2f0a58a8.ee7038",
+        "79cdcb97.546894"
       ]
     ]
   },
   {
-    "id": "23587c7d.fbba4c",
+    "id": "79cdcb97.546894",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3528.450164794922,
-    "y": 2306.116668701172,
-    "z": "f8944603.71553",
+    "x": 3565.016830444336,
+    "y": 2316.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c7b4b7e7.8e8b78"
+        "49eedb67.f00374"
       ]
     ]
   },
   {
-    "id": "1523d633.28a802",
+    "id": "2f0a58a8.ee7038",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3530.450164794922,
-    "y": 2339.116668701172,
-    "z": "f8944603.71553",
+    "x": 3567.016830444336,
+    "y": 2349.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7b4b7e7.8e8b78",
+    "id": "49eedb67.f00374",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3676.450164794922,
-    "y": 2299.116668701172,
-    "z": "f8944603.71553",
+    "x": 3713.016830444336,
+    "y": 2309.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cb965cfe.67a2f",
-        "1a7add8d.af97ca"
+        "f5d93681.391ea",
+        "66937670.413898"
       ]
     ]
   },
   {
-    "id": "cb965cfe.67a2f",
+    "id": "f5d93681.391ea",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3870.450164794922,
-    "y": 2302.1167907714844,
-    "z": "f8944603.71553",
+    "x": 3907.016830444336,
+    "y": 2312.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "42d540.6e2552c",
+    "id": "d03e5e53.5cee58",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3923.4501342773438,
-    "y": 2671.1166381835938,
-    "z": "f8944603.71553",
+    "x": 3960.016799926758,
+    "y": 2681.683303833008,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b84e7511.3844a8"
+        "1dfcba6a.928896"
       ]
     ]
   },
   {
-    "id": "b84e7511.3844a8",
+    "id": "1dfcba6a.928896",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4129.450134277344,
-    "y": 2671.1166381835938,
-    "z": "f8944603.71553",
+    "x": 4166.016799926758,
+    "y": 2681.683303833008,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ac19c527.29aaf8"
+        "ad7b62a1.1a3de8"
       ]
     ]
   },
   {
-    "id": "1a7add8d.af97ca",
+    "id": "66937670.413898",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3892.450164794922,
-    "y": 2370.1167907714844,
-    "z": "f8944603.71553",
+    "x": 3929.016830444336,
+    "y": 2380.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "c6c93f82.1aa228",
-        "f4da497f.0275c8",
-        "6e9758a5.eabec"
+        "7e1c1529.6f1464",
+        "e1251115.be77b",
+        "d084db0e.513758"
       ]
     ]
   },
   {
-    "id": "c6c93f82.1aa228",
+    "id": "7e1c1529.6f1464",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4087.9502868652344,
-    "y": 2322.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4124.516952514648,
+    "y": 2332.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a1f1dc1c.4be4e8"
+        "24a5d36d.06630c"
       ]
     ]
   },
   {
-    "id": "f4da497f.0275c8",
+    "id": "e1251115.be77b",
     "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": 4116.516952514648,
+    "y": 2387.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "dd2530b3.0ce388"
+        "e4759099.9196a"
       ]
     ]
   },
   {
-    "id": "6e9758a5.eabec",
+    "id": "d084db0e.513758",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4084.9502868652344,
-    "y": 2434.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4121.516952514648,
+    "y": 2444.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "35cb1b46.9ab3ac"
+        "68e5ccfb.96ac94"
       ]
     ]
   },
   {
-    "id": "35cb1b46.9ab3ac",
+    "id": "68e5ccfb.96ac94",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4236.950286865234,
-    "y": 2435.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4273.516952514648,
+    "y": 2445.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a1f1dc1c.4be4e8",
+    "id": "24a5d36d.06630c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4232.332611083984,
-    "y": 2319.7724609375,
-    "z": "f8944603.71553",
+    "x": 4268.899276733398,
+    "y": 2330.339126586914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "807e8aa5.b5f288"
+        "b2ff1ea.8d4406"
       ]
     ]
   },
   {
-    "id": "be1fed24.75522",
+    "id": "387e5bde.fd50e4",
     "type": "set",
     "name": "set SECONDARY-ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
     "comments": "",
-    "x": 3308.116668701172,
-    "y": 2659.116668701172,
-    "z": "f8944603.71553",
+    "x": 3344.683334350586,
+    "y": 2669.683334350586,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "89002347.f12fb8",
+    "id": "4cfd3be4.f62fcc",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3983.1166381835938,
-    "y": 2623.1166381835938,
-    "z": "f8944603.71553",
+    "x": 4019.683303833008,
+    "y": 2633.683303833008,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "1f2077c9.d2f12",
+    "id": "43ad3093.31a088",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4356.450164794922,
-    "y": 2586.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4393.016830444336,
+    "y": 2596.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b1fce547.cdefa8",
+    "id": "2753f3be.c9c924",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4360.450164794922,
-    "y": 2500.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4397.016830444336,
+    "y": 2510.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9ddcbad2.3cd968",
-        "a4909c74.16b3c"
+        "a6bf1231.b0b2f8",
+        "b6449bb5.90e018"
       ]
     ]
   },
   {
-    "id": "ac19c527.29aaf8",
+    "id": "ad7b62a1.1a3de8",
     "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": 4383.302444458008,
+    "y": 2680.505081176758,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "aecc45b1.07799"
+        "e5d22111.f520c"
       ]
     ]
   },
   {
-    "id": "dd2530b3.0ce388",
+    "id": "e4759099.9196a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4247.950286865234,
-    "y": 2380.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4284.516952514648,
+    "y": 2390.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "9ddcbad2.3cd968",
+    "id": "a6bf1231.b0b2f8",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
     "comments": "",
-    "x": 4530.450164794922,
-    "y": 2461.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4567.016830444336,
+    "y": 2471.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a4909c74.16b3c",
+    "id": "b6449bb5.90e018",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
     "comments": "",
-    "x": 4531.450164794922,
-    "y": 2566.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4568.016830444336,
+    "y": 2576.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "90f369e0.1f5ea",
+    "id": "2544beb5.524cf2",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4526.450164794922,
-    "y": 2515.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4563.016830444336,
+    "y": 2525.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "aecc45b1.07799",
+    "id": "e5d22111.f520c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4553.567321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4590.133987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d7d46b6.f157298",
-        "a76ccf28.3b019",
-        "6d38c2ba.e73f94"
+        "387e5354.258eec",
+        "d91f6407.9298c8",
+        "8a12363d.8f67b8"
       ]
     ]
   },
   {
-    "id": "d7d46b6.f157298",
+    "id": "387e5354.258eec",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4768.567321777344,
-    "y": 2621.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4805.133987426758,
+    "y": 2632.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a76ccf28.3b019",
+    "id": "d91f6407.9298c8",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4765.567321777344,
-    "y": 2660.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4802.133987426758,
+    "y": 2671.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "af66a72d.a68048"
+        "824c0ca3.93f64"
       ]
     ]
   },
   {
-    "id": "6d38c2ba.e73f94",
+    "id": "8a12363d.8f67b8",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4721.067321777344,
-    "y": 2702.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4757.633987426758,
+    "y": 2713.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "56aae750.4bf18",
+    "id": "b23c99bf.cf2e8",
     "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": 4851.016830444336,
+    "y": 2348.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "df2c6ab5.f8c7a"
+        "97206b42.8c742"
       ]
     ]
   },
   {
-    "id": "807e8aa5.b5f288",
+    "id": "b2ff1ea.8d4406",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4416.450164794922,
-    "y": 2334.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4453.016830444336,
+    "y": 2344.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "83815f42.db62e8"
+        "3bc9e41b.32e2f4"
       ]
     ]
   },
   {
-    "id": "83815f42.db62e8",
+    "id": "3bc9e41b.32e2f4",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4611.450164794922,
-    "y": 2334.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4648.016830444336,
+    "y": 2344.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "56aae750.4bf18",
-        "ace3955f.b78118"
+        "b23c99bf.cf2e8",
+        "c333a868.fb119"
       ]
     ]
   },
   {
-    "id": "ace3955f.b78118",
+    "id": "c333a868.fb119",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4816.450164794922,
-    "y": 2411.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4853.016830444336,
+    "y": 2421.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "86fe5017.1c8158"
+        "bd453b0b.71f93"
       ]
     ]
   },
   {
-    "id": "af66a72d.a68048",
+    "id": "824c0ca3.93f64",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4946.067321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4982.633987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "73b98dcb.d53e2c"
+        "95206ee6.94dd"
       ]
     ]
   },
   {
-    "id": "73b98dcb.d53e2c",
+    "id": "95206ee6.94dd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5104.067321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 5140.633987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "35f64a50.ea71a6"
+        "a1087d28.90e2f"
       ]
     ]
   },
   {
-    "id": "35f64a50.ea71a6",
+    "id": "a1087d28.90e2f",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5311.067321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 5347.633987426758,
+    "y": 2670.0237579345703,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "df2c6ab5.f8c7a",
+    "id": "97206b42.8c742",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4991.450164794922,
-    "y": 2330.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5028.016830444336,
+    "y": 2340.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "b41095a1.9dd71",
-        "c294b821.4082d"
+        "4cfed3d4.2e715c",
+        "b3c82e8a.c152c"
       ]
     ]
   },
   {
-    "id": "c294b821.4082d",
+    "id": "b3c82e8a.c152c",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5199.450164794922,
-    "y": 2337.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5236.016830444336,
+    "y": 2347.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cbd53666.7a192",
-        "70f8105c.8c53c8",
-        "d07f4c5c.e57d28"
+        "c3765dd7.98e19",
+        "82480139.31c848",
+        "da19380a.5cc67"
       ]
     ]
   },
   {
-    "id": "86fe5017.1c8158",
+    "id": "bd453b0b.71f93",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4993.450164794922,
-    "y": 2403.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5030.016830444336,
+    "y": 2413.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "29792fa0.312a5"
+        "14471967.2bb00f"
       ]
     ]
   },
   {
-    "id": "b41095a1.9dd71",
+    "id": "4cfed3d4.2e715c",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainC id",
     "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5229.450164794922,
-    "y": 2285.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5266.016830444336,
+    "y": 2295.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "29792fa0.312a5",
+    "id": "14471967.2bb00f",
     "type": "set",
     "name": "set domainC ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5228.450164794922,
-    "y": 2527.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5265.016830444336,
+    "y": 2537.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cbd53666.7a192",
+    "id": "c3765dd7.98e19",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5409.450164794922,
-    "y": 2328.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5446.016830444336,
+    "y": 2338.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "12fe1a85.5f5265"
+        "eb76aab.05915d8"
       ]
     ]
   },
   {
-    "id": "70f8105c.8c53c8",
+    "id": "82480139.31c848",
     "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": 5438.016830444336,
+    "y": 2393.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "720591da.7ff908"
+        "3c8ef50f.dc9d5a"
       ]
     ]
   },
   {
-    "id": "d07f4c5c.e57d28",
+    "id": "da19380a.5cc67",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5406.450164794922,
-    "y": 2440.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5443.016830444336,
+    "y": 2450.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "50fd00db.804e78"
+        "11ed4dc4.069aca"
       ]
     ]
   },
   {
-    "id": "50fd00db.804e78",
+    "id": "11ed4dc4.069aca",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5558.450164794922,
-    "y": 2441.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5595.016830444336,
+    "y": 2451.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "720591da.7ff908",
+    "id": "3c8ef50f.dc9d5a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5569.450164794922,
-    "y": 2386.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5606.016830444336,
+    "y": 2396.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "12fe1a85.5f5265",
+    "id": "eb76aab.05915d8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5553.832489013672,
-    "y": 2325.7724609375,
-    "z": "f8944603.71553",
+    "x": 5590.399154663086,
+    "y": 2336.339126586914,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d4fbd78f.a8b058"
+        "57675f66.16eb5"
       ]
     ]
   },
   {
-    "id": "d4fbd78f.a8b058",
+    "id": "57675f66.16eb5",
     "type": "set",
     "name": "set controller domainC data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5768.450164794922,
-    "y": 2322.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5805.016830444336,
+    "y": 2332.6834564208984,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "3ab03c8.bdf8544",
+    "id": "a78822a6.5321b",
     "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": 3318.683334350586,
+    "y": 805.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7806cbe6.64ea14",
-        "91bd4861.b38048"
+        "ee3317c4.be6f98",
+        "785558d0.46aa7"
       ]
     ]
   },
   {
-    "id": "7806cbe6.64ea14",
+    "id": "ee3317c4.be6f98",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3404.11669921875,
-    "y": 740.11669921875,
-    "z": "f8944603.71553",
+    "x": 3440.683364868164,
+    "y": 750.6833648681641,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4d1b7d4.397bf04"
+        "b70329ff.3ba71"
       ]
     ]
   },
   {
-    "id": "91bd4861.b38048",
+    "id": "785558d0.46aa7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3391.11669921875,
-    "y": 849.11669921875,
-    "z": "f8944603.71553",
+    "x": 3427.683364868164,
+    "y": 859.6833648681641,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "a8d8fc87.45b9a"
+        "e7d34a7a.6aac6"
       ]
     ]
   },
   {
-    "id": "4d1b7d4.397bf04",
+    "id": "b70329ff.3ba71",
     "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": 3655.683334350586,
+    "y": 587.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "a8d8fc87.45b9a",
+    "id": "e7d34a7a.6aac6",
     "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": 3651.683334350586,
+    "y": 631.6833343505859,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "87dcb71b.a618f",
+    "id": "3cc87f7.3864a",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3812.11669921875,
-    "y": 3521.11669921875,
-    "z": "f8944603.71553",
+    "x": 3848.683364868164,
+    "y": 3531.683364868164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9a1c6f33.80c0c"
+        "f7171cc6.827928"
       ]
     ]
   },
   {
-    "id": "9a1c6f33.80c0c",
+    "id": "f7171cc6.827928",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4003.11669921875,
-    "y": 3525.11669921875,
-    "z": "f8944603.71553",
+    "x": 4039.683364868164,
+    "y": 3535.683364868164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8de09ee3.1f82b8"
+        "27271b87.886184"
       ]
     ]
   },
   {
-    "id": "8de09ee3.1f82b8",
+    "id": "27271b87.886184",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4130.11669921875,
-    "y": 3524.11669921875,
-    "z": "f8944603.71553",
+    "x": 4166.683364868164,
+    "y": 3534.683364868164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cc59ae49.952b8",
-        "3b72359b.f45e6a"
+        "90e47ea0.ecee8",
+        "8a6c8ced.8f741"
       ]
     ]
   },
   {
-    "id": "3b72359b.f45e6a",
+    "id": "8a6c8ced.8f741",
     "type": "save",
     "name": "save SECONDARY-ROOT UNI in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n<parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4352.11669921875,
-    "y": 3413.11669921875,
-    "z": "f8944603.71553",
+    "x": 4388.683364868164,
+    "y": 3423.683364868164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "d566dc7.835f6a",
+    "id": "a4c94b0b.1b4718",
     "type": "set",
     "name": "unset secondary related variables",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
     "comments": "",
-    "x": 3357,
-    "y": 453,
-    "z": "f8944603.71553",
+    "x": 3393.566665649414,
+    "y": 463.56666564941406,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "cc59ae49.952b8",
+    "id": "90e47ea0.ecee8",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4348,
-    "y": 3472,
-    "z": "f8944603.71553",
+    "x": 4384.566665649414,
+    "y": 3482.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e0cf290a.3bb57",
-        "91bee9e5.bd12c8"
+        "61b6ba56.719bdc",
+        "226a53c4.28be4c"
       ]
     ]
   },
   {
-    "id": "e0cf290a.3bb57",
+    "id": "61b6ba56.719bdc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4558,
-    "y": 3449,
-    "z": "f8944603.71553",
+    "x": 4594.566665649414,
+    "y": 3459.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "2e6c4f7b.89f37"
+        "3f2dca65.c993b6"
       ]
     ]
   },
   {
-    "id": "2e6c4f7b.89f37",
+    "id": "3f2dca65.c993b6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4684,
-    "y": 3449,
-    "z": "f8944603.71553",
+    "x": 4720.566665649414,
+    "y": 3459.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e80cf077.13626"
+        "812380f1.94aae8"
       ]
     ]
   },
   {
-    "id": "eb956f81.674a8",
+    "id": "32cc56e4.b47402",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4689,
-    "y": 3498,
-    "z": "f8944603.71553",
+    "x": 4725.566665649414,
+    "y": 3508.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "538ba095.13ecb8",
-        "a894e133.03a62",
-        "bbac82b0.611ad8",
-        "5d08bff9.d57b18"
+        "7de42311.cfc97c",
+        "94a4f684.655798",
+        "9102db37.03feb",
+        "168bc7a3.f57628"
       ]
     ]
   },
   {
-    "id": "91bee9e5.bd12c8",
+    "id": "226a53c4.28be4c",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4563,
-    "y": 3498,
-    "z": "f8944603.71553",
+    "x": 4599.566665649414,
+    "y": 3508.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "eb956f81.674a8"
+        "32cc56e4.b47402"
       ]
     ]
   },
   {
-    "id": "e80cf077.13626",
+    "id": "812380f1.94aae8",
     "type": "save",
     "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5012,
-    "y": 3446,
-    "z": "f8944603.71553",
+    "x": 5048.566665649414,
+    "y": 3456.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "538ba095.13ecb8",
+    "id": "7de42311.cfc97c",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainC",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4965,
-    "y": 3537,
-    "z": "f8944603.71553",
+    "x": 5001.566665649414,
+    "y": 3547.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "a894e133.03a62",
+    "id": "94a4f684.655798",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$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": 4949.566665649414,
+    "y": 3589.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "bbac82b0.611ad8",
+    "id": "9102db37.03feb",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5042,
-    "y": 3621,
-    "z": "f8944603.71553",
+    "x": 5078.566665649414,
+    "y": 3631.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "7be6dab9.621efc",
+    "id": "3c0b7ceb.8c4ecc",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 4928,
-    "y": 3494,
-    "z": "f8944603.71553",
+    "x": 4964.566665649414,
+    "y": 3504.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5d08bff9.d57b18",
+    "id": "168bc7a3.f57628",
     "type": "save",
     "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5020,
-    "y": 3669,
-    "z": "f8944603.71553",
+    "x": 5056.566665649414,
+    "y": 3679.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "748bc1ca.c78678",
+    "id": "54d0b322.54c85c",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3840,
-    "y": 3472,
-    "z": "f8944603.71553",
+    "x": 3876.566665649414,
+    "y": 3482.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "286f0ec8.852352",
+    "id": "5fefabc6.f62f5c",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3815,
-    "y": 4143,
-    "z": "f8944603.71553",
+    "x": 3851.566665649414,
+    "y": 4153.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d7543b1f.0223a"
+        "b4ef06b7.1fe62"
       ]
     ]
   },
   {
-    "id": "d7543b1f.0223a",
+    "id": "b4ef06b7.1fe62",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4007,
-    "y": 4138,
-    "z": "f8944603.71553",
+    "x": 4043.566665649414,
+    "y": 4148.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "8aacb5a.7bd82c8"
+        "815df3f1.7eb0f"
       ]
     ]
   },
   {
-    "id": "8aacb5a.7bd82c8",
+    "id": "815df3f1.7eb0f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4136,
-    "y": 4138,
-    "z": "f8944603.71553",
+    "x": 4172.566665649414,
+    "y": 4148.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9ecf386c.da77f"
+        "67264e9c.83602"
       ]
     ]
   },
   {
-    "id": "9ecf386c.da77f",
+    "id": "67264e9c.83602",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4468,
-    "y": 4136,
-    "z": "f8944603.71553",
+    "x": 4504.566665649414,
+    "y": 4146.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "2bbca6cc.0ec622",
+    "id": "dbd95dbb.cf097",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3803,
-    "y": 4367,
-    "z": "f8944603.71553",
+    "x": 3839.566665649414,
+    "y": 4377.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "85f62fba.be3af8"
+        "aef64578.f3199"
       ]
     ]
   },
   {
-    "id": "85f62fba.be3af8",
+    "id": "aef64578.f3199",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3983,
-    "y": 4366,
-    "z": "f8944603.71553",
+    "x": 4019.566665649414,
+    "y": 4376.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f0b10235.e7e788"
+        "9830e38b.25b19"
       ]
     ]
   },
   {
-    "id": "f0b10235.e7e788",
+    "id": "9830e38b.25b19",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4112,
-    "y": 4366,
-    "z": "f8944603.71553",
+    "x": 4148.566665649414,
+    "y": 4376.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "ccf3ecf0.96a2b"
+        "7d4e5c3a.fc6a0c"
       ]
     ]
   },
   {
-    "id": "ccf3ecf0.96a2b",
+    "id": "7d4e5c3a.fc6a0c",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4329.88330078125,
-    "y": 4364.88330078125,
-    "z": "f8944603.71553",
+    "x": 4366.449966430664,
+    "y": 4375.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "cabe89a7.9d69e"
+        "1e59b518.b0bee3"
       ]
     ]
   },
   {
-    "id": "cabe89a7.9d69e",
+    "id": "1e59b518.b0bee3",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4544.88330078125,
-    "y": 4364.88330078125,
-    "z": "f8944603.71553",
+    "x": 4581.449966430664,
+    "y": 4375.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "760290ae.a21e"
+        "40af1183.5043e"
       ]
     ]
   },
   {
-    "id": "760290ae.a21e",
+    "id": "40af1183.5043e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4676.88330078125,
-    "y": 4364.88330078125,
-    "z": "f8944603.71553",
+    "x": 4713.449966430664,
+    "y": 4375.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d0b7affb.c1db2"
+        "9532f45e.79d66"
       ]
     ]
   },
   {
-    "id": "d0b7affb.c1db2",
+    "id": "9532f45e.79d66",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5041,
-    "y": 4364,
-    "z": "f8944603.71553",
+    "x": 5077.566665649414,
+    "y": 4374.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c32fbe2a.4ce3f",
+    "id": "147222b6.72d4a5",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3478,
-    "y": 4622,
-    "z": "f8944603.71553",
+    "x": 3514.566665649414,
+    "y": 4632.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f2b98ff2.538df8"
+        "adad110b.2a8008"
       ]
     ]
   },
   {
-    "id": "f2b98ff2.538df8",
+    "id": "adad110b.2a8008",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3658,
-    "y": 4621,
-    "z": "f8944603.71553",
+    "x": 3694.566665649414,
+    "y": 4631.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "44866831.1c971"
+        "b9b6357c.7dc958"
       ]
     ]
   },
   {
-    "id": "44866831.1c971",
+    "id": "b9b6357c.7dc958",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3787,
-    "y": 4621,
-    "z": "f8944603.71553",
+    "x": 3823.566665649414,
+    "y": 4631.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "531a8e91.6c36e8"
+        "883d53e4.0057c"
       ]
     ]
   },
   {
-    "id": "6aa2083f.c88dc",
+    "id": "8f1b73bf.36d998",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3523,
-    "y": 4680,
-    "z": "f8944603.71553",
+    "x": 3559.566665649414,
+    "y": 4690.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "5db121cf.f62b2",
+    "id": "f9162d4b.d76cb",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4089,
-    "y": 4779,
-    "z": "f8944603.71553",
+    "x": 4125.566665649414,
+    "y": 4789.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "531a8e91.6c36e8",
+    "id": "883d53e4.0057c",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3553,
-    "y": 4713,
-    "z": "f8944603.71553",
+    "x": 3589.566665649414,
+    "y": 4723.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5ffa37b0.a29d98",
-        "2e65d2b6.ac2056",
-        "b5462b77.92e368"
+        "a081e505.7d3b8",
+        "370b0cd4.1d67f4",
+        "3bb246d3.6b0eb2"
       ]
     ]
   },
   {
-    "id": "2e65d2b6.ac2056",
+    "id": "370b0cd4.1d67f4",
     "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": 3771.057632446289,
+    "y": 4701.140884399414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "5fe821cf.842878"
+        "21a39fa9.8cdbc"
       ]
     ]
   },
   {
-    "id": "b5462b77.92e368",
+    "id": "3bb246d3.6b0eb2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3723,
-    "y": 4730,
-    "z": "f8944603.71553",
+    "x": 3759.566665649414,
+    "y": 4740.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "6ea658d1.17df7"
+        "3acf6433.2f683c"
       ]
     ]
   },
   {
-    "id": "5fe821cf.842878",
+    "id": "21a39fa9.8cdbc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3894.0625,
-    "y": 4688.85986328125,
-    "z": "f8944603.71553",
+    "x": 3930.629165649414,
+    "y": 4699.426528930664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "6ea658d1.17df7",
+    "id": "3acf6433.2f683c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3884,
-    "y": 4731,
-    "z": "f8944603.71553",
+    "x": 3920.566665649414,
+    "y": 4741.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "4792a0c5.aeb76",
+    "id": "c435208e.fb61a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3886,
-    "y": 4775,
-    "z": "f8944603.71553",
+    "x": 3922.566665649414,
+    "y": 4785.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "78930237.780be4",
-        "5db121cf.f62b2"
+        "6438caae.bf37d4",
+        "f9162d4b.d76cb"
       ]
     ]
   },
   {
-    "id": "5ffa37b0.a29d98",
+    "id": "a081e505.7d3b8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3728,
-    "y": 4767,
-    "z": "f8944603.71553",
+    "x": 3764.566665649414,
+    "y": 4777.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "4792a0c5.aeb76"
+        "c435208e.fb61a8"
       ]
     ]
   },
   {
-    "id": "78930237.780be4",
+    "id": "6438caae.bf37d4",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4047,
-    "y": 4707,
-    "z": "f8944603.71553",
+    "x": 4083.566665649414,
+    "y": 4717.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "74408c25.ef5164",
+    "id": "3f5c519e.52fcfe",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4413,
-    "y": 5275,
-    "z": "f8944603.71553",
+    "x": 4449.566665649414,
+    "y": 5285.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "d1a4e2c9.15ac9",
+    "id": "128b476.c3c24b9",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4568,
-    "y": 5316,
-    "z": "f8944603.71553",
+    "x": 4604.566665649414,
+    "y": 5326.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "748b1299.fd2144",
+    "id": "ef90095c.80a978",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5011,
-    "y": 5364,
-    "z": "f8944603.71553",
+    "x": 5047.566665649414,
+    "y": 5374.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "24040f90.d6a4",
+    "id": "b1e27ce1.629f7",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4384,
-    "y": 5374,
-    "z": "f8944603.71553",
+    "x": 4420.566665649414,
+    "y": 5384.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f8d36d32.9ac71",
-        "9cd0c03a.a311a"
+        "6c93874b.ea46a8",
+        "a48ce649.08b9f8"
       ]
     ]
   },
   {
-    "id": "f8d36d32.9ac71",
+    "id": "6c93874b.ea46a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620,
-    "y": 5358,
-    "z": "f8944603.71553",
+    "x": 4656.566665649414,
+    "y": 5368.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "d753b8f.12e03c8"
+        "2bac874c.98bee"
       ]
     ]
   },
   {
-    "id": "d753b8f.12e03c8",
+    "id": "2bac874c.98bee",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4764,
-    "y": 5360,
-    "z": "f8944603.71553",
+    "x": 4800.566665649414,
+    "y": 5370.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "748b1299.fd2144",
-        "9643625b.90e238",
-        "c3f4caa.3b73cb8"
+        "ef90095c.80a978",
+        "900ede93.5cfd68",
+        "c9e4ee74.f1da1"
       ]
     ]
   },
   {
-    "id": "9cd0c03a.a311a",
+    "id": "a48ce649.08b9f8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4619,
-    "y": 5406,
-    "z": "f8944603.71553",
+    "x": 4655.566665649414,
+    "y": 5416.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "9643625b.90e238",
+    "id": "900ede93.5cfd68",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5132,
-    "y": 5411,
-    "z": "f8944603.71553",
+    "x": 5168.566665649414,
+    "y": 5421.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "c3f4caa.3b73cb8",
+    "id": "c9e4ee74.f1da1",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5013.6669921875,
-    "y": 5496.08349609375,
-    "z": "f8944603.71553",
+    "x": 5050.233657836914,
+    "y": 5506.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "433011d7.349ae8",
+    "id": "80a5d0bc.394668",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5014.8837890625,
-    "y": 5454.88330078125,
-    "z": "f8944603.71553",
+    "x": 5051.450454711914,
+    "y": 5465.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "e2691c6e.49966",
+    "id": "7af1ce17.a2c558",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5546,
-    "y": 5843,
-    "z": "f8944603.71553",
+    "x": 5582.566665649414,
+    "y": 5853.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "7492e58a.da53dc",
+    "id": "9c03eaae.aa875",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4919,
-    "y": 5853,
-    "z": "f8944603.71553",
+    "x": 4955.566665649414,
+    "y": 5863.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "7d7daf2e.06b168",
-        "1dddd00a.b82ef8"
+        "c8852cc.de0315",
+        "d3e42d04.fd0a28"
       ]
     ]
   },
   {
-    "id": "7d7daf2e.06b168",
+    "id": "c8852cc.de0315",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5152,
-    "y": 5847,
-    "z": "f8944603.71553",
+    "x": 5188.566665649414,
+    "y": 5857.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "51e74c47.c309bc"
+        "3860ec82.4027f4"
       ]
     ]
   },
   {
-    "id": "51e74c47.c309bc",
+    "id": "3860ec82.4027f4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5299,
-    "y": 5855,
-    "z": "f8944603.71553",
+    "x": 5335.566665649414,
+    "y": 5865.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "e2691c6e.49966",
-        "f2071b27.722968",
-        "ce8449a1.6c0af8"
+        "7af1ce17.a2c558",
+        "cf788720.b865d8",
+        "78c6b3da.3a0f94"
       ]
     ]
   },
   {
-    "id": "1dddd00a.b82ef8",
+    "id": "d3e42d04.fd0a28",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5153,
-    "y": 5897,
-    "z": "f8944603.71553",
+    "x": 5189.566665649414,
+    "y": 5907.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "f2071b27.722968",
+    "id": "cf788720.b865d8",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5667,
-    "y": 5890,
-    "z": "f8944603.71553",
+    "x": 5703.566665649414,
+    "y": 5900.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce8449a1.6c0af8",
+    "id": "78c6b3da.3a0f94",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5548.6669921875,
-    "y": 5975.08349609375,
-    "z": "f8944603.71553",
+    "x": 5585.233657836914,
+    "y": 5985.650161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "6cf05b70.9ecfd4",
+    "id": "187aa522.975483",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5549.8837890625,
-    "y": 5933.88330078125,
-    "z": "f8944603.71553",
+    "x": 5586.450454711914,
+    "y": 5944.449966430664,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "b08c7802.5d204",
+    "id": "a4cbceb2.4df788",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5080,
-    "y": 5803,
-    "z": "f8944603.71553",
+    "x": 5116.566665649414,
+    "y": 5813.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "e97fbec2.db6de",
+    "id": "1eb398cf.3d4a57",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4914,
-    "y": 5764,
-    "z": "f8944603.71553",
+    "x": 4950.566665649414,
+    "y": 5774.566665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": []
   },
   {
-    "id": "651a17c0.63b678",
+    "id": "629500a0.f350c",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3241.25,
-    "y": 6373.25,
-    "z": "f8944603.71553",
+    "x": 3277.816665649414,
+    "y": 6383.816665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "74077cd7.2a1a94",
-        "f3174188.6084b"
+        "9cad2425.bfa4",
+        "5e118a1d.622834"
       ]
     ]
   },
   {
-    "id": "74077cd7.2a1a94",
+    "id": "9cad2425.bfa4",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3432.25,
-    "y": 6377.25,
-    "z": "f8944603.71553",
+    "x": 3468.816665649414,
+    "y": 6387.816665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "f2351c78.3536d"
+        "eaa9d7ab.22184"
       ]
     ]
   },
   {
-    "id": "f2351c78.3536d",
+    "id": "eaa9d7ab.22184",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3559.25,
-    "y": 6376.25,
-    "z": "f8944603.71553",
+    "x": 3595.816665649414,
+    "y": 6386.816665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "9d7f2116.baeda"
+        "517fe5d1.d6143c"
       ]
     ]
   },
   {
-    "id": "f3174188.6084b",
+    "id": "5e118a1d.622834",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3428.25,
-    "y": 6447.25,
-    "z": "f8944603.71553",
+    "x": 3464.816665649414,
+    "y": 6457.816665649414,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "84ee4e22.34786"
+        "3146887c.847d98"
       ]
     ]
   },
   {
-    "id": "bf4fd4bd.d3efb",
+    "id": "9e160da7.86044",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3977.75,
-    "y": 6446.33349609375,
-    "z": "f8944603.71553",
+    "x": 4014.316665649414,
+    "y": 6456.900161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       []
     ]
   },
   {
-    "id": "84ee4e22.34786",
+    "id": "3146887c.847d98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3561.75,
-    "y": 6449.33349609375,
-    "z": "f8944603.71553",
+    "x": 3598.316665649414,
+    "y": 6459.900161743164,
+    "z": "c7b9cd35.bfac88",
     "wires": [
       [
-        "bf4fd4bd.d3efb"
+        "9e160da7.86044"
       ]
     ]
   }