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=5989c10f95346dbe7469bb4dbb2d362037ac8914;hb=934becd6c3b0ecce44b1652820c6b4960ed5636f;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..5989c10f 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": "77a1d01c.aa0f88",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 140,
-    "y": 119,
-    "z": "f8944603.71553",
+    "x": 168.56666564941406,
+    "y": 174.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f39097a1.daa63"
+        "1e3c1648.671ee2"
       ]
     ]
   },
   {
-    "id": "f39097a1.daa63",
+    "id": "1e3c1648.671ee2",
     "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": 452.85235595703125,
+    "y": 235.8047742843628,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "af444c12.6df4"
+        "cf91a24a.cfe63"
       ]
     ]
   },
   {
-    "id": "af444c12.6df4",
+    "id": "cf91a24a.cfe63",
     "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": 458.9952697753906,
+    "y": 320.5666961669922,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cd7fb41b.b80af8"
+        "8dc5a038.179a08"
       ]
     ]
   },
   {
-    "id": "cd7fb41b.b80af8",
+    "id": "8dc5a038.179a08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 780,
-    "y": 324,
-    "z": "f8944603.71553",
+    "x": 808.5666656494141,
+    "y": 379.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1330d7b6.40f6",
-        "327e5a08.352bde",
-        "b36ceae.9917d98"
+        "9b12be39.ac6768",
+        "27bb57a4.5f987",
+        "2a2da752.b59748"
       ]
     ]
   },
   {
-    "id": "1330d7b6.40f6",
+    "id": "9b12be39.ac6768",
     "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": 1109.900161743164,
+    "y": 650.4969635009766,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "327e5a08.352bde",
+    "id": "27bb57a4.5f987",
     "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": 1131.328628540039,
+    "y": 352.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "393ddb72.9cdaac",
-        "27423ab.7bf7dc6",
-        "e70357b.8e78fa8"
+        "6a4d10dc.68d4a",
+        "5691a128.aafbf8",
+        "5af1bedf.a7a338"
       ]
     ]
   },
   {
-    "id": "393ddb72.9cdaac",
+    "id": "6a4d10dc.68d4a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1327.761962890625,
-    "y": 155.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1356.328628540039,
+    "y": 210.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "db827fdb.ec8a7"
+        "80bca2fd.976568"
       ]
     ]
   },
   {
-    "id": "27423ab.7bf7dc6",
+    "id": "5691a128.aafbf8",
     "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": 1351.819595336914,
+    "y": 280.47401428222656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2aba6522.745fa2"
+        "7f99fec5.4581e"
       ]
     ]
   },
   {
-    "id": "e70357b.8e78fa8",
+    "id": "5af1bedf.a7a338",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1311.761962890625,
-    "y": 271.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1340.328628540039,
+    "y": 326.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "85c2ab27.5d7c"
+        "811c97ff.d24ba8"
       ]
     ]
   },
   {
-    "id": "d67dd652.2acc48",
+    "id": "1663aedd.7a50f9",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1081.761962890625,
-    "y": 185.33331298828125,
-    "z": "f8944603.71553",
+    "x": 1110.328628540039,
+    "y": 240.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b36ceae.9917d98",
+    "id": "2a2da752.b59748",
     "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": 1098.328628540039,
+    "y": 292.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "db827fdb.ec8a7",
+    "id": "80bca2fd.976568",
     "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": 1596.566665649414,
+    "y": 207.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cb5b5e94.b15ef8",
-        "b997ad22.d70e8"
+        "9eedb337.58df9",
+        "1db64f77.692391"
       ]
     ]
   },
   {
-    "id": "2aba6522.745fa2",
+    "id": "7f99fec5.4581e",
     "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": 1506.6290435791016,
+    "y": 283.4264373779297,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "85c2ab27.5d7c",
+    "id": "811c97ff.d24ba8",
     "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": 1510.566665649414,
+    "y": 327.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cb5b5e94.b15ef8",
+    "id": "9eedb337.58df9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1773,
-    "y": 189,
-    "z": "f8944603.71553",
+    "x": 1801.566665649414,
+    "y": 244.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3cb72715.02a808"
+        "e3d32c54.b9a328"
       ]
     ]
   },
   {
-    "id": "b997ad22.d70e8",
+    "id": "1db64f77.692391",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783,
-    "y": 116,
-    "z": "f8944603.71553",
+    "x": 1811.566665649414,
+    "y": 171.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "3cb72715.02a808",
+    "id": "e3d32c54.b9a328",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1766,
-    "y": 264,
-    "z": "f8944603.71553",
+    "x": 1794.566665649414,
+    "y": 319.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ebf5f2d6.b4c7b8",
-        "490f1cae.a20b64",
-        "b4dd975f.8385a8",
-        "43a803a5.2842f4",
-        "651a17c0.63b678"
+        "bb266e42.d64ce8",
+        "33816966.623666",
+        "6367b887.741ef",
+        "a5dc6d6.f390b9",
+        "c617e6ee.8b983"
       ]
     ]
   },
   {
-    "id": "d707b8ba.d22b28",
+    "id": "410f1f1c.a0bc8",
     "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": 2280.566665649414,
+    "y": 370.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3717142f.9eacbc",
-        "81f224b1.8ce278",
-        "360e18d9.8e8878"
+        "b15d3419.e56af8",
+        "8179030d.1dc9b8",
+        "c175e9c7.17a5f8"
       ]
     ]
   },
   {
-    "id": "3717142f.9eacbc",
+    "id": "b15d3419.e56af8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2468,
-    "y": 382,
-    "z": "f8944603.71553",
+    "x": 2496.566665649414,
+    "y": 437.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "90fe9f39.2d3b48"
+        "e4dfd7bc.ebf1f8"
       ]
     ]
   },
   {
-    "id": "81f224b1.8ce278",
+    "id": "8179030d.1dc9b8",
     "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": 2497.057632446289,
+    "y": 337.14064025878906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fa7677d5.848dd"
+        "a4be790d.e1feb"
       ]
     ]
   },
   {
-    "id": "360e18d9.8e8878",
+    "id": "c175e9c7.17a5f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2464,
-    "y": 331,
-    "z": "f8944603.71553",
+    "x": 2492.566665649414,
+    "y": 386.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "72c2923b.56a34c"
+        "7226e4d.271f21c"
       ]
     ]
   },
   {
-    "id": "ebf5f2d6.b4c7b8",
+    "id": "bb266e42.d64ce8",
     "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": 1997.566665649414,
+    "y": 351.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "618e3f4f.a42bf",
-        "d707b8ba.d22b28",
-        "e8527008.db6228",
-        "a669b945.663408"
+        "a610825f.3baab8",
+        "410f1f1c.a0bc8",
+        "5b668059.1f482",
+        "989a0e11.127538"
       ]
     ]
   },
   {
-    "id": "618e3f4f.a42bf",
+    "id": "a610825f.3baab8",
     "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": 2277.566665649414,
+    "y": 289.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "43a803a5.2842f4",
+    "id": "a5dc6d6.f390b9",
     "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": 1971.566665649414,
+    "y": 301.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "490f1cae.a20b64",
+    "id": "33816966.623666",
     "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": 2014.566665649414,
+    "y": 160.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b4dd975f.8385a8",
+    "id": "6367b887.741ef",
     "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": 2026.566665649414,
+    "y": 201.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "d38afd8a.8bc96",
+    "id": "bc72be6f.8dc5b",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2023,
-    "y": 58,
-    "z": "f8944603.71553",
+    "x": 2051.566665649414,
+    "y": 113.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8fedb211.a1c3d8",
+    "id": "999645ff.8d79f8",
     "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": 1971.566665649414,
+    "y": 247.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fa7677d5.848dd",
+    "id": "a4be790d.e1feb",
     "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": 2675.566665649414,
+    "y": 339.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "72c2923b.56a34c",
+    "id": "7226e4d.271f21c",
     "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": 2675.504165649414,
+    "y": 388.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "90fe9f39.2d3b48",
+    "id": "e4dfd7bc.ebf1f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2648.9375,
-    "y": 384.1402587890625,
-    "z": "f8944603.71553",
+    "x": 2677.504165649414,
+    "y": 439.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "458d5965.a3abf"
+        "4971434.1d7e03c"
       ]
     ]
   },
   {
-    "id": "458d5965.a3abf",
+    "id": "4971434.1d7e03c",
     "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": 2970.504165649414,
+    "y": 386.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9e8135ff.08a04",
-        "11480c56.53825c",
-        "c18b528b.950eb"
+        "24e6d7c1.5d2048",
+        "3ed3e5cb.f1266a",
+        "c01f466a.2c59b8"
       ]
     ]
   },
   {
-    "id": "11480c56.53825c",
+    "id": "3ed3e5cb.f1266a",
     "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": 3273.995101928711,
+    "y": 119.28089904785156,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fafa91c8.b89"
+        "23469507.c7cb02"
       ]
     ]
   },
   {
-    "id": "fafa91c8.b89",
+    "id": "23469507.c7cb02",
     "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": 3451.566635131836,
+    "y": 119.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c18b528b.950eb",
+    "id": "c01f466a.2c59b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3240.937469482422,
-    "y": 113.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3269.504135131836,
+    "y": 168.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c9c4d95e.e78bc8"
+        "196361cf.857fbe"
       ]
     ]
   },
   {
-    "id": "c9c4d95e.e78bc8",
+    "id": "196361cf.857fbe",
     "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": 3451.504135131836,
+    "y": 168.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9e8135ff.08a04",
+    "id": "24e6d7c1.5d2048",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3244.937469482422,
-    "y": 164.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3273.504135131836,
+    "y": 219.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "249c683e.fa6548"
+        "51b732b0.20c4ec"
       ]
     ]
   },
   {
-    "id": "249c683e.fa6548",
+    "id": "51b732b0.20c4ec",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3424.937469482422,
-    "y": 164.1402587890625,
-    "z": "f8944603.71553",
+    "x": 3453.504135131836,
+    "y": 219.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8380148b.ccdda"
+        "b7af5f8.780582"
       ]
     ]
   },
   {
-    "id": "8380148b.ccdda",
+    "id": "b7af5f8.780582",
     "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": 2989.566665649414,
+    "y": 514.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f9f860ee.48ada",
-        "3ee71a32.7e39ae"
+        "73dd535b.21de04",
+        "941bba5e.9658d"
       ]
     ]
   },
   {
-    "id": "3ee71a32.7e39ae",
+    "id": "941bba5e.9658d",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3300.999969482422,
-    "y": 306,
-    "z": "f8944603.71553",
+    "x": 3329.566635131836,
+    "y": 361.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f9f860ee.48ada",
+    "id": "73dd535b.21de04",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3299.999969482422,
-    "y": 360,
-    "z": "f8944603.71553",
+    "x": 3328.566635131836,
+    "y": 415.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "88c3b86.63e2c48"
+        "33242734.b6ef48"
       ]
     ]
   },
   {
-    "id": "b0fb22ca.f9ce1",
+    "id": "8e081bd8.979208",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4044.999969482422,
-    "y": 314,
-    "z": "f8944603.71553",
+    "x": 4073.566635131836,
+    "y": 369.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5f3f920d.e5225c"
+        "ce0fbf14.8d016"
       ]
     ]
   },
   {
-    "id": "5f3f920d.e5225c",
+    "id": "ce0fbf14.8d016",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4221.999847412109,
-    "y": 306.9998779296875,
-    "z": "f8944603.71553",
+    "x": 4250.566513061523,
+    "y": 362.56654357910156,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8197a230.f5fc28",
-        "add943b3.661de"
+        "1a44842.2180c7c",
+        "958a84e8.9fbc48"
       ]
     ]
   },
   {
-    "id": "88c3b86.63e2c48",
+    "id": "33242734.b6ef48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3463.999969482422,
-    "y": 286,
-    "z": "f8944603.71553",
+    "x": 3492.566635131836,
+    "y": 341.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b1327250.c3733",
-        "de9a0d51.d824a"
+        "afaee3e0.e6df98",
+        "db5b85f.aeb77f8"
       ]
     ]
   },
   {
-    "id": "b1327250.c3733",
+    "id": "afaee3e0.e6df98",
     "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": 3773.566635131836,
+    "y": 297.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "64d386dc.4f4038"
+        "c2880ab0.c73eb"
       ]
     ]
   },
   {
-    "id": "64d386dc.4f4038",
+    "id": "c2880ab0.c73eb",
     "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": 4035.566635131836,
+    "y": 297.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b0fb22ca.f9ce1"
+        "8e081bd8.979208"
       ]
     ]
   },
   {
-    "id": "8197a230.f5fc28",
+    "id": "1a44842.2180c7c",
     "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": 4493.566513061523,
+    "y": 319.56654357910156,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "add943b3.661de",
+    "id": "958a84e8.9fbc48",
     "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": 4482.566513061523,
+    "y": 374.56654357910156,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "584012e4.8af54c",
-        "84e11e56.e2a698",
-        "b5114711.48fe28"
+        "4710cc76.36ad1c",
+        "efa019b.ed98a68",
+        "b08c41e4.127bd8"
       ]
     ]
   },
   {
-    "id": "b5114711.48fe28",
+    "id": "b08c41e4.127bd8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4705.000213623047,
-    "y": 260,
-    "z": "f8944603.71553",
+    "x": 4733.566879272461,
+    "y": 315.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3ff18282.41fa7e"
+        "7eb7952c.f46d84"
       ]
     ]
   },
   {
-    "id": "3ff18282.41fa7e",
+    "id": "7eb7952c.f46d84",
     "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": 4882.138412475586,
+    "y": 315.85243225097656,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "576f251.536f1dc",
+    "id": "dd0313dc.1a2988",
     "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": 4881.075912475586,
+    "y": 359.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "84e11e56.e2a698",
+    "id": "efa019b.ed98a68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4693.509246826172,
-    "y": 304.426025390625,
-    "z": "f8944603.71553",
+    "x": 4722.075912475586,
+    "y": 359.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "576f251.536f1dc"
+        "dd0313dc.1a2988"
       ]
     ]
   },
   {
-    "id": "584012e4.8af54c",
+    "id": "4710cc76.36ad1c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4700.509246826172,
-    "y": 383.426025390625,
-    "z": "f8944603.71553",
+    "x": 4729.075912475586,
+    "y": 438.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "84e0295.fec0058"
+        "fbbb1a1a.e2c5b8"
       ]
     ]
   },
   {
-    "id": "84e0295.fec0058",
+    "id": "fbbb1a1a.e2c5b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4839.509246826172,
-    "y": 383.426025390625,
-    "z": "f8944603.71553",
+    "x": 4868.075912475586,
+    "y": 438.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "40dc732c.a37574",
-        "72f9e36c.5c6004"
+        "7a803641.fde268",
+        "6a2b20cd.32701"
       ]
     ]
   },
   {
-    "id": "40dc732c.a37574",
+    "id": "7a803641.fde268",
     "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": 5073.566879272461,
+    "y": 436.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "72f9e36c.5c6004",
+    "id": "6a2b20cd.32701",
     "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": 5072.566879272461,
+    "y": 482.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "de9a0d51.d824a",
+    "id": "db5b85f.aeb77f8",
     "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": 3590.566635131836,
+    "y": 413.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1f9cf648.b23842"
+        "3d651743.57b188"
       ]
     ]
   },
   {
-    "id": "1f9cf648.b23842",
+    "id": "3d651743.57b188",
     "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": 3870.566635131836,
+    "y": 413.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9a7f86a9.e4bc3"
+        "823d6ddb.3083e8"
       ]
     ]
   },
   {
-    "id": "9a7f86a9.e4bc3",
+    "id": "823d6ddb.3083e8",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2225.0001220703125,
-    "y": 771.0001220703125,
-    "z": "f8944603.71553",
+    "x": 2253.5667877197266,
+    "y": 826.5667877197266,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a00c69ca.adce48"
+        "a4f7cdf6.5208e8"
       ]
     ]
   },
   {
-    "id": "a00c69ca.adce48",
+    "id": "a4f7cdf6.5208e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2402,
-    "y": 764,
-    "z": "f8944603.71553",
+    "x": 2430.566665649414,
+    "y": 819.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b1915aed.463e4",
-        "2d618162.692d86"
+        "eb8d4808.206a1",
+        "4f79166b.81752"
       ]
     ]
   },
   {
-    "id": "b1915aed.463e4",
+    "id": "eb8d4808.206a1",
     "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": 2673.566665649414,
+    "y": 776.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "2d618162.692d86",
+    "id": "4f79166b.81752",
     "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": 2662.566665649414,
+    "y": 831.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e482931e.42ecd",
-        "ed5f6487.2f87b",
-        "f8d33751.7b5a4"
+        "62989b79.9cfe9c",
+        "1988a7a4.ff123",
+        "85413e7a.b1b628"
       ]
     ]
   },
   {
-    "id": "e482931e.42ecd",
+    "id": "62989b79.9cfe9c",
     "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": 2954.057632446289,
+    "y": 810.1406402587891,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "57635b4b.26640c"
+        "f822b8e9.269d"
       ]
     ]
   },
   {
-    "id": "ed5f6487.2f87b",
+    "id": "1988a7a4.ff123",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2914,
-    "y": 799,
-    "z": "f8944603.71553",
+    "x": 2942.566665649414,
+    "y": 854.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a7b92e8f.8c52e8"
+        "b1dab01.deaad5"
       ]
     ]
   },
   {
-    "id": "57635b4b.26640c",
+    "id": "f822b8e9.269d",
     "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": 3102.629165649414,
+    "y": 810.4264068603516,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a7b92e8f.8c52e8",
+    "id": "b1dab01.deaad5",
     "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": 3101.566665649414,
+    "y": 854.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f8d33751.7b5a4",
+    "id": "85413e7a.b1b628",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2921,
-    "y": 878,
-    "z": "f8944603.71553",
+    "x": 2949.566665649414,
+    "y": 933.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "98a40400.3efa78"
+        "fb178b5b.3c4ae8"
       ]
     ]
   },
   {
-    "id": "98a40400.3efa78",
+    "id": "fb178b5b.3c4ae8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3060,
-    "y": 878,
-    "z": "f8944603.71553",
+    "x": 3088.566665649414,
+    "y": 933.5666656494141,
+    "z": "294b5e8a.041612",
     "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"
+        "e94ce0e6.cdcf4",
+        "2a0a2d05.627212",
+        "2d29cc30.4d633c",
+        "8255fb50.a7b88",
+        "ea28bb0a.303ea8",
+        "4b5b0bf9.d92b04",
+        "42798389.0acfb4",
+        "29a6af57.132c2",
+        "18652387.ef4d1c",
+        "c49ed897.0159e8",
+        "9d2ec307.fb07b8",
+        "c81a19d9.9b256",
+        "b5b402c1.c35e88",
+        "84774758.102ed8",
+        "17e6527f.ea49de",
+        "c22e8ab9.0a6b88",
+        "647f2e19.e50158",
+        "9c75cfb6.9dae68",
+        "9a8ce081.e6446",
+        "c989c621.8b708",
+        "88b89d66.20648"
       ]
     ]
   },
   {
-    "id": "8992052.d396a78",
+    "id": "31581a8c.76364e",
     "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": 3437.566665649414,
+    "y": 467.56663513183594,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "71736994.8ef448",
+    "id": "e94ce0e6.cdcf4",
     "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": 3418.566604614258,
+    "y": 546.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "5fc2699f.6720b8",
+    "id": "84774758.102ed8",
     "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": 3375.566604614258,
+    "y": 591.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "262a2cdd.1722ec",
+    "id": "2a0a2d05.627212",
     "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": 3340.566635131836,
+    "y": 645.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6dffa8a4.87ef28",
+    "id": "2d29cc30.4d633c",
     "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": 3341.566635131836,
+    "y": 700.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "19dc8ab.73ff975",
+    "id": "8255fb50.a7b88",
     "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": 3339.566635131836,
+    "y": 964.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6a238476.e2fb94",
-        "535decdf.f72024",
-        "ae1cf5c7.80a6f8"
+        "bc9dba3e.42915",
+        "4ccb40e3.75eb",
+        "6e77d52e.d49a5c"
       ]
     ]
   },
   {
-    "id": "442ee5c4.7ebc14",
+    "id": "ea28bb0a.303ea8",
     "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": 3334.566635131836,
+    "y": 1025.5665130615234,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3acf80af.f43f8",
-        "d256cf0d.9aea78",
-        "e101efde.aba"
+        "ddf0ef9b.af495",
+        "d012a2e6.7e886",
+        "c732ba74.e6ac38"
       ]
     ]
   },
   {
-    "id": "6a238476.e2fb94",
+    "id": "bc9dba3e.42915",
     "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": 3650.566635131836,
+    "y": 735.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ab9f09fe.f29c98"
+        "d26a86c.70f36f8"
       ]
     ]
   },
   {
-    "id": "535decdf.f72024",
+    "id": "4ccb40e3.75eb",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3617.509002685547,
-    "y": 729.4259948730469,
-    "z": "f8944603.71553",
+    "x": 3646.075668334961,
+    "y": 784.9926605224609,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e4e6f924.884bf"
+        "3592fdd4.1e4502"
       ]
     ]
   },
   {
-    "id": "ae1cf5c7.80a6f8",
+    "id": "6e77d52e.d49a5c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3621.509002685547,
-    "y": 782.4259948730469,
-    "z": "f8944603.71553",
+    "x": 3650.075668334961,
+    "y": 837.9926605224609,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ab5ff9c2.10c8a"
+        "f6681e1c.b1626"
       ]
     ]
   },
   {
-    "id": "ab9f09fe.f29c98",
+    "id": "d26a86c.70f36f8",
     "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": 3799.138168334961,
+    "y": 734.8524017333984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e4e6f924.884bf",
+    "id": "3592fdd4.1e4502",
     "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": 3789.075668334961,
+    "y": 784.9926605224609,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3acf80af.f43f8",
+    "id": "ddf0ef9b.af495",
     "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": 3612.566604614258,
+    "y": 925.5664825439453,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "87a2e14c.f364a"
+        "275632fb.e09a86"
       ]
     ]
   },
   {
-    "id": "d256cf0d.9aea78",
+    "id": "d012a2e6.7e886",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3579.509002685547,
-    "y": 912.4258728027344,
-    "z": "f8944603.71553",
+    "x": 3608.075668334961,
+    "y": 967.9925384521484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "98a18e9a.d4f5a"
+        "984e984a.f448c8"
       ]
     ]
   },
   {
-    "id": "e101efde.aba",
+    "id": "c732ba74.e6ac38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3580.509002685547,
-    "y": 965.4258728027344,
-    "z": "f8944603.71553",
+    "x": 3609.075668334961,
+    "y": 1020.9925384521484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4d45fe17.38da58"
+        "2eeb8181.d4367e"
       ]
     ]
   },
   {
-    "id": "87a2e14c.f364a",
+    "id": "275632fb.e09a86",
     "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": 3761.138137817383,
+    "y": 924.8522491455078,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "98a18e9a.d4f5a",
+    "id": "984e984a.f448c8",
     "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": 3751.075668334961,
+    "y": 967.9925384521484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ab5ff9c2.10c8a",
+    "id": "f6681e1c.b1626",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3782.999969482422,
-    "y": 781.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3811.566635131836,
+    "y": 837.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "84478c6a.6d587"
+        "caab91f.12177f"
       ]
     ]
   },
   {
-    "id": "4d45fe17.38da58",
+    "id": "2eeb8181.d4367e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3733.999969482422,
-    "y": 964.9998474121094,
-    "z": "f8944603.71553",
+    "x": 3762.566635131836,
+    "y": 1020.5665130615234,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2dfc998d.a2b3e6"
+        "9eb76f3a.cfcbd8"
       ]
     ]
   },
   {
-    "id": "84478c6a.6d587",
+    "id": "caab91f.12177f",
     "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": 3986.566635131836,
+    "y": 811.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "be084505.b458",
-        "5b2d2057.dd8c4",
-        "83ce05e.7f315f8"
+        "2172bcb.4fd5b44",
+        "c6b4aa53.9764a8",
+        "fbdccf10.5fabc"
       ]
     ]
   },
   {
-    "id": "2dfc998d.a2b3e6",
+    "id": "9eb76f3a.cfcbd8",
     "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": 3946.566635131836,
+    "y": 928.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "27a94561.e70e32",
-        "e39a6c9c.1e6dd8",
-        "fe4b773c.0eae98"
+        "572a469b.71d458",
+        "b8b0db7f.0d0b98",
+        "56529717.d57cf"
       ]
     ]
   },
   {
-    "id": "be084505.b458",
+    "id": "2172bcb.4fd5b44",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4079.999969482422,
-    "y": 540.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4108.566635131836,
+    "y": 596.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "86b880d.ad45d"
+        "b34792b6.2f84b"
       ]
     ]
   },
   {
-    "id": "5b2d2057.dd8c4",
+    "id": "c6b4aa53.9764a8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4081.999969482422,
-    "y": 594.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4110.566635131836,
+    "y": 650.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "10eaea8a.998afd"
+        "8791b1f2.9fddd"
       ]
     ]
   },
   {
-    "id": "27a94561.e70e32",
+    "id": "572a469b.71d458",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4099,
-    "y": 811,
-    "z": "f8944603.71553",
+    "x": 4127.566665649414,
+    "y": 866.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e84921e.f8ecce"
+        "2e043645.b8ff02"
       ]
     ]
   },
   {
-    "id": "e39a6c9c.1e6dd8",
+    "id": "b8b0db7f.0d0b98",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4101,
-    "y": 865,
-    "z": "f8944603.71553",
+    "x": 4129.566665649414,
+    "y": 920.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b7ebf9b7.e2f348"
+        "8eeda316.6df7"
       ]
     ]
   },
   {
-    "id": "4ebe65d0.3ec92c",
+    "id": "9e47fb61.f661c8",
     "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": 4418.566635131836,
+    "y": 548.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b5b3e89e.18b28",
+    "id": "21b58670.3a1192",
     "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": 4411.566635131836,
+    "y": 646.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "81270995.5d712",
+    "id": "d0dd5f40.4b5f38",
     "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": 4429.566665649414,
+    "y": 839.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7db54dd4.f36624",
+    "id": "d70d7c37.e21f5",
     "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": 4433.566665649414,
+    "y": 932.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3464c217.ddf82e",
+    "id": "a539fdfb.953e38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3548,
-    "y": 1549,
-    "z": "f8944603.71553",
+    "x": 3576.566665649414,
+    "y": 1604.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5c2f3801.4eed3"
+        "7f7f51c3.cfe0e"
       ]
     ]
   },
   {
-    "id": "e12bcc6e.caae8",
+    "id": "a32c9d1e.59f95",
     "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": 3586.057632446289,
+    "y": 1647.1407012939453,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fb3f4046.01bc4"
+        "ea2bacf1.80819"
       ]
     ]
   },
   {
-    "id": "a3a68564.d1334",
+    "id": "fb2990eb.3d37b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3546,
-    "y": 1638,
-    "z": "f8944603.71553",
+    "x": 3574.566665649414,
+    "y": 1693.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9f68f9be.d7aab8"
+        "495659dd.a8b668"
       ]
     ]
   },
   {
-    "id": "8a9b7f74.e3a568",
+    "id": "c88f575a.f847c",
     "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": 3276.566665649414,
+    "y": 1566.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "22efa8c9.c8576",
+    "id": "42798389.0acfb4",
     "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": 3319.566665649414,
+    "y": 1631.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3464c217.ddf82e",
-        "e12bcc6e.caae8",
-        "a3a68564.d1334"
+        "a539fdfb.953e38",
+        "a32c9d1e.59f95",
+        "fb2990eb.3d37b8"
       ]
     ]
   },
   {
-    "id": "55e39af5.a2b61c",
+    "id": "4b5b0bf9.d92b04",
     "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": 3320.566665649414,
+    "y": 1301.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cbe70d53.b79168",
-        "9e0cb899.0e0f"
+        "7927223e.403f8c",
+        "cb61ec61.ad89d"
       ]
     ]
   },
   {
-    "id": "9e0cb899.0e0f",
+    "id": "cb61ec61.ad89d",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3512.999969482422,
-    "y": 1298.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3541.566635131836,
+    "y": 1354.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "300fab87.54654c"
+        "b9b2d4da.80c098"
       ]
     ]
   },
   {
-    "id": "cbe70d53.b79168",
+    "id": "7927223e.403f8c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3514.999969482422,
-    "y": 1331.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3543.566635131836,
+    "y": 1387.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ad0b83ff.4cb308"
+        "3bca8d9d.c75392"
       ]
     ]
   },
   {
-    "id": "5c2f3801.4eed3",
+    "id": "7f7f51c3.cfe0e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3720.66650390625,
-    "y": 1548,
-    "z": "f8944603.71553",
+    "x": 3749.233169555664,
+    "y": 1603.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fe2c6692.47101",
-        "9af14a91.b12a68"
+        "f7adce7b.f663c8",
+        "aab5a13f.7b9228"
       ]
     ]
   },
   {
-    "id": "fb3f4046.01bc4",
+    "id": "ea2bacf1.80819",
     "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": 3739.6290435791016,
+    "y": 1650.4264373779297,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9f68f9be.d7aab8",
+    "id": "495659dd.a8b668",
     "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": 3743.566665649414,
+    "y": 1694.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fe2c6692.47101",
+    "id": "f7adce7b.f663c8",
     "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": 4013.566665649414,
+    "y": 1587.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "37956c14.cf1964",
-        "7f26a273.a5f25c"
+        "eba55ae6.b47008",
+        "a5049a4a.932988"
       ]
     ]
   },
   {
-    "id": "7f26a273.a5f25c",
+    "id": "a5049a4a.932988",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4208,
-    "y": 1487,
-    "z": "f8944603.71553",
+    "x": 4236.566665649414,
+    "y": 1542.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d180abab.fe69a"
+        "b0af1c9f.1d33f"
       ]
     ]
   },
   {
-    "id": "37956c14.cf1964",
+    "id": "eba55ae6.b47008",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4210,
-    "y": 1551,
-    "z": "f8944603.71553",
+    "x": 4238.566665649414,
+    "y": 1606.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "11875f6b.e538c1"
+        "3044898a.b774b6"
       ]
     ]
   },
   {
-    "id": "11875f6b.e538c1",
+    "id": "3044898a.b774b6",
     "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": 4400.566665649414,
+    "y": 1602.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d180abab.fe69a",
+    "id": "b0af1c9f.1d33f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4373,
-    "y": 1484,
-    "z": "f8944603.71553",
+    "x": 4401.566665649414,
+    "y": 1539.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c42ee54d.ec9ea",
-        "e2dee17e.90746"
+        "3cd7ef1e.9f6f38",
+        "782ad12.44a143"
       ]
     ]
   },
   {
-    "id": "ad0b83ff.4cb308",
+    "id": "3bca8d9d.c75392",
     "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": 3686.566635131836,
+    "y": 1384.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "300fab87.54654c",
+    "id": "b9b2d4da.80c098",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3660.999969482422,
-    "y": 1291.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3689.566635131836,
+    "y": 1347.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "844bb618.6c32e8",
-        "99a55ff.3057da"
+        "2e849446.924674",
+        "15f06507.bc03a3"
       ]
     ]
   },
   {
-    "id": "844bb618.6c32e8",
+    "id": "2e849446.924674",
     "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": 3863.566635131836,
+    "y": 1303.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9af14a91.b12a68",
+    "id": "aab5a13f.7b9228",
     "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": 3962.566635131836,
+    "y": 1697.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1b19176e.822411"
+        "7f3dbf41.0b7cb"
       ]
     ]
   },
   {
-    "id": "1b19176e.822411",
+    "id": "7f3dbf41.0b7cb",
     "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": 4168.566635131836,
+    "y": 1697.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c875ac48.6e9"
+        "33161afe.bf5fb6"
       ]
     ]
   },
   {
-    "id": "c875ac48.6e9",
+    "id": "33161afe.bf5fb6",
     "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": 4383.852279663086,
+    "y": 1697.388412475586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6e0bf03.4de201"
+        "d1f5e6bd.d6c388"
       ]
     ]
   },
   {
-    "id": "99a55ff.3057da",
+    "id": "15f06507.bc03a3",
     "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": 3878.566635131836,
+    "y": 1414.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "26c5a31d.0e26c4",
-        "1dba38b8.e09647",
-        "703777cb.7523f"
+        "609f91e1.96d3c",
+        "c5dd830a.81bd98",
+        "f762b67a.3d2c8"
       ]
     ]
   },
   {
-    "id": "26c5a31d.0e26c4",
+    "id": "609f91e1.96d3c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4045.5000915527344,
-    "y": 1310.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4074.0667572021484,
+    "y": 1366.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3f157e84.d62172"
+        "964976f5.819d98"
       ]
     ]
   },
   {
-    "id": "1dba38b8.e09647",
+    "id": "c5dd830a.81bd98",
     "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": 4066.0667572021484,
+    "y": 1421.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7126adde.e76d1c"
+        "bf5b62.bbb734a"
       ]
     ]
   },
   {
-    "id": "703777cb.7523f",
+    "id": "f762b67a.3d2c8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4042.5000915527344,
-    "y": 1422.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4071.0667572021484,
+    "y": 1478.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f85ce86b.434b48"
+        "bc48235e.ca1af8"
       ]
     ]
   },
   {
-    "id": "f85ce86b.434b48",
+    "id": "bc48235e.ca1af8",
     "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": 4223.066757202148,
+    "y": 1479.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7126adde.e76d1c",
+    "id": "bf5b62.bbb734a",
     "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": 4234.066757202148,
+    "y": 1424.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3f157e84.d62172",
+    "id": "964976f5.819d98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4189.882415771484,
-    "y": 1308.6556396484375,
-    "z": "f8944603.71553",
+    "x": 4218.449081420898,
+    "y": 1364.2223052978516,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "61a6617b.c1f918"
+        "242018b6.f49c88"
       ]
     ]
   },
   {
-    "id": "61a6617b.c1f918",
+    "id": "242018b6.f49c88",
     "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": 4402.566635131836,
+    "y": 1378.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c94ffafa.dcbd38"
+        "fc08eb6a.2320e"
       ]
     ]
   },
   {
-    "id": "e2dee17e.90746",
+    "id": "782ad12.44a143",
     "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": 4571.566665649414,
+    "y": 1497.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c42ee54d.ec9ea",
+    "id": "3cd7ef1e.9f6f38",
     "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": 4572.566665649414,
+    "y": 1605.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a1e5e819.9ba388",
+    "id": "9dc8c404.7ec36",
     "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": 4573.566665649414,
+    "y": 1554.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6e0bf03.4de201",
+    "id": "d1f5e6bd.d6c388",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4562.117156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4590.683822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "663b6226.995afc",
-        "dd7e9ff0.ed3a48",
-        "21e8d5ce.795f42"
+        "333e33dc.560624",
+        "7db36be0.62778c",
+        "5d7040fa.99ac2"
       ]
     ]
   },
   {
-    "id": "663b6226.995afc",
+    "id": "333e33dc.560624",
     "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": 4805.683822631836,
+    "y": 1659.906967163086,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "dd7e9ff0.ed3a48",
+    "id": "7db36be0.62778c",
     "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": 4802.683822631836,
+    "y": 1698.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "49a01492.84fe34"
+        "2d9a4fac.ae36b8"
       ]
     ]
   },
   {
-    "id": "21e8d5ce.795f42",
+    "id": "5d7040fa.99ac2",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4729.617156982422,
-    "y": 1685.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4758.183822631836,
+    "y": 1740.906967163086,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "49a01492.84fe34",
+    "id": "2d9a4fac.ae36b8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4954.617156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 4983.183822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "292cacf5.882694"
+        "a4ece740.b4105"
       ]
     ]
   },
   {
-    "id": "ccfcf164.268f1",
+    "id": "52e1d551.a483dc",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4774,
-    "y": 1260,
-    "z": "f8944603.71553",
+    "x": 4802.566665649414,
+    "y": 1315.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c88ef5fa.00d8b"
+        "7de9311.18a165"
       ]
     ]
   },
   {
-    "id": "c88ef5fa.00d8b",
+    "id": "7de9311.18a165",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4951,
-    "y": 1252,
-    "z": "f8944603.71553",
+    "x": 4979.566665649414,
+    "y": 1307.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "889b0a64.f04af",
-        "b7b819bd.9ab3a"
+        "fff1a40e.199ba",
+        "7abb7683.fa5358"
       ]
     ]
   },
   {
-    "id": "c94ffafa.dcbd38",
+    "id": "fc08eb6a.2320e",
     "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": 4597.566635131836,
+    "y": 1378.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ccfcf164.268f1",
-        "109fb904.331fef"
+        "52e1d551.a483dc",
+        "6d2d083c.e53ec8"
       ]
     ]
   },
   {
-    "id": "109fb904.331fef",
+    "id": "6d2d083c.e53ec8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4777,
-    "y": 1334,
-    "z": "f8944603.71553",
+    "x": 4805.566665649414,
+    "y": 1389.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c72b69fd.2d015"
+        "b42cfcde.f4ebc8"
       ]
     ]
   },
   {
-    "id": "c72b69fd.2d015",
+    "id": "b42cfcde.f4ebc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4954,
-    "y": 1326,
-    "z": "f8944603.71553",
+    "x": 4982.566665649414,
+    "y": 1381.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7fcaaf72.ffd618"
+        "e8e280e3.a65e5"
       ]
     ]
   },
   {
-    "id": "292cacf5.882694",
+    "id": "a4ece740.b4105",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5112.617156982422,
-    "y": 1642.3403015136719,
-    "z": "f8944603.71553",
+    "x": 5141.183822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "63e30873.d5c4b8"
+        "425d708e.783968"
       ]
     ]
   },
   {
-    "id": "63e30873.d5c4b8",
+    "id": "425d708e.783968",
     "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": 5348.183822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b7b819bd.9ab3a",
+    "id": "7abb7683.fa5358",
     "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": 5187.566665649414,
+    "y": 1314.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b062763c.d2a4c",
-        "54b52301.01aeac",
-        "c657b443.273d9"
+        "45403a46.69b7f4",
+        "ab6bed09.5e53d",
+        "1ce7c845.052f38"
       ]
     ]
   },
   {
-    "id": "889b0a64.f04af",
+    "id": "fff1a40e.199ba",
     "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": 5217.566665649414,
+    "y": 1262.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b062763c.d2a4c",
+    "id": "45403a46.69b7f4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5369,
-    "y": 1250,
-    "z": "f8944603.71553",
+    "x": 5397.566665649414,
+    "y": 1305.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "be5642b7.4ae158"
+        "f2e23e54.aa63c8"
       ]
     ]
   },
   {
-    "id": "54b52301.01aeac",
+    "id": "ab6bed09.5e53d",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5361,
-    "y": 1305,
-    "z": "f8944603.71553",
+    "x": 5389.566665649414,
+    "y": 1360.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4c818fe4.79442"
+        "29b1e9b9.e1584e"
       ]
     ]
   },
   {
-    "id": "c657b443.273d9",
+    "id": "1ce7c845.052f38",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5366,
-    "y": 1362,
-    "z": "f8944603.71553",
+    "x": 5394.566665649414,
+    "y": 1417.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "efb52045.6ba93"
+        "26b11425.c22444"
       ]
     ]
   },
   {
-    "id": "efb52045.6ba93",
+    "id": "26b11425.c22444",
     "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": 5546.566665649414,
+    "y": 1418.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4c818fe4.79442",
+    "id": "29b1e9b9.e1584e",
     "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": 5557.566665649414,
+    "y": 1363.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "be5642b7.4ae158",
+    "id": "f2e23e54.aa63c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5513.38232421875,
-    "y": 1247.6556701660156,
-    "z": "f8944603.71553",
+    "x": 5541.948989868164,
+    "y": 1303.2223358154297,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6763b660.709548"
+        "a969095b.c118"
       ]
     ]
   },
   {
-    "id": "7fcaaf72.ffd618",
+    "id": "e8e280e3.a65e5",
     "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": 5217.566665649414,
+    "y": 1505.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6763b660.709548",
+    "id": "a969095b.c118",
     "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": 5756.566665649414,
+    "y": 1299.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1bc82fcd.e38b3",
+    "id": "3c38a36b.8cf1d4",
     "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": 4406.566635131836,
+    "y": 584.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1ea9819.2a7577e",
+    "id": "66912289.29f5fc",
     "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": 4397.566635131836,
+    "y": 682.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "86b880d.ad45d",
+    "id": "b34792b6.2f84b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4202.999969482422,
-    "y": 534.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4231.566635131836,
+    "y": 590.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4ebe65d0.3ec92c",
-        "1bc82fcd.e38b3"
+        "9e47fb61.f661c8",
+        "3c38a36b.8cf1d4"
       ]
     ]
   },
   {
-    "id": "10eaea8a.998afd",
+    "id": "8791b1f2.9fddd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4208.999969482422,
-    "y": 598.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4237.566635131836,
+    "y": 654.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b5b3e89e.18b28",
-        "1ea9819.2a7577e"
+        "21b58670.3a1192",
+        "66912289.29f5fc"
       ]
     ]
   },
   {
-    "id": "e84921e.f8ecce",
+    "id": "2e043645.b8ff02",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4227,
-    "y": 811,
-    "z": "f8944603.71553",
+    "x": 4255.566665649414,
+    "y": 866.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "81270995.5d712",
-        "aacd9933.603dc8"
+        "d0dd5f40.4b5f38",
+        "fac3c269.3e8818"
       ]
     ]
   },
   {
-    "id": "b7ebf9b7.e2f348",
+    "id": "8eeda316.6df7",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4230,
-    "y": 864,
-    "z": "f8944603.71553",
+    "x": 4258.566665649414,
+    "y": 919.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7db54dd4.f36624",
-        "bffe7efa.872038"
+        "d70d7c37.e21f5",
+        "d978bf81.a682c8"
       ]
     ]
   },
   {
-    "id": "aacd9933.603dc8",
+    "id": "fac3c269.3e8818",
     "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": 4415.566665649414,
+    "y": 879.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "bffe7efa.872038",
+    "id": "d978bf81.a682c8",
     "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": 4418.566665649414,
+    "y": 970.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "786dd6d1.bb9f",
+    "id": "98a290a7.380a3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3681.999969482422,
-    "y": 2041.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3710.566635131836,
+    "y": 2097.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ced1d6e7.1761a",
-        "debfaec3.11449"
+        "e497858e.0123a",
+        "498e60f5.55f178"
       ]
     ]
   },
   {
-    "id": "4b469f00.bbd698",
+    "id": "7f085da3.5b6764",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3509.333465576172,
-    "y": 2042.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3537.900131225586,
+    "y": 2098.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "786dd6d1.bb9f"
+        "98a290a7.380a3"
       ]
     ]
   },
   {
-    "id": "abe29976.f7b82",
+    "id": "92e1b5b8.c9d748",
     "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": 3547.391098022461,
+    "y": 2141.140670776367,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fd5b7bb5.9eb778"
+        "b56c748b.ef0b98"
       ]
     ]
   },
   {
-    "id": "df5e24e1.4bbfc8",
+    "id": "67d077ec.f8e2b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3507.333465576172,
-    "y": 2131.999969482422,
-    "z": "f8944603.71553",
+    "x": 3535.900131225586,
+    "y": 2187.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8efc96df.7aca9"
+        "531aab62.3c8d74"
       ]
     ]
   },
   {
-    "id": "fd5b7bb5.9eb778",
+    "id": "b56c748b.ef0b98",
     "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": 3700.9625091552734,
+    "y": 2144.4264068603516,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8efc96df.7aca9",
+    "id": "531aab62.3c8d74",
     "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": 3704.900131225586,
+    "y": 2188.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ced1d6e7.1761a",
+    "id": "e497858e.0123a",
     "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": 3996.900131225586,
+    "y": 2101.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8ff8205e.94493",
-        "d23599ca.696b88"
+        "f5003287.c43b28",
+        "e21b6e0c.643e48"
       ]
     ]
   },
   {
-    "id": "d23599ca.696b88",
+    "id": "e21b6e0c.643e48",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4191.333465576172,
-    "y": 2001.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4219.900131225586,
+    "y": 2056.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9c58fe22.c1b4f8"
+        "1c25bfa5.0e84a8"
       ]
     ]
   },
   {
-    "id": "8ff8205e.94493",
+    "id": "f5003287.c43b28",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4193.333465576172,
-    "y": 2065.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4221.900131225586,
+    "y": 2120.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f9f53a1b.e6879"
+        "9df0e8d3.70e7b"
       ]
     ]
   },
   {
-    "id": "f9f53a1b.e6879",
+    "id": "9df0e8d3.70e7b",
     "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": 4380.900131225586,
+    "y": 2139.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9c58fe22.c1b4f8",
+    "id": "1c25bfa5.0e84a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4356.333465576172,
-    "y": 1998.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4384.900131225586,
+    "y": 2053.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a3891ddf.35707",
-        "dedb2135.03f5b8"
+        "15645f19.451cd9",
+        "5b635208.85addc"
       ]
     ]
   },
   {
-    "id": "b18620c8.640928",
+    "id": "18652387.ef4d1c",
     "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": 3309.900131225586,
+    "y": 2133.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4b469f00.bbd698",
-        "abe29976.f7b82",
-        "df5e24e1.4bbfc8"
+        "7f085da3.5b6764",
+        "92e1b5b8.c9d748",
+        "67d077ec.f8e2b8"
       ]
     ]
   },
   {
-    "id": "2363f2d1.c22566",
+    "id": "8fa3650.6227a18",
     "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": 3270.900131225586,
+    "y": 2077.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d6e1611b.9ddcf",
+    "id": "29a6af57.132c2",
     "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": 3329.900131225586,
+    "y": 1873.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cf2f2f41.e3b378",
-        "39e668ff.f44578"
+        "7f4e16fd.13b25",
+        "9c29704e.b9eca8"
       ]
     ]
   },
   {
-    "id": "39e668ff.f44578",
+    "id": "9c29704e.b9eca8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3524.333465576172,
-    "y": 1803.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3552.900131225586,
+    "y": 1859.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a19c910d.573ee"
+        "bb1e4e57.280888"
       ]
     ]
   },
   {
-    "id": "cf2f2f41.e3b378",
+    "id": "7f4e16fd.13b25",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3526.333465576172,
-    "y": 1836.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3554.900131225586,
+    "y": 1892.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "13f310d4.058aff"
+        "b75dfd73.636e48"
       ]
     ]
   },
   {
-    "id": "13f310d4.058aff",
+    "id": "b75dfd73.636e48",
     "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": 3697.900131225586,
+    "y": 1889.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a19c910d.573ee",
+    "id": "bb1e4e57.280888",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3672.333465576172,
-    "y": 1796.9999694824219,
-    "z": "f8944603.71553",
+    "x": 3700.900131225586,
+    "y": 1852.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f7d74c47.1bc978",
-        "f5bac544.61fa48"
+        "bda8773a.f12a1",
+        "d5e4b6e4.115dd8"
       ]
     ]
   },
   {
-    "id": "f7d74c47.1bc978",
+    "id": "bda8773a.f12a1",
     "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": 3894.900131225586,
+    "y": 1855.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "debfaec3.11449",
+    "id": "498e60f5.55f178",
     "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": 3947.900100708008,
+    "y": 2224.566604614258,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9615e6c.711fd18"
+        "f195472b.83ff2"
       ]
     ]
   },
   {
-    "id": "9615e6c.711fd18",
+    "id": "f195472b.83ff2",
     "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": 4153.900100708008,
+    "y": 2224.566604614258,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cbe4341f.004078"
+        "2e029795.f674f8"
       ]
     ]
   },
   {
-    "id": "cbe4341f.004078",
+    "id": "2e029795.f674f8",
     "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": 4371.185745239258,
+    "y": 2223.388381958008,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c7f950c4.309208"
+        "9d2261f5.b9fa08"
       ]
     ]
   },
   {
-    "id": "f5bac544.61fa48",
+    "id": "d5e4b6e4.115dd8",
     "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": 3916.900131225586,
+    "y": 1923.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2c3b0cc0.e9a8bc",
-        "964d0d68.ea7238",
-        "c9fecb15.92dc4"
+        "6730b25.e0c5f4c",
+        "c5d11aca.de4aa8",
+        "359fd71e.08e5b"
       ]
     ]
   },
   {
-    "id": "2c3b0cc0.e9a8bc",
+    "id": "6730b25.e0c5f4c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4083.8335876464844,
-    "y": 1820.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4112.400253295898,
+    "y": 1875.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d8e08a6a.bad6c"
+        "11cc1f31.73aba1"
       ]
     ]
   },
   {
-    "id": "964d0d68.ea7238",
+    "id": "c5d11aca.de4aa8",
     "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": 4104.400253295898,
+    "y": 1930.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "30330606.c5c78a"
+        "5b1bf93a.85704"
       ]
     ]
   },
   {
-    "id": "c9fecb15.92dc4",
+    "id": "359fd71e.08e5b",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.8335876464844,
-    "y": 1932.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4109.400253295898,
+    "y": 1987.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7d5217b1.764cf"
+        "150deb8f.b69cd4"
       ]
     ]
   },
   {
-    "id": "7d5217b1.764cf",
+    "id": "150deb8f.b69cd4",
     "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": 4261.400253295898,
+    "y": 1988.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "30330606.c5c78a",
+    "id": "5b1bf93a.85704",
     "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": 4272.400253295898,
+    "y": 1933.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d8e08a6a.bad6c",
+    "id": "11cc1f31.73aba1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4228.215911865234,
-    "y": 1817.65576171875,
-    "z": "f8944603.71553",
+    "x": 4256.782577514648,
+    "y": 1873.222427368164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "57c065bf.a4bd5c"
+        "cff6dd9b.8cbec"
       ]
     ]
   },
   {
-    "id": "a3891ddf.35707",
+    "id": "15645f19.451cd9",
     "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": 4554.900131225586,
+    "y": 2014.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "dedb2135.03f5b8",
+    "id": "5b635208.85addc",
     "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": 4555.900131225586,
+    "y": 2119.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cd4b037.d584a",
+    "id": "f4c1e1b8.e7b4e8",
     "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": 4550.900131225586,
+    "y": 2068.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c7f950c4.309208",
+    "id": "9d2261f5.b9fa08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4549.450622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4578.017288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dd90bf13.7024b8",
-        "71302a26.8b2194",
-        "1d143619.b4c942"
+        "84d8ab80.c7c5d8",
+        "e6773f2f.211b88",
+        "2391fc90.5865f4"
       ]
     ]
   },
   {
-    "id": "dd90bf13.7024b8",
+    "id": "84d8ab80.c7c5d8",
     "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": 4793.017288208008,
+    "y": 2174.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "71302a26.8b2194",
+    "id": "e6773f2f.211b88",
     "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": 4790.017288208008,
+    "y": 2213.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d8986410.1ab67"
+        "e6f8fe6a.d80188"
       ]
     ]
   },
   {
-    "id": "1d143619.b4c942",
+    "id": "2391fc90.5865f4",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4716.950622558594,
-    "y": 2200.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4745.517288208008,
+    "y": 2255.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d8986410.1ab67",
+    "id": "e6f8fe6a.d80188",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4941.950622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 4970.517288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ce977a1e.eca43"
+        "fdc72134.67c23"
       ]
     ]
   },
   {
-    "id": "ce977a1e.eca43",
+    "id": "fdc72134.67c23",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5099.950622558594,
-    "y": 2157.3403930664062,
-    "z": "f8944603.71553",
+    "x": 5128.517288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fad51809.c9b758"
+        "be11f8e.1056f08"
       ]
     ]
   },
   {
-    "id": "fad51809.c9b758",
+    "id": "be11f8e.1056f08",
     "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": 5335.517288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3e817052.af0e48",
+    "id": "8905f8e1.68af1",
     "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": 4838.900131225586,
+    "y": 1891.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "41d964fa.bed18c"
+        "ca38006f.4cfdd"
       ]
     ]
   },
   {
-    "id": "41d964fa.bed18c",
+    "id": "ca38006f.4cfdd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4987.333465576172,
-    "y": 1828.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5015.900131225586,
+    "y": 1883.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "286abe4.161a1c2",
-        "51859ea0.e5a788"
+        "9fddc1a7.528c8",
+        "516ef3bb.d53aec"
       ]
     ]
   },
   {
-    "id": "57c065bf.a4bd5c",
+    "id": "cff6dd9b.8cbec",
     "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": 4440.900131225586,
+    "y": 1887.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "89b46226.1281f"
+        "4e481827.26cf7"
       ]
     ]
   },
   {
-    "id": "89b46226.1281f",
+    "id": "4e481827.26cf7",
     "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": 4635.900131225586,
+    "y": 1887.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3e817052.af0e48",
-        "56bdf4f5.249c24"
+        "8905f8e1.68af1",
+        "eb2add71.4c5b38"
       ]
     ]
   },
   {
-    "id": "51859ea0.e5a788",
+    "id": "516ef3bb.d53aec",
     "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": 5223.900131225586,
+    "y": 1890.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d1ce3d2f.531928",
-        "ba2a8dba.a8d52",
-        "4ba192d1.030d84"
+        "8f1e6966.2ed9b",
+        "eb0b97a0.d2554",
+        "8b053235.7e7848"
       ]
     ]
   },
   {
-    "id": "f8a3b14d.675a5",
+    "id": "13674b50.1cc875",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4989.333465576172,
-    "y": 1901.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5017.900131225586,
+    "y": 1956.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "25c16268.66f006"
+        "fd136ece.b5724"
       ]
     ]
   },
   {
-    "id": "56bdf4f5.249c24",
+    "id": "eb2add71.4c5b38",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4812.333465576172,
-    "y": 1909.0000915527344,
-    "z": "f8944603.71553",
+    "x": 4840.900131225586,
+    "y": 1964.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f8a3b14d.675a5"
+        "13674b50.1cc875"
       ]
     ]
   },
   {
-    "id": "286abe4.161a1c2",
+    "id": "9fddc1a7.528c8",
     "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": 5253.900131225586,
+    "y": 1838.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "25c16268.66f006",
+    "id": "fd136ece.b5724",
     "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": 5252.900131225586,
+    "y": 2080.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d1ce3d2f.531928",
+    "id": "8f1e6966.2ed9b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5405.333465576172,
-    "y": 1826.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5433.900131225586,
+    "y": 1881.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9d788655.20f98"
+        "9db69d63.dc9d08"
       ]
     ]
   },
   {
-    "id": "ba2a8dba.a8d52",
+    "id": "eb0b97a0.d2554",
     "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": 5425.900131225586,
+    "y": 1936.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "96363bdc.091"
+        "c57fd560.6db4a"
       ]
     ]
   },
   {
-    "id": "4ba192d1.030d84",
+    "id": "8b053235.7e7848",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5402.333465576172,
-    "y": 1938.0000915527344,
-    "z": "f8944603.71553",
+    "x": 5430.900131225586,
+    "y": 1993.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6a0588e1.3fd2b8"
+        "6e911852.3a5e28"
       ]
     ]
   },
   {
-    "id": "6a0588e1.3fd2b8",
+    "id": "6e911852.3a5e28",
     "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": 5582.900131225586,
+    "y": 1994.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "96363bdc.091",
+    "id": "c57fd560.6db4a",
     "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": 5593.900131225586,
+    "y": 1939.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9d788655.20f98",
+    "id": "9db69d63.dc9d08",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5549.715789794922,
-    "y": 1823.65576171875,
-    "z": "f8944603.71553",
+    "x": 5578.282455444336,
+    "y": 1879.222427368164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f42174ac.a42b5"
+        "e6169acb.b321e8"
       ]
     ]
   },
   {
-    "id": "f42174ac.a42b5",
+    "id": "e6169acb.b321e8",
     "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": 5792.900131225586,
+    "y": 1875.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "11e0f934.faeab7",
+    "id": "c49ed897.0159e8",
     "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": 3277.566635131836,
+    "y": 1694.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "87d62238.4ede38",
+    "id": "758e6e49.b62098",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4544.999969482422,
-    "y": 612.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4573.566635131836,
+    "y": 668.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "da6b2335.2cb2",
+    "id": "ebf6202d.cf95a8",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4555,
-    "y": 809,
-    "z": "f8944603.71553",
+    "x": 4583.566665649414,
+    "y": 864.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b71f57a7.e2a288",
+    "id": "9d2ec307.fb07b8",
     "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": 3280.566604614258,
+    "y": 2202.566604614258,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f7d11626.bd108",
+    "id": "c81a19d9.9b256",
     "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": 3417.566665649414,
+    "y": 2858.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "7d22810d.66642",
+    "id": "b5b402c1.c35e88",
     "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": 3294.566665649414,
+    "y": 2968.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "74458dfb.e82acc",
-        "6d43d493.c2ab14"
+        "1932a37.6a327dd",
+        "e9120928.0c2298"
       ]
     ]
   },
   {
-    "id": "74458dfb.e82acc",
+    "id": "1932a37.6a327dd",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3450,
-    "y": 2892,
-    "z": "f8944603.71553",
+    "x": 3478.566665649414,
+    "y": 2947.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bd8c7362.5e86a8"
+        "82607164.646368"
       ]
     ]
   },
   {
-    "id": "6d43d493.c2ab14",
+    "id": "e9120928.0c2298",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3342,
-    "y": 5070,
-    "z": "f8944603.71553",
+    "x": 3370.566665649414,
+    "y": 5125.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f235a0e0.02a8"
+        "ff313408.b74908"
       ]
     ]
   },
   {
-    "id": "f235a0e0.02a8",
+    "id": "ff313408.b74908",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3497,
-    "y": 5063,
-    "z": "f8944603.71553",
+    "x": 3525.566665649414,
+    "y": 5118.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "69d3ed18.577c3c",
-        "f2a7dc4a.68ede",
-        "a789852e.51cd48",
-        "434bd8c2.bae4f8",
-        "cd1fc06c.124968",
-        "c32fbe2a.4ce3f"
+        "172df7ad.1d8918",
+        "e9491637.d51c9",
+        "ed589f33.dee34",
+        "8bbbb496.3df16",
+        "581d9366.e6ee44",
+        "f0668881.7d6d6"
       ]
     ]
   },
   {
-    "id": "bd8c7362.5e86a8",
+    "id": "82607164.646368",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3593,
-    "y": 2892,
-    "z": "f8944603.71553",
+    "x": 3621.566665649414,
+    "y": 2947.566665649414,
+    "z": "294b5e8a.041612",
     "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"
+        "a3d597a8.021388",
+        "2f89ad50.333c2a",
+        "7f37398e.ac4788",
+        "c4c44808.41f1d8",
+        "7f311072.1019e",
+        "a4b5361a.3a19d8",
+        "22f4d985.fe3c1e",
+        "dc9eeea6.2c8698",
+        "7a27d008.22f4d",
+        "7fc66b60.eeacbc",
+        "4cc13ef6.adae78",
+        "19fd1bdb.1b78e4",
+        "d873f718.81f988",
+        "cea863c0.4ccb38",
+        "6825a3b9.0c4a74",
+        "97368f95.9c3c68",
+        "550c2be9.9018d4",
+        "540352c5.31c62c",
+        "87e2b691.2d12d8",
+        "25259a32.c04fe6",
+        "b87e18c5.0db5e8",
+        "88b90ca8.e250c"
       ]
     ]
   },
   {
-    "id": "5bfaebb4.b0d114",
+    "id": "7a27d008.22f4d",
     "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": 3931.566665649414,
+    "y": 3262.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "edf6563f.502118",
+    "id": "a3d597a8.021388",
     "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": 3879.566665649414,
+    "y": 3304.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "59e68189.ade8e8",
+    "id": "2f89ad50.333c2a",
     "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": 4008.566665649414,
+    "y": 3346.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c425c4b.b5f8838",
+    "id": "568e89f6.76041",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 3826,
-    "y": 3166,
-    "z": "f8944603.71553",
+    "x": 3854.566665649414,
+    "y": 3221.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "78e08e98.7c634",
+    "id": "cfc92e2e.d4332",
     "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": 4379.566665649414,
+    "y": 3742.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "39d89d00.a48b3c",
+    "id": "7f37398e.ac4788",
     "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": 3943.566665649414,
+    "y": 3781.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f51c657e.c3fcc8",
+    "id": "c4c44808.41f1d8",
     "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": 3891.566665649414,
+    "y": 3832.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "3b5e2d55.c49c42",
+    "id": "7f311072.1019e",
     "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": 4027.566665649414,
+    "y": 3879.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "62d7e2a.9cbc61c",
+    "id": "b73302ea.6b3c9",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 3856,
-    "y": 3686,
-    "z": "f8944603.71553",
+    "x": 3884.566665649414,
+    "y": 3741.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1f0597e7.f750d8",
+    "id": "f06d4892.086d48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4286,
-    "y": 3883,
-    "z": "f8944603.71553",
+    "x": 4314.566665649414,
+    "y": 3938.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c40c923d.ffb318",
+    "id": "a4b5361a.3a19d8",
     "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": 3905.566665649414,
+    "y": 3985.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b2dc6149.43ec28",
-        "f8c162ee.8e2a8",
-        "a8c36503.377908"
+        "7c79fc80.066eb4",
+        "c371f5b2.5890b8",
+        "8674a08a.891028"
       ]
     ]
   },
   {
-    "id": "b2dc6149.43ec28",
+    "id": "7c79fc80.066eb4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4124,
-    "y": 3884,
-    "z": "f8944603.71553",
+    "x": 4152.566665649414,
+    "y": 3939.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1f0597e7.f750d8"
+        "f06d4892.086d48"
       ]
     ]
   },
   {
-    "id": "f8c162ee.8e2a8",
+    "id": "c371f5b2.5890b8",
     "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": 4153.057632446289,
+    "y": 3985.1407012939453,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "244505cb.7c97da"
+        "f874dece.70a19"
       ]
     ]
   },
   {
-    "id": "a8c36503.377908",
+    "id": "8674a08a.891028",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4122,
-    "y": 3973,
-    "z": "f8944603.71553",
+    "x": 4150.566665649414,
+    "y": 4028.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fac0a6c3.57a578"
+        "395b0fd4.a6a4c"
       ]
     ]
   },
   {
-    "id": "244505cb.7c97da",
+    "id": "f874dece.70a19",
     "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": 4315.629043579102,
+    "y": 3985.4264373779297,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fac0a6c3.57a578",
+    "id": "395b0fd4.a6a4c",
     "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": 4319.566665649414,
+    "y": 4029.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f9369eb9.dd61b",
+    "id": "6825a3b9.0c4a74",
     "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": 3959.566665649414,
+    "y": 4327.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "dad20130.739d78",
+    "id": "97368f95.9c3c68",
     "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": 3962.566665649414,
+    "y": 4372.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "fdfcc8c4.b3e8a8",
+    "id": "540352c5.31c62c",
     "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": 3954.566665649414,
+    "y": 4100.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8b9dcfa3.01c508",
+    "id": "87e2b691.2d12d8",
     "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": 3956.566665649414,
+    "y": 4147.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ed841a30.7664d",
+    "id": "de9883f2.40e1e",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 3847,
-    "y": 4225,
-    "z": "f8944603.71553",
+    "x": 3875.566665649414,
+    "y": 4280.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7144ff5f.c519e8",
+    "id": "8e94a286.9bf3d",
     "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": 4485.566665649414,
+    "y": 4946.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "69d3ed18.577c3c",
+    "id": "172df7ad.1d8918",
     "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": 3740.566665649414,
+    "y": 5099.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ae7574f4.3ebe3",
-        "8bd2d4fd.8c4f1"
+        "42ddce9e.8ae7c",
+        "527e3f0b.1dc1d"
       ]
     ]
   },
   {
-    "id": "8bd2d4fd.8c4f1",
+    "id": "527e3f0b.1dc1d",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3884,
-    "y": 5041,
-    "z": "f8944603.71553",
+    "x": 3912.566665649414,
+    "y": 5096.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "439959aa.a8d0e"
+        "7bd89115.7af5d"
       ]
     ]
   },
   {
-    "id": "ae7574f4.3ebe3",
+    "id": "42ddce9e.8ae7c",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3836,
-    "y": 5888,
-    "z": "f8944603.71553",
+    "x": 3864.566665649414,
+    "y": 5943.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b05d129.ef1b1f"
+        "ba444b0.6d090b8"
       ]
     ]
   },
   {
-    "id": "bbd89123.3c84c8",
+    "id": "678feee9.54f5e",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3897,
-    "y": 5011,
-    "z": "f8944603.71553",
+    "x": 3925.566665649414,
+    "y": 5066.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "88e636e4.0ad278",
+    "id": "f4c6dae7.f846f8",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3907,
-    "y": 5846,
-    "z": "f8944603.71553",
+    "x": 3935.566665649414,
+    "y": 5901.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3d1335ab.d13122",
+    "id": "22f4d985.fe3c1e",
     "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": 3958.566665649414,
+    "y": 4475.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "439959aa.a8d0e",
+    "id": "7bd89115.7af5d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4060,
-    "y": 5043,
-    "z": "f8944603.71553",
+    "x": 4088.566665649414,
+    "y": 5098.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "398ca5b9.10ae92",
-        "26315d76.5ba5da",
-        "70413194.4e4218",
-        "36f7b692.fe5f9a",
-        "23762b83.94d65c",
-        "1981b041.f96778",
-        "7144ff5f.c519e8",
-        "d1a4e2c9.15ac9",
-        "24040f90.d6a4"
+        "a830956d.47074",
+        "1755eaf4.354305",
+        "bc42d413.82595",
+        "e6e246b3.ed891",
+        "ea96eb7.ae6d798",
+        "64dc9cdb.f55c8c",
+        "8e94a286.9bf3d",
+        "f715ac9f.9b32b8",
+        "79d51ab0.5a125c"
       ]
     ]
   },
   {
-    "id": "9b6d23e8.2f4c1",
+    "id": "979e33e8.311e38",
     "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": 5533.566665649414,
+    "y": 4571.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "398ca5b9.10ae92",
+    "id": "a830956d.47074",
     "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": 4466.566665649414,
+    "y": 5601.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "441ba30c.ae2a1c",
+    "id": "dc9eeea6.2c8698",
     "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": 3937.566665649414,
+    "y": 3475.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "32f3c697.c51f22",
+    "id": "7fc66b60.eeacbc",
     "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": 3935.566665649414,
+    "y": 2932.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f60b0d1b.343218",
+    "id": "4cc13ef6.adae78",
     "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": 3883.566665649414,
+    "y": 2980.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "51fbee04.79f4f",
+    "id": "19fd1bdb.1b78e4",
     "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": 4011.566665649414,
+    "y": 3027.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f3326814.1ece9",
+    "id": "49213484.6d2684",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 3820,
-    "y": 2835,
-    "z": "f8944603.71553",
+    "x": 3848.566665649414,
+    "y": 2890.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a2a5771a.032e88",
+    "id": "d873f718.81f988",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />",
     "comments": "",
     "outputs": 1,
-    "x": 3817,
-    "y": 3063,
-    "z": "f8944603.71553",
+    "x": 3845.566665649414,
+    "y": 3118.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "a39c337f.4b8598",
+    "id": "cea863c0.4ccb38",
     "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": 3938.566665649414,
+    "y": 3171.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "71641615.6f44c8",
+    "id": "8a16772c.f0d08",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 3801,
-    "y": 3019,
-    "z": "f8944603.71553",
+    "x": 3829.566665649414,
+    "y": 3074.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "11067d29.f83e4b",
+    "id": "d8aa6375.55f12",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3805,
-    "y": 3335,
-    "z": "f8944603.71553",
+    "x": 3833.566665649414,
+    "y": 3390.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "36f7b692.fe5f9a",
+    "id": "e6e246b3.ed891",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4374,
-    "y": 4524,
-    "z": "f8944603.71553",
+    "x": 4402.566665649414,
+    "y": 4579.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "fa6ec7f0.b5b858",
+    "id": "546f5300.a4bc44",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4358,
-    "y": 4480,
-    "z": "f8944603.71553",
+    "x": 4386.566665649414,
+    "y": 4535.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "87e40dc2.3dae2",
+    "id": "b36d849f.6b142",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5105,
-    "y": 4511,
-    "z": "f8944603.71553",
+    "x": 5133.566665649414,
+    "y": 4566.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a4406b4c.17bbc",
+    "id": "df003672.bddd2",
     "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": 5220.566665649414,
+    "y": 4608.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "18ca4a3.634f536",
+    "id": "dbb46179.c47f78",
     "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": 5168.566665649414,
+    "y": 4656.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b4f57662.21d798",
+    "id": "837adbb2.1c01e8",
     "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": 5296.566665649414,
+    "y": 4703.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "1981b041.f96778",
+    "id": "64dc9cdb.f55c8c",
     "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": 4473.566665649414,
+    "y": 4988.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "1ff0ab3b.554fd5",
+    "id": "f767aa90.80364",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4428,
-    "y": 4995,
-    "z": "f8944603.71553",
+    "x": 4456.566665649414,
+    "y": 5050.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "26315d76.5ba5da",
+    "id": "1755eaf4.354305",
     "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": 4567.566665649414,
+    "y": 5092.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "99476299.d65948",
+    "id": "4953b8d7.b454c8",
     "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": 5015.566665649414,
+    "y": 5145.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7e1b41de.44cf5",
+    "id": "b4d97863.c15da",
     "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": 4325.566665649414,
+    "y": 5843.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "99207b39.65e8d8",
+    "id": "d715f85a.00ec7",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4195,
-    "y": 5737,
-    "z": "f8944603.71553",
+    "x": 4223.566665649414,
+    "y": 5792.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "fc9d3b48.0b961",
+    "id": "5114dbce.799f0c",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4179,
-    "y": 5693,
-    "z": "f8944603.71553",
+    "x": 4207.566665649414,
+    "y": 5748.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cdbca407.a3714",
+    "id": "a495cbe2.05f3",
     "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": 4993.566665649414,
+    "y": 6005.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "70413194.4e4218",
+    "id": "bc42d413.82595",
     "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": 4394.566665649414,
+    "y": 5149.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9e68e3f9.d79778",
-        "3f3ed24c.0decee"
+        "5a8de4b.cef309c",
+        "99b44375.9d0098"
       ]
     ]
   },
   {
-    "id": "9e68e3f9.d79778",
+    "id": "5a8de4b.cef309c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4577,
-    "y": 5094,
-    "z": "f8944603.71553",
+    "x": 4605.566665649414,
+    "y": 5149.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e924e4da.1f13b"
+        "41a866cb.6d5e88"
       ]
     ]
   },
   {
-    "id": "e924e4da.1f13b",
+    "id": "41a866cb.6d5e88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4733,
-    "y": 5090,
-    "z": "f8944603.71553",
+    "x": 4761.566665649414,
+    "y": 5145.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "99476299.d65948",
-        "259aff1b.d97a1",
-        "b61f1c95.4694d"
+        "4953b8d7.b454c8",
+        "5f4b3cc4.eb62f4",
+        "76c11af1.9e9b94"
       ]
     ]
   },
   {
-    "id": "3f3ed24c.0decee",
+    "id": "99b44375.9d0098",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4573,
-    "y": 5142,
-    "z": "f8944603.71553",
+    "x": 4601.566665649414,
+    "y": 5197.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6bc2c49e.5247fc"
+        "c40ddff0.38613"
       ]
     ]
   },
   {
-    "id": "6bc2c49e.5247fc",
+    "id": "c40ddff0.38613",
     "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": 4749.566665649414,
+    "y": 5192.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "540d81b.ac8608",
+    "id": "e8bdf848.077f2",
     "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": 5257.566665649414,
+    "y": 4774.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e8527008.db6228",
+    "id": "5b668059.1f482",
     "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": 2423.566665649414,
+    "y": 185.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "a669b945.663408",
+    "id": "989a0e11.127538",
     "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": 2357.566665649414,
+    "y": 221.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ba20200a.599368",
+    "id": "e2d9aece.1465f",
     "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": 2542.566665649414,
+    "y": 148.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f5cafc97.3be338",
+    "id": "8228476b.dfc93",
     "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": 4292.566665649414,
+    "y": 5909.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "433677c1.52ee48",
+    "id": "394125b3.b0b57a",
     "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": 4425.566665649414,
+    "y": 5957.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "fabf4cab.b217e",
+    "id": "64250c00.f41444",
     "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": 4244.566665649414,
+    "y": 6015.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d58843e6.45b67",
-        "5480ce12.618198"
+        "24759095.ee144",
+        "cef50f43.3e9f48"
       ]
     ]
   },
   {
-    "id": "d58843e6.45b67",
+    "id": "24759095.ee144",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4409,
-    "y": 5961,
-    "z": "f8944603.71553",
+    "x": 4437.566665649414,
+    "y": 6016.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3584d606.ea3b92"
+        "c0599a44.570328"
       ]
     ]
   },
   {
-    "id": "3584d606.ea3b92",
+    "id": "c0599a44.570328",
     "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": 4593.566665649414,
+    "y": 6013.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5480ce12.618198",
+    "id": "cef50f43.3e9f48",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4413,
-    "y": 6005,
-    "z": "f8944603.71553",
+    "x": 4441.566665649414,
+    "y": 6060.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2c5800b.fe6138"
+        "2c2e6801.1f5998"
       ]
     ]
   },
   {
-    "id": "2c5800b.fe6138",
+    "id": "2c2e6801.1f5998",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4552,
-    "y": 6000,
-    "z": "f8944603.71553",
+    "x": 4580.566665649414,
+    "y": 6055.566665649414,
+    "z": "294b5e8a.041612",
     "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"
+        "a495cbe2.05f3",
+        "d341cf2c.6ddc78",
+        "882a079d.0537c8",
+        "9acad1b0.c8f3c8",
+        "1591d847.9e7b3",
+        "2e348bab.75e0fc",
+        "3c4d6cf1.e2588c",
+        "cf206ffb.cf7668",
+        "5a9ba33a.7d1a8c",
+        "68c1a73b.58dcd8",
+        "221756d1.77b252",
+        "6b274a0f.281994"
       ]
     ]
   },
   {
-    "id": "b92b2881.bc3e18",
+    "id": "3c4d6cf1.e2588c",
     "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": 4777.566665649414,
+    "y": 6734.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b068e9a3.d4db4",
-        "b79debc6.f268c",
-        "599f79e1.6940a8"
+        "f71173d.2556e9",
+        "36d425a2.cca582",
+        "63e9e58.35d851c"
       ]
     ]
   },
   {
-    "id": "b068e9a3.d4db4",
+    "id": "f71173d.2556e9",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4954,
-    "y": 6676,
-    "z": "f8944603.71553",
+    "x": 4982.566665649414,
+    "y": 6731.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "be7eb0d3.672b2"
+        "211a75a9.b19e7a"
       ]
     ]
   },
   {
-    "id": "b79debc6.f268c",
+    "id": "36d425a2.cca582",
     "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": 4966.057632446289,
+    "y": 6793.140701293945,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7384abca.e83424"
+        "2ef14bb4.55e2cc"
       ]
     ]
   },
   {
-    "id": "599f79e1.6940a8",
+    "id": "63e9e58.35d851c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4935,
-    "y": 6781,
-    "z": "f8944603.71553",
+    "x": 4963.566665649414,
+    "y": 6836.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5c72f79d.0cafa"
+        "61cb6aef.0faa54"
       ]
     ]
   },
   {
-    "id": "be7eb0d3.672b2",
+    "id": "211a75a9.b19e7a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5110,
-    "y": 6690,
-    "z": "f8944603.71553",
+    "x": 5138.566665649414,
+    "y": 6745.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "477f7936.afbf38"
+        "1dafef09.17b7d9"
       ]
     ]
   },
   {
-    "id": "7384abca.e83424",
+    "id": "2ef14bb4.55e2cc",
     "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": 5128.629043579102,
+    "y": 6793.42643737793,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5c72f79d.0cafa",
+    "id": "61cb6aef.0faa54",
     "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": 5130.566665649414,
+    "y": 6835.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "477f7936.afbf38",
+    "id": "1dafef09.17b7d9",
     "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": 5385.566665649414,
+    "y": 6742.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8d0d8dd8.5dff18"
+        "33d48bc3.4a3004"
       ]
     ]
   },
   {
-    "id": "8d0d8dd8.5dff18",
+    "id": "33d48bc3.4a3004",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5594,
-    "y": 6683,
-    "z": "f8944603.71553",
+    "x": 5622.566665649414,
+    "y": 6738.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "234239f1.092ec6"
+        "509c6355.839cf4"
       ]
     ]
   },
   {
-    "id": "af0f93b9.f63018",
+    "id": "9a8b6da5.4a6238",
     "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": 5865.566665649414,
+    "y": 6710.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1906307e.4f6708",
-        "7e26fbb1.9c733c"
+        "4704615c.3c69f",
+        "3a6fe540.e42ee2"
       ]
     ]
   },
   {
-    "id": "1906307e.4f6708",
+    "id": "4704615c.3c69f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6042,
-    "y": 6675,
-    "z": "f8944603.71553",
+    "x": 6070.566665649414,
+    "y": 6730.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "234239f1.092ec6"
+        "509c6355.839cf4"
       ]
     ]
   },
   {
-    "id": "7e26fbb1.9c733c",
+    "id": "3a6fe540.e42ee2",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6041,
-    "y": 6628,
-    "z": "f8944603.71553",
+    "x": 6069.566665649414,
+    "y": 6683.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "234239f1.092ec6",
+    "id": "509c6355.839cf4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4785,
-    "y": 6950,
-    "z": "f8944603.71553",
+    "x": 4813.566665649414,
+    "y": 7005.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9c243a63.6beae8"
+        "867fbf45.6b76e8"
       ]
     ]
   },
   {
-    "id": "7d275a16.b90c94",
+    "id": "b664359c.e37a3",
     "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": 6275.566635131836,
+    "y": 6943.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "62c83b20.7bb344",
+    "id": "125d4567.492113",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4847,
-    "y": 6626,
-    "z": "f8944603.71553",
+    "x": 4875.566665649414,
+    "y": 6681.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cf9d9601.e8d088",
+    "id": "2e348bab.75e0fc",
     "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": 4757.566665649414,
+    "y": 6569.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fb325d12.16a73",
+    "id": "cf763643.011b",
     "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": 5102.566665649414,
+    "y": 6400.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2ae3447b.0a1c44"
+        "e8f56973.27478"
       ]
     ]
   },
   {
-    "id": "2ae3447b.0a1c44",
+    "id": "e8f56973.27478",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5294,
-    "y": 6351,
-    "z": "f8944603.71553",
+    "x": 5322.566665649414,
+    "y": 6406.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "47fb23b1.c734fc"
+        "fde5a354.539f28"
       ]
     ]
   },
   {
-    "id": "47fb23b1.c734fc",
+    "id": "fde5a354.539f28",
     "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": 5509.566665649414,
+    "y": 6366.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "504a47cd.0300d8"
+        "575e4bf2.eff614"
       ]
     ]
   },
   {
-    "id": "504a47cd.0300d8",
+    "id": "575e4bf2.eff614",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5673,
-    "y": 6314,
-    "z": "f8944603.71553",
+    "x": 5701.566665649414,
+    "y": 6369.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "70b7cd06.f487e4"
+        "d993f92.1703888"
       ]
     ]
   },
   {
-    "id": "70b7cd06.f487e4",
+    "id": "d993f92.1703888",
     "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": 5910.566665649414,
+    "y": 6367.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "19e51740.b8f8a1",
+    "id": "cf206ffb.cf7668",
     "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": 4809.566665649414,
+    "y": 6394.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fb325d12.16a73"
+        "cf763643.011b"
       ]
     ]
   },
   {
-    "id": "252b791f.9db75e",
+    "id": "882a079d.0537c8",
     "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": 4817.566665649414,
+    "y": 6287.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ab2e0e9b.e6e2a",
-        "175d6a26.e8f2ae",
-        "30472c6d.7bfeec"
+        "bc620ade.df0f58",
+        "6623a49b.f6c65c",
+        "19b34b3d.8c8655"
       ]
     ]
   },
   {
-    "id": "ab2e0e9b.e6e2a",
+    "id": "bc620ade.df0f58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5025,
-    "y": 6215,
-    "z": "f8944603.71553",
+    "x": 5053.566665649414,
+    "y": 6270.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "175d6a26.e8f2ae",
+    "id": "6623a49b.f6c65c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5022,
-    "y": 6256,
-    "z": "f8944603.71553",
+    "x": 5050.566665649414,
+    "y": 6311.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "30472c6d.7bfeec",
+    "id": "19b34b3d.8c8655",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5036,
-    "y": 6296,
-    "z": "f8944603.71553",
+    "x": 5064.566665649414,
+    "y": 6351.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "275b22ee.4a806e",
+    "id": "9acad1b0.c8f3c8",
     "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": 4753.566665649414,
+    "y": 6446.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "331c47e0.bff598",
+    "id": "1591d847.9e7b3",
     "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": 4761.566665649414,
+    "y": 6504.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "908326bd.db0de8",
+    "id": "d341cf2c.6ddc78",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4738,
-    "y": 6189,
-    "z": "f8944603.71553",
+    "x": 4766.566665649414,
+    "y": 6244.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8ef1afe7.71ad38",
+    "id": "2fabd91.b08d0a6",
     "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": 4881.566665649414,
+    "y": 6196.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9c243a63.6beae8",
+    "id": "867fbf45.6b76e8",
     "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": 5056.566665649414,
+    "y": 7002.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "14533561.0c5673",
-        "af779ea0.7fb81"
+        "ca20f18b.d4eba8",
+        "a546871e.5bfa7"
       ]
     ]
   },
   {
-    "id": "14533561.0c5673",
+    "id": "ca20f18b.d4eba8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5257,
-    "y": 6924,
-    "z": "f8944603.71553",
+    "x": 5285.566665649414,
+    "y": 6979.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "55635f65.d76ee8"
+        "4274d693.44e7"
       ]
     ]
   },
   {
-    "id": "af779ea0.7fb81",
+    "id": "a546871e.5bfa7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5257,
-    "y": 6973,
-    "z": "f8944603.71553",
+    "x": 5285.566665649414,
+    "y": 7028.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "494eed0f.99eb84",
+    "id": "9d07c8b0.2ee89",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5989.999969482422,
-    "y": 6978.999969482422,
-    "z": "f8944603.71553",
+    "x": 6018.566635131836,
+    "y": 7034.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6ed262af.6482c4",
-        "7d275a16.b90c94",
-        "ea085aad.03ece"
+        "90c25785.3a5d5",
+        "b664359c.e37a3",
+        "9e3c844f.310898"
       ]
     ]
   },
   {
-    "id": "eb8bdae2.80aaf8",
+    "id": "8461f132.9df9d8",
     "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": 6403.566635131836,
+    "y": 6997.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ea085aad.03ece",
+    "id": "9e3c844f.310898",
     "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": 6373.566635131836,
+    "y": 7057.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "6ed262af.6482c4",
+    "id": "90c25785.3a5d5",
     "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": 6280.566635131836,
+    "y": 6885.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b05d129.ef1b1f",
+    "id": "ba444b0.6d090b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3988,
-    "y": 5887,
-    "z": "f8944603.71553",
+    "x": 4016.566665649414,
+    "y": 5942.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "99207b39.65e8d8",
-        "f5cafc97.3be338",
-        "433677c1.52ee48",
-        "fabf4cab.b217e",
-        "7e1b41de.44cf5"
+        "d715f85a.00ec7",
+        "8228476b.dfc93",
+        "394125b3.b0b57a",
+        "64250c00.f41444",
+        "b4d97863.c15da"
       ]
     ]
   },
   {
-    "id": "e2f1cfff.a8b258",
+    "id": "c0768f56.37d61",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4730,
-    "y": 6289,
-    "z": "f8944603.71553",
+    "x": 4758.566665649414,
+    "y": 6344.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "2ded21f8.219046",
+    "id": "5a9ba33a.7d1a8c",
     "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": 4886.566665649414,
+    "y": 6086.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a18264c.6d9e",
+    "id": "42948c30.98f5ec",
     "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": 5023.566665649414,
+    "y": 6036.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "124ab46d.2d752c",
+    "id": "550c2be9.9018d4",
     "type": "save",
     "name": "save ROOT UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3822,
-    "y": 3374,
-    "z": "f8944603.71553",
+    "x": 3850.566665649414,
+    "y": 3429.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "826efc02.44c7b",
+    "id": "371edf0a.6e17f",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3999.999969482422,
-    "y": 1608.9999694824219,
-    "z": "f8944603.71553",
+    "x": 4028.566635131836,
+    "y": 1664.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3746cfac.cfad98",
+    "id": "de567305.4a43d8",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3978.9999389648438,
-    "y": 2120.9999389648438,
-    "z": "f8944603.71553",
+    "x": 4007.566604614258,
+    "y": 2176.566604614258,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b5ea3d16.fd41f",
+    "id": "25146472.eb3624",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 3814,
-    "y": 3995,
-    "z": "f8944603.71553",
+    "x": 3842.566665649414,
+    "y": 4050.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9d7f2116.baeda",
+    "id": "c5539a8b.106aa",
     "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": 3932.566665649414,
+    "y": 6430.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f2a7dc4a.68ede",
+    "id": "e9491637.d51c9",
     "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": 3734.566665649414,
+    "y": 4959.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a789852e.51cd48",
+    "id": "ed589f33.dee34",
     "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": 3867.566665649414,
+    "y": 5007.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "23762b83.94d65c",
+    "id": "ea96eb7.ae6d798",
     "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": 4413.566665649414,
+    "y": 4635.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e4f34350.306628",
-        "84eda9bb.13e58"
+        "a8f10916.be28b",
+        "f59d19a8.d9c4d8"
       ]
     ]
   },
   {
-    "id": "e4f34350.306628",
+    "id": "a8f10916.be28b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4578,
-    "y": 4581,
-    "z": "f8944603.71553",
+    "x": 4606.566665649414,
+    "y": 4636.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d93f9a59.274b5"
+        "f728dec2.62b3a"
       ]
     ]
   },
   {
-    "id": "84eda9bb.13e58",
+    "id": "f59d19a8.d9c4d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4582,
-    "y": 4625,
-    "z": "f8944603.71553",
+    "x": 4610.566665649414,
+    "y": 4680.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fa8add54.9c2898"
+        "c09bd16a.0b32d"
       ]
     ]
   },
   {
-    "id": "fa8add54.9c2898",
+    "id": "c09bd16a.0b32d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4721,
-    "y": 4620,
-    "z": "f8944603.71553",
+    "x": 4749.566665649414,
+    "y": 4675.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "48346123.4f10a8",
-        "5e210590.033b4c",
-        "140ccb32.dd72dd"
+        "d9114bfc.f7bce",
+        "6c2541da.5d16b8",
+        "b22f3c73.35c508"
       ]
     ]
   },
   {
-    "id": "d93f9a59.274b5",
+    "id": "f728dec2.62b3a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4721,
-    "y": 4577,
-    "z": "f8944603.71553",
+    "x": 4749.566665649414,
+    "y": 4632.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a4406b4c.17bbc",
-        "18ca4a3.634f536",
-        "b4f57662.21d798",
-        "540d81b.ac8608"
+        "df003672.bddd2",
+        "dbb46179.c47f78",
+        "837adbb2.1c01e8",
+        "e8bdf848.077f2"
       ]
     ]
   },
   {
-    "id": "48346123.4f10a8",
+    "id": "d9114bfc.f7bce",
     "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": 5151.566909790039,
+    "y": 4897.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "54a11c60.7fd1ec",
+    "id": "430a9d16.e4affc",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5130.000244140625,
-    "y": 4796,
-    "z": "f8944603.71553",
+    "x": 5158.566909790039,
+    "y": 4851.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a0a762d0.469c28",
+    "id": "68c1a73b.58dcd8",
     "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": 4948.566665649414,
+    "y": 6630.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "5e210590.033b4c",
+    "id": "6c2541da.5d16b8",
     "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": 5269.566909790039,
+    "y": 4939.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "259aff1b.d97a1",
+    "id": "5f4b3cc4.eb62f4",
     "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": 5144.566665649414,
+    "y": 5197.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "80314ddc.393748",
+    "id": "c7484b6a.1b27e8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3461,
-    "y": 4475,
-    "z": "f8944603.71553",
+    "x": 3489.566665649414,
+    "y": 4530.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d1326c21.abc33",
+    "id": "8eb23d5.90166c",
     "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": 4011.566665649414,
+    "y": 4631.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "434bd8c2.bae4f8",
+    "id": "8bbbb496.3df16",
     "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": 3468.566665649414,
+    "y": 4574.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7ea7dff4.93abc",
-        "616c8d40.285e14",
-        "ffe0a536.7eaff8"
+        "a18c125a.02e14",
+        "7f2705d6.db1694",
+        "a9eb2c91.698e38"
       ]
     ]
   },
   {
-    "id": "616c8d40.285e14",
+    "id": "7f2705d6.db1694",
     "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": 3657.057632446289,
+    "y": 4543.140884399414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "739b53.f4a4fcac"
+        "2e3353bd.ee574c"
       ]
     ]
   },
   {
-    "id": "ffe0a536.7eaff8",
+    "id": "a9eb2c91.698e38",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3617,
-    "y": 4527,
-    "z": "f8944603.71553",
+    "x": 3645.566665649414,
+    "y": 4582.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "68d1064e.ebb3b8"
+        "5c8fdc07.865394"
       ]
     ]
   },
   {
-    "id": "739b53.f4a4fcac",
+    "id": "2e3353bd.ee574c",
     "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": 3816.629165649414,
+    "y": 4541.426528930664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "68d1064e.ebb3b8",
+    "id": "5c8fdc07.865394",
     "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": 3806.566665649414,
+    "y": 4583.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "aedbd8f5.94f11",
+    "id": "9ccbfbe.3763808",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3780,
-    "y": 4572,
-    "z": "f8944603.71553",
+    "x": 3808.566665649414,
+    "y": 4627.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "530f885c.d5a28",
-        "d1326c21.abc33"
+        "b718fb4d.1d2eb",
+        "8eb23d5.90166c"
       ]
     ]
   },
   {
-    "id": "7ea7dff4.93abc",
+    "id": "a18c125a.02e14",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3622,
-    "y": 4564,
-    "z": "f8944603.71553",
+    "x": 3650.566665649414,
+    "y": 4619.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aedbd8f5.94f11"
+        "9ccbfbe.3763808"
       ]
     ]
   },
   {
-    "id": "530f885c.d5a28",
+    "id": "b718fb4d.1d2eb",
     "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": 3969.566665649414,
+    "y": 4559.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cd1fc06c.124968",
+    "id": "581d9366.e6ee44",
     "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": 3834.566665649414,
+    "y": 4898.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ac8fc812.ca8b88",
+    "id": "3bda63fd.be934c",
     "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": 5949.449966430664,
+    "y": 6648.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "140ccb32.dd72dd",
+    "id": "b22f3c73.35c508",
     "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": 5149.233901977539,
+    "y": 5035.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "60fccea7.c83a28",
+    "id": "72bb0449.7c6c4c",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5122.884033203125,
-    "y": 4939.88330078125,
-    "z": "f8944603.71553",
+    "x": 5151.450698852539,
+    "y": 4995.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b61f1c95.4694d",
+    "id": "76c11af1.9e9b94",
     "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": 5025.233657836914,
+    "y": 5285.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "82a40a13.767da8",
+    "id": "9cb7b649.72fc8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4998.8837890625,
-    "y": 5189.88330078125,
-    "z": "f8944603.71553",
+    "x": 5027.450454711914,
+    "y": 5245.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "91bd4596.74f628",
+    "id": "ac700fc2.3e2c98",
     "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": 5115.033462524414,
+    "y": 5648.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f50c2a2e.93dfe8",
+    "id": "9aeab5a.07483c8",
     "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": 4942.033462524414,
+    "y": 5705.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8646fa93.554c38",
-        "a6ded94a.e3e54"
+        "7adad055.f81858",
+        "1c623aa1.b56e9d"
       ]
     ]
   },
   {
-    "id": "8646fa93.554c38",
+    "id": "7adad055.f81858",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5124.466796875,
-    "y": 5649.5166015625,
-    "z": "f8944603.71553",
+    "x": 5153.033462524414,
+    "y": 5705.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "258b63bd.85fb7c"
+        "8b4d22b1.51563"
       ]
     ]
   },
   {
-    "id": "a6ded94a.e3e54",
+    "id": "1c623aa1.b56e9d",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5120.466796875,
-    "y": 5697.5166015625,
-    "z": "f8944603.71553",
+    "x": 5149.033462524414,
+    "y": 5753.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d925f9fa.8153b8"
+        "1d139b8d.b9ffb4"
       ]
     ]
   },
   {
-    "id": "258b63bd.85fb7c",
+    "id": "8b4d22b1.51563",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5280.466796875,
-    "y": 5645.5166015625,
-    "z": "f8944603.71553",
+    "x": 5309.033462524414,
+    "y": 5701.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8d6cf51e.6059f8",
-        "44488697.cdb02",
-        "c9ce352b.46ce88"
+        "f5948089.056778",
+        "eda1ec63.f88a8",
+        "116803c1.b8c5c4"
       ]
     ]
   },
   {
-    "id": "d925f9fa.8153b8",
+    "id": "1d139b8d.b9ffb4",
     "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": 5297.033462524414,
+    "y": 5748.083267211914,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "df7464c9.77f0d",
+    "id": "fa3077ab.1dba8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5590.3505859375,
-    "y": 5746.39990234375,
-    "z": "f8944603.71553",
+    "x": 5618.917251586914,
+    "y": 5801.966567993164,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c9ce352b.46ce88",
+    "id": "116803c1.b8c5c4",
     "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": 5622.700454711914,
+    "y": 5840.166763305664,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "44488697.cdb02",
+    "id": "eda1ec63.f88a8",
     "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": 5729.033462524414,
+    "y": 5753.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8d6cf51e.6059f8",
+    "id": "f5948089.056778",
     "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": 5613.033462524414,
+    "y": 5701.083267211914,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7e224339.ebcda4",
+    "id": "d30afa49.07b758",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4975.466796875,
-    "y": 5550.5166015625,
-    "z": "f8944603.71553",
+    "x": 5004.033462524414,
+    "y": 5606.083267211914,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "60c16c76.a98d34",
+    "id": "221756d1.77b252",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4687.7998046875,
-    "y": 5725.5166015625,
-    "z": "f8944603.71553",
+    "x": 4716.366470336914,
+    "y": 5781.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "91bd4596.74f628",
-        "f50c2a2e.93dfe8",
-        "b08c7802.5d204",
-        "7492e58a.da53dc"
+        "ac700fc2.3e2c98",
+        "9aeab5a.07483c8",
+        "986cd5c9.02e9d",
+        "cfe4284f.245dc"
       ]
     ]
   },
   {
-    "id": "8396080f.a7f6c8",
+    "id": "6b274a0f.281994",
     "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": 5016.399673461914,
+    "y": 6141.766860961914,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e07ba4bc.bfaae8",
+    "id": "9356e875.de45c8",
     "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": 5822.683334350586,
+    "y": 6978.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "55635f65.d76ee8",
+    "id": "4274d693.44e7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5413.116668701172,
-    "y": 6926.116668701172,
-    "z": "f8944603.71553",
+    "x": 5441.683334350586,
+    "y": 6981.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e07ba4bc.bfaae8",
-        "d0282e45.27576",
-        "be279863.754a6"
+        "9356e875.de45c8",
+        "f4fb32f5.290118",
+        "fc73441.6e16238"
       ]
     ]
   },
   {
-    "id": "d0282e45.27576",
+    "id": "f4fb32f5.290118",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5639.116668701172,
-    "y": 6978.116668701172,
-    "z": "f8944603.71553",
+    "x": 5667.683334350586,
+    "y": 7033.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "adb0d898.09cba8"
+        "7d48e95d.36571"
       ]
     ]
   },
   {
-    "id": "adb0d898.09cba8",
+    "id": "7d48e95d.36571",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5818.116668701172,
-    "y": 6977.116668701172,
-    "z": "f8944603.71553",
+    "x": 5846.683334350586,
+    "y": 7032.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "494eed0f.99eb84"
+        "9d07c8b0.2ee89"
       ]
     ]
   },
   {
-    "id": "be279863.754a6",
+    "id": "fc73441.6e16238",
     "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": 5668.683334350586,
+    "y": 6926.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3cd9264c.3cdbea",
+    "id": "c7583bfe.6dbd",
     "type": "notify",
     "name": "notify",
     "xml": "<notify plugin='' resource='' action='' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2634.116668701172,
-    "y": 920.1166687011719,
-    "z": "f8944603.71553",
+    "x": 2662.683334350586,
+    "y": 975.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "d4db1de6.243c9",
+    "id": "17e6527f.ea49de",
     "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": 3340.683334350586,
+    "y": 751.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b2eea3d4.d83b2",
+    "id": "4ef95e12.fd687",
     "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": 3556.683334350586,
+    "y": 1079.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c92a9c74.6d8cb",
+    "id": "76cbe80c.f4e188",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3523.625732421875,
-    "y": 1066.542724609375,
-    "z": "f8944603.71553",
+    "x": 3552.192398071289,
+    "y": 1122.109390258789,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "be6d3c2.c1bdfc",
+    "id": "2e93ec7e.d04c6c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3527.625701904297,
-    "y": 1114.5426940917969,
-    "z": "f8944603.71553",
+    "x": 3556.192367553711,
+    "y": 1170.109359741211,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "82044de7.824378"
+        "b4c3abcb.bb0aa8"
       ]
     ]
   },
   {
-    "id": "82044de7.824378",
+    "id": "b4c3abcb.bb0aa8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3685.116668701172,
-    "y": 1114.1166687011719,
-    "z": "f8944603.71553",
+    "x": 3713.683334350586,
+    "y": 1169.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9732d3c5.76e0c8"
+        "c59d6859.c80d1"
       ]
     ]
   },
   {
-    "id": "9732d3c5.76e0c8",
+    "id": "c59d6859.c80d1",
     "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": 3883.683364868164,
+    "y": 1172.6834869384766,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7d1d73b.5c3fc8c",
-        "8cd6f95a.d7c4d",
-        "68098f91.a64618"
+        "b806c285.3c1eb",
+        "1890bb58.2d4ee5",
+        "614f0a7f.a53cf4"
       ]
     ]
   },
   {
-    "id": "7d1d73b.5c3fc8c",
+    "id": "b806c285.3c1eb",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4029.116668701172,
-    "y": 1055.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4057.683334350586,
+    "y": 1110.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a9479bec.894888"
+        "224fa1be.62b94e"
       ]
     ]
   },
   {
-    "id": "8cd6f95a.d7c4d",
+    "id": "1890bb58.2d4ee5",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4031.116668701172,
-    "y": 1109.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4059.683334350586,
+    "y": 1164.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d844935e.741748"
+        "5ec2cf4e.ba2b2"
       ]
     ]
   },
   {
-    "id": "a9479bec.894888",
+    "id": "224fa1be.62b94e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4157.116668701172,
-    "y": 1055.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4185.683334350586,
+    "y": 1110.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7a232bae.539a2c",
-        "19f7263a.0f2e72"
+        "a900cf11.02bcd",
+        "1c2b8eb2.2e6009"
       ]
     ]
   },
   {
-    "id": "d844935e.741748",
+    "id": "5ec2cf4e.ba2b2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4160.116668701172,
-    "y": 1108.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4188.683334350586,
+    "y": 1163.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e31191f4.c7e44",
-        "c783c2e3.52d62"
+        "459af4e0.72f56c",
+        "8371ef21.19884"
       ]
     ]
   },
   {
-    "id": "19f7263a.0f2e72",
+    "id": "1c2b8eb2.2e6009",
     "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": 4346.683334350586,
+    "y": 1134.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e31191f4.c7e44",
+    "id": "459af4e0.72f56c",
     "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": 4363.683334350586,
+    "y": 1176.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c783c2e3.52d62",
+    "id": "8371ef21.19884",
     "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": 4348.683334350586,
+    "y": 1214.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7a232bae.539a2c",
+    "id": "a900cf11.02bcd",
     "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": 4360.683334350586,
+    "y": 1094.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5dbb2ad5.55ee04",
+    "id": "f4867be8.a3739",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4497.116668701172,
-    "y": 1055.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4525.683334350586,
+    "y": 1110.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4c9f1a43.e137e4",
+    "id": "c22e8ab9.0a6b88",
     "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": 3316.683334350586,
+    "y": 1096.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b2eea3d4.d83b2",
-        "c92a9c74.6d8cb",
-        "be6d3c2.c1bdfc"
+        "4ef95e12.fd687",
+        "76cbe80c.f4e188",
+        "2e93ec7e.d04c6c"
       ]
     ]
   },
   {
-    "id": "68098f91.a64618",
+    "id": "614f0a7f.a53cf4",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3974.116668701172,
-    "y": 1173.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4002.683334350586,
+    "y": 1228.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3baeb12d.78947e"
+        "7f1b4232.b1cfb4"
       ]
     ]
   },
   {
-    "id": "3baeb12d.78947e",
+    "id": "7f1b4232.b1cfb4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4148.116668701172,
-    "y": 1168.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4176.683334350586,
+    "y": 1223.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f32a06d7.18ee6",
-        "9c8c5f6f.4f4828"
+        "838abc45.59f7a",
+        "db00c52c.5ed268"
       ]
     ]
   },
   {
-    "id": "9c8c5f6f.4f4828",
+    "id": "db00c52c.5ed268",
     "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": 4346.683334350586,
+    "y": 1296.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f32a06d7.18ee6",
+    "id": "838abc45.59f7a",
     "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": 4400.683334350586,
+    "y": 1256.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "89b3411b.fe2cb",
+    "id": "ff2b32b5.5b2a08",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4486.116668701172,
-    "y": 1226.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4514.683334350586,
+    "y": 1281.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fe4b773c.0eae98",
+    "id": "56529717.d57cf",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4045.116668701172,
-    "y": 929.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4073.683334350586,
+    "y": 984.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a6d4107d.6655f"
+        "ee2de2c6.4f08d8"
       ]
     ]
   },
   {
-    "id": "e8ae3a08.56b988",
+    "id": "ca426e77.b8a868",
     "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": 4417.683334350586,
+    "y": 1052.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8ecb2104.b1fc58",
+    "id": "f04a072d.a1bc78",
     "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": 4471.683334350586,
+    "y": 1012.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a817660e.e9d2",
+    "id": "494ac499.527a64",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4587.116668701172,
-    "y": 986.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4615.683334350586,
+    "y": 1041.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a6d4107d.6655f",
+    "id": "ee2de2c6.4f08d8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4219.116668701172,
-    "y": 924.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4247.683334350586,
+    "y": 979.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8ecb2104.b1fc58",
-        "e8ae3a08.56b988"
+        "f04a072d.a1bc78",
+        "ca426e77.b8a868"
       ]
     ]
   },
   {
-    "id": "83ce05e.7f315f8",
+    "id": "fbdccf10.5fabc",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4105.116668701172,
-    "y": 667.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4133.683334350586,
+    "y": 722.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d03cb873.c57328"
+        "b0420846.4df49"
       ]
     ]
   },
   {
-    "id": "2049e56d.3172ca",
+    "id": "6f89ab47.26e854",
     "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": 4477.683334350586,
+    "y": 790.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6995e48e.171b9c",
+    "id": "bf3e885.5679178",
     "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": 4531.683334350586,
+    "y": 750.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "80fe4b30.9273d",
+    "id": "fd3136c3.1f9f9",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4617.116668701172,
-    "y": 720.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4645.683334350586,
+    "y": 775.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d03cb873.c57328",
+    "id": "b0420846.4df49",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4279.116668701172,
-    "y": 662.1166687011719,
-    "z": "f8944603.71553",
+    "x": 4307.683334350586,
+    "y": 717.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6995e48e.171b9c",
-        "2049e56d.3172ca"
+        "bf3e885.5679178",
+        "6f89ab47.26e854"
       ]
     ]
   },
   {
-    "id": "d8eb368d.7e35e8",
+    "id": "d5e167ce.f19998",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3686.116668701172,
-    "y": 2544.116668701172,
-    "z": "f8944603.71553",
+    "x": 3714.683334350586,
+    "y": 2599.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9d31c4f.62b63b8",
-        "42d540.6e2552c"
+        "eb74e655.05ff7",
+        "e886ebc1.1661e8"
       ]
     ]
   },
   {
-    "id": "4acebe87.51a2e",
+    "id": "47201997.7cc3c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3513.450164794922,
-    "y": 2545.116668701172,
-    "z": "f8944603.71553",
+    "x": 3542.016830444336,
+    "y": 2600.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d8eb368d.7e35e8"
+        "d5e167ce.f19998"
       ]
     ]
   },
   {
-    "id": "faf79ca9.39c718",
+    "id": "164be473.b70384",
     "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": 3551.507797241211,
+    "y": 2643.257369995117,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "760b8826.a76aa",
+    "id": "784aa04.7c1dfe",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3511.450164794922,
-    "y": 2634.116668701172,
-    "z": "f8944603.71553",
+    "x": 3540.016830444336,
+    "y": 2689.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d31c4f.62b63b8",
+    "id": "eb74e655.05ff7",
     "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": 4001.016830444336,
+    "y": 2603.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "beea1414.622ca8",
-        "e0900c85.f5153"
+        "3f64df6c.c641f8",
+        "e65de275.42f878"
       ]
     ]
   },
   {
-    "id": "e0900c85.f5153",
+    "id": "e65de275.42f878",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4195.450164794922,
-    "y": 2503.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4224.016830444336,
+    "y": 2558.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b1fce547.cdefa8"
+        "34b4944b.960704"
       ]
     ]
   },
   {
-    "id": "beea1414.622ca8",
+    "id": "3f64df6c.c641f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4197.450164794922,
-    "y": 2567.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4226.016830444336,
+    "y": 2622.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1f2077c9.d2f12"
+        "699d84d7.6602fc"
       ]
     ]
   },
   {
-    "id": "1931dff5.72d728",
+    "id": "9c75cfb6.9dae68",
     "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": 3314.016830444336,
+    "y": 2635.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4acebe87.51a2e",
-        "faf79ca9.39c718",
-        "760b8826.a76aa"
+        "47201997.7cc3c",
+        "164be473.b70384",
+        "784aa04.7c1dfe"
       ]
     ]
   },
   {
-    "id": "20a2805c.f7ce68",
+    "id": "23b8fd1e.0cb2fa",
     "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": 3275.016830444336,
+    "y": 2579.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f953800.9cf34",
+    "id": "647f2e19.e50158",
     "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": 3334.016830444336,
+    "y": 2375.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1523d633.28a802",
-        "23587c7d.fbba4c"
+        "5e42c344.eae60c",
+        "af9299b9.b3a958"
       ]
     ]
   },
   {
-    "id": "23587c7d.fbba4c",
+    "id": "af9299b9.b3a958",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3528.450164794922,
-    "y": 2306.116668701172,
-    "z": "f8944603.71553",
+    "x": 3557.016830444336,
+    "y": 2361.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c7b4b7e7.8e8b78"
+        "9102a653.17d73"
       ]
     ]
   },
   {
-    "id": "1523d633.28a802",
+    "id": "5e42c344.eae60c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3530.450164794922,
-    "y": 2339.116668701172,
-    "z": "f8944603.71553",
+    "x": 3559.016830444336,
+    "y": 2394.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7b4b7e7.8e8b78",
+    "id": "9102a653.17d73",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3676.450164794922,
-    "y": 2299.116668701172,
-    "z": "f8944603.71553",
+    "x": 3705.016830444336,
+    "y": 2354.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cb965cfe.67a2f",
-        "1a7add8d.af97ca"
+        "9818833d.58ad9",
+        "288d55d1.6f744a"
       ]
     ]
   },
   {
-    "id": "cb965cfe.67a2f",
+    "id": "9818833d.58ad9",
     "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": 3899.016830444336,
+    "y": 2357.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "42d540.6e2552c",
+    "id": "e886ebc1.1661e8",
     "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": 3952.016799926758,
+    "y": 2726.683303833008,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b84e7511.3844a8"
+        "f013a1b2.101138"
       ]
     ]
   },
   {
-    "id": "b84e7511.3844a8",
+    "id": "f013a1b2.101138",
     "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": 4158.016799926758,
+    "y": 2726.683303833008,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ac19c527.29aaf8"
+        "386bba62.16259e"
       ]
     ]
   },
   {
-    "id": "1a7add8d.af97ca",
+    "id": "288d55d1.6f744a",
     "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": 3921.016830444336,
+    "y": 2425.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c6c93f82.1aa228",
-        "f4da497f.0275c8",
-        "6e9758a5.eabec"
+        "50cea31f.42d1c4",
+        "35a7b03.f8d85d",
+        "21702f57.67315"
       ]
     ]
   },
   {
-    "id": "c6c93f82.1aa228",
+    "id": "50cea31f.42d1c4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4087.9502868652344,
-    "y": 2322.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4116.516952514648,
+    "y": 2377.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a1f1dc1c.4be4e8"
+        "295cc726.ea872"
       ]
     ]
   },
   {
-    "id": "f4da497f.0275c8",
+    "id": "35a7b03.f8d85d",
     "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": 4108.516952514648,
+    "y": 2432.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dd2530b3.0ce388"
+        "2c7fef61.a7451"
       ]
     ]
   },
   {
-    "id": "6e9758a5.eabec",
+    "id": "21702f57.67315",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4084.9502868652344,
-    "y": 2434.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4113.516952514648,
+    "y": 2489.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "35cb1b46.9ab3ac"
+        "9bbdca0e.a0cf58"
       ]
     ]
   },
   {
-    "id": "35cb1b46.9ab3ac",
+    "id": "9bbdca0e.a0cf58",
     "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": 4265.516952514648,
+    "y": 2490.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a1f1dc1c.4be4e8",
+    "id": "295cc726.ea872",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4232.332611083984,
-    "y": 2319.7724609375,
-    "z": "f8944603.71553",
+    "x": 4260.899276733398,
+    "y": 2375.339126586914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "807e8aa5.b5f288"
+        "723c9a0.e71c268"
       ]
     ]
   },
   {
-    "id": "be1fed24.75522",
+    "id": "9a8ce081.e6446",
     "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": 3336.683334350586,
+    "y": 2714.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "89002347.f12fb8",
+    "id": "c2ddeb07.7a6948",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3983.1166381835938,
-    "y": 2623.1166381835938,
-    "z": "f8944603.71553",
+    "x": 4011.683303833008,
+    "y": 2678.683303833008,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1f2077c9.d2f12",
+    "id": "699d84d7.6602fc",
     "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": 4385.016830444336,
+    "y": 2641.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b1fce547.cdefa8",
+    "id": "34b4944b.960704",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4360.450164794922,
-    "y": 2500.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4389.016830444336,
+    "y": 2555.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9ddcbad2.3cd968",
-        "a4909c74.16b3c"
+        "276189b1.3ed3ce",
+        "a978fa30.e2e848"
       ]
     ]
   },
   {
-    "id": "ac19c527.29aaf8",
+    "id": "386bba62.16259e",
     "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": 4375.302444458008,
+    "y": 2725.505081176758,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aecc45b1.07799"
+        "89559da6.e6cb3"
       ]
     ]
   },
   {
-    "id": "dd2530b3.0ce388",
+    "id": "2c7fef61.a7451",
     "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": 4276.516952514648,
+    "y": 2435.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9ddcbad2.3cd968",
+    "id": "276189b1.3ed3ce",
     "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": 4559.016830444336,
+    "y": 2516.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a4909c74.16b3c",
+    "id": "a978fa30.e2e848",
     "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": 4560.016830444336,
+    "y": 2621.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "90f369e0.1f5ea",
+    "id": "1a2899c1.f9127e",
     "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": 4555.016830444336,
+    "y": 2570.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "aecc45b1.07799",
+    "id": "89559da6.e6cb3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4553.567321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4582.133987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d7d46b6.f157298",
-        "a76ccf28.3b019",
-        "6d38c2ba.e73f94"
+        "8f483fd3.15e2b",
+        "5a0d7606.c42ec8",
+        "f5ace162.1d1728"
       ]
     ]
   },
   {
-    "id": "d7d46b6.f157298",
+    "id": "8f483fd3.15e2b",
     "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": 4797.133987426758,
+    "y": 2677.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a76ccf28.3b019",
+    "id": "5a0d7606.c42ec8",
     "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": 4794.133987426758,
+    "y": 2716.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "af66a72d.a68048"
+        "be061b72.c7b818"
       ]
     ]
   },
   {
-    "id": "6d38c2ba.e73f94",
+    "id": "f5ace162.1d1728",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4721.067321777344,
-    "y": 2702.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4749.633987426758,
+    "y": 2758.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "56aae750.4bf18",
+    "id": "b11d681f.057f4",
     "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": 4843.016830444336,
+    "y": 2393.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "df2c6ab5.f8c7a"
+        "530fa7ff.bc17d"
       ]
     ]
   },
   {
-    "id": "807e8aa5.b5f288",
+    "id": "723c9a0.e71c268",
     "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": 4445.016830444336,
+    "y": 2389.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "83815f42.db62e8"
+        "46b1f311.91a404"
       ]
     ]
   },
   {
-    "id": "83815f42.db62e8",
+    "id": "46b1f311.91a404",
     "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": 4640.016830444336,
+    "y": 2389.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "56aae750.4bf18",
-        "ace3955f.b78118"
+        "b11d681f.057f4",
+        "6f790d02.3c377c"
       ]
     ]
   },
   {
-    "id": "ace3955f.b78118",
+    "id": "6f790d02.3c377c",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4816.450164794922,
-    "y": 2411.1167907714844,
-    "z": "f8944603.71553",
+    "x": 4845.016830444336,
+    "y": 2466.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "86fe5017.1c8158"
+        "e6043cfa.36703"
       ]
     ]
   },
   {
-    "id": "af66a72d.a68048",
+    "id": "be061b72.c7b818",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4946.067321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 4974.633987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "73b98dcb.d53e2c"
+        "ce777f2e.3171a8"
       ]
     ]
   },
   {
-    "id": "73b98dcb.d53e2c",
+    "id": "ce777f2e.3171a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5104.067321777344,
-    "y": 2659.4570922851562,
-    "z": "f8944603.71553",
+    "x": 5132.633987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "35f64a50.ea71a6"
+        "b697c93d.c44198"
       ]
     ]
   },
   {
-    "id": "35f64a50.ea71a6",
+    "id": "b697c93d.c44198",
     "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": 5339.633987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "df2c6ab5.f8c7a",
+    "id": "530fa7ff.bc17d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4991.450164794922,
-    "y": 2330.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5020.016830444336,
+    "y": 2385.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b41095a1.9dd71",
-        "c294b821.4082d"
+        "5455e2bb.51abf4",
+        "38fcf2b0.31bbc6"
       ]
     ]
   },
   {
-    "id": "c294b821.4082d",
+    "id": "38fcf2b0.31bbc6",
     "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": 5228.016830444336,
+    "y": 2392.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cbd53666.7a192",
-        "70f8105c.8c53c8",
-        "d07f4c5c.e57d28"
+        "46db257f.be5d5c",
+        "10ef5dcf.987c42",
+        "cdb4ea9.23d2198"
       ]
     ]
   },
   {
-    "id": "86fe5017.1c8158",
+    "id": "e6043cfa.36703",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4993.450164794922,
-    "y": 2403.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5022.016830444336,
+    "y": 2458.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "29792fa0.312a5"
+        "dba257b1.4bfa28"
       ]
     ]
   },
   {
-    "id": "b41095a1.9dd71",
+    "id": "5455e2bb.51abf4",
     "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": 5258.016830444336,
+    "y": 2340.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "29792fa0.312a5",
+    "id": "dba257b1.4bfa28",
     "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": 5257.016830444336,
+    "y": 2582.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cbd53666.7a192",
+    "id": "46db257f.be5d5c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5409.450164794922,
-    "y": 2328.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5438.016830444336,
+    "y": 2383.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "12fe1a85.5f5265"
+        "40633d04.a1b504"
       ]
     ]
   },
   {
-    "id": "70f8105c.8c53c8",
+    "id": "10ef5dcf.987c42",
     "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": 5430.016830444336,
+    "y": 2438.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "720591da.7ff908"
+        "7af2b98b.8d665"
       ]
     ]
   },
   {
-    "id": "d07f4c5c.e57d28",
+    "id": "cdb4ea9.23d2198",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5406.450164794922,
-    "y": 2440.1167907714844,
-    "z": "f8944603.71553",
+    "x": 5435.016830444336,
+    "y": 2495.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "50fd00db.804e78"
+        "f683ae7d.1eb048"
       ]
     ]
   },
   {
-    "id": "50fd00db.804e78",
+    "id": "f683ae7d.1eb048",
     "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": 5587.016830444336,
+    "y": 2496.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "720591da.7ff908",
+    "id": "7af2b98b.8d665",
     "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": 5598.016830444336,
+    "y": 2441.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "12fe1a85.5f5265",
+    "id": "40633d04.a1b504",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5553.832489013672,
-    "y": 2325.7724609375,
-    "z": "f8944603.71553",
+    "x": 5582.399154663086,
+    "y": 2381.339126586914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d4fbd78f.a8b058"
+        "8b20e4dc.c76628"
       ]
     ]
   },
   {
-    "id": "d4fbd78f.a8b058",
+    "id": "8b20e4dc.c76628",
     "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": 5797.016830444336,
+    "y": 2377.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3ab03c8.bdf8544",
+    "id": "c989c621.8b708",
     "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": 3310.683334350586,
+    "y": 850.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7806cbe6.64ea14",
-        "91bd4861.b38048"
+        "c25ccae3.59498",
+        "69b0287f.333378"
       ]
     ]
   },
   {
-    "id": "7806cbe6.64ea14",
+    "id": "c25ccae3.59498",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3404.11669921875,
-    "y": 740.11669921875,
-    "z": "f8944603.71553",
+    "x": 3432.683364868164,
+    "y": 795.6833648681641,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4d1b7d4.397bf04"
+        "18001e31.10fe62"
       ]
     ]
   },
   {
-    "id": "91bd4861.b38048",
+    "id": "69b0287f.333378",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3391.11669921875,
-    "y": 849.11669921875,
-    "z": "f8944603.71553",
+    "x": 3419.683364868164,
+    "y": 904.6833648681641,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a8d8fc87.45b9a"
+        "643ae015.6b3ff8"
       ]
     ]
   },
   {
-    "id": "4d1b7d4.397bf04",
+    "id": "18001e31.10fe62",
     "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": 3647.683334350586,
+    "y": 632.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a8d8fc87.45b9a",
+    "id": "643ae015.6b3ff8",
     "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": 3643.683334350586,
+    "y": 676.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "87dcb71b.a618f",
+    "id": "25259a32.c04fe6",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3812.11669921875,
-    "y": 3521.11669921875,
-    "z": "f8944603.71553",
+    "x": 3840.683364868164,
+    "y": 3576.683364868164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9a1c6f33.80c0c"
+        "e17fd7c.5d8d2a8"
       ]
     ]
   },
   {
-    "id": "9a1c6f33.80c0c",
+    "id": "e17fd7c.5d8d2a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4003.11669921875,
-    "y": 3525.11669921875,
-    "z": "f8944603.71553",
+    "x": 4031.683364868164,
+    "y": 3580.683364868164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8de09ee3.1f82b8"
+        "6f9d8ee6.40f9a8"
       ]
     ]
   },
   {
-    "id": "8de09ee3.1f82b8",
+    "id": "6f9d8ee6.40f9a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4130.11669921875,
-    "y": 3524.11669921875,
-    "z": "f8944603.71553",
+    "x": 4158.683364868164,
+    "y": 3579.683364868164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cc59ae49.952b8",
-        "3b72359b.f45e6a"
+        "5d450f44.f186c8",
+        "87679aab.884488"
       ]
     ]
   },
   {
-    "id": "3b72359b.f45e6a",
+    "id": "87679aab.884488",
     "type": "save",
     "name": "save SECONDARY-ROOT UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4352.11669921875,
-    "y": 3413.11669921875,
-    "z": "f8944603.71553",
+    "x": 4380.683364868164,
+    "y": 3468.683364868164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "d566dc7.835f6a",
+    "id": "88b89d66.20648",
     "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": 3385.566665649414,
+    "y": 508.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cc59ae49.952b8",
+    "id": "5d450f44.f186c8",
     "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": 4376.566665649414,
+    "y": 3527.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e0cf290a.3bb57",
-        "91bee9e5.bd12c8"
+        "a8e3fac.bdef108",
+        "d683cc3e.7534e8"
       ]
     ]
   },
   {
-    "id": "e0cf290a.3bb57",
+    "id": "a8e3fac.bdef108",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4558,
-    "y": 3449,
-    "z": "f8944603.71553",
+    "x": 4586.566665649414,
+    "y": 3504.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2e6c4f7b.89f37"
+        "d7e8440b.3d707"
       ]
     ]
   },
   {
-    "id": "2e6c4f7b.89f37",
+    "id": "d7e8440b.3d707",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4684,
-    "y": 3449,
-    "z": "f8944603.71553",
+    "x": 4712.566665649414,
+    "y": 3504.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e80cf077.13626"
+        "23eff82f.a0dc88"
       ]
     ]
   },
   {
-    "id": "eb956f81.674a8",
+    "id": "a5367218.35d1e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4689,
-    "y": 3498,
-    "z": "f8944603.71553",
+    "x": 4717.566665649414,
+    "y": 3553.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "538ba095.13ecb8",
-        "a894e133.03a62",
-        "bbac82b0.611ad8",
-        "5d08bff9.d57b18"
+        "67e71008.eb1898",
+        "df5e72dc.bc108",
+        "728f0d90.8753cc",
+        "8686c784.f837e"
       ]
     ]
   },
   {
-    "id": "91bee9e5.bd12c8",
+    "id": "d683cc3e.7534e8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4563,
-    "y": 3498,
-    "z": "f8944603.71553",
+    "x": 4591.566665649414,
+    "y": 3553.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "eb956f81.674a8"
+        "a5367218.35d1e"
       ]
     ]
   },
   {
-    "id": "e80cf077.13626",
+    "id": "23eff82f.a0dc88",
     "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": 5040.566665649414,
+    "y": 3501.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "538ba095.13ecb8",
+    "id": "67e71008.eb1898",
     "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": 4993.566665649414,
+    "y": 3592.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "a894e133.03a62",
+    "id": "df5e72dc.bc108",
     "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": 4941.566665649414,
+    "y": 3634.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "bbac82b0.611ad8",
+    "id": "728f0d90.8753cc",
     "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": 5070.566665649414,
+    "y": 3676.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "7be6dab9.621efc",
+    "id": "41be2f96.b765f8",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 4928,
-    "y": 3494,
-    "z": "f8944603.71553",
+    "x": 4956.566665649414,
+    "y": 3549.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5d08bff9.d57b18",
+    "id": "8686c784.f837e",
     "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": 5048.566665649414,
+    "y": 3724.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "748bc1ca.c78678",
+    "id": "561c7038.198b5",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3840,
-    "y": 3472,
-    "z": "f8944603.71553",
+    "x": 3868.566665649414,
+    "y": 3527.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "286f0ec8.852352",
+    "id": "b87e18c5.0db5e8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3815,
-    "y": 4143,
-    "z": "f8944603.71553",
+    "x": 3843.566665649414,
+    "y": 4198.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d7543b1f.0223a"
+        "be1f4e62.15aa38"
       ]
     ]
   },
   {
-    "id": "d7543b1f.0223a",
+    "id": "be1f4e62.15aa38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4007,
-    "y": 4138,
-    "z": "f8944603.71553",
+    "x": 4035.566665649414,
+    "y": 4193.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8aacb5a.7bd82c8"
+        "a0659afe.abed3"
       ]
     ]
   },
   {
-    "id": "8aacb5a.7bd82c8",
+    "id": "a0659afe.abed3",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4136,
-    "y": 4138,
-    "z": "f8944603.71553",
+    "x": 4164.566665649414,
+    "y": 4193.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9ecf386c.da77f"
+        "aacb47f4.be072"
       ]
     ]
   },
   {
-    "id": "9ecf386c.da77f",
+    "id": "aacb47f4.be072",
     "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": 4496.566665649414,
+    "y": 4191.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "2bbca6cc.0ec622",
+    "id": "88b90ca8.e250c",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3803,
-    "y": 4367,
-    "z": "f8944603.71553",
+    "x": 3831.566665649414,
+    "y": 4422.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "85f62fba.be3af8"
+        "d69507e0.d93c6"
       ]
     ]
   },
   {
-    "id": "85f62fba.be3af8",
+    "id": "d69507e0.d93c6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3983,
-    "y": 4366,
-    "z": "f8944603.71553",
+    "x": 4011.566665649414,
+    "y": 4421.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f0b10235.e7e788"
+        "280736a4.7aa0f2"
       ]
     ]
   },
   {
-    "id": "f0b10235.e7e788",
+    "id": "280736a4.7aa0f2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4112,
-    "y": 4366,
-    "z": "f8944603.71553",
+    "x": 4140.566665649414,
+    "y": 4421.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ccf3ecf0.96a2b"
+        "ff5dea73.98b998"
       ]
     ]
   },
   {
-    "id": "ccf3ecf0.96a2b",
+    "id": "ff5dea73.98b998",
     "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": 4358.449966430664,
+    "y": 4420.449966430664,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cabe89a7.9d69e"
+        "860e2e4b.61a0d8"
       ]
     ]
   },
   {
-    "id": "cabe89a7.9d69e",
+    "id": "860e2e4b.61a0d8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4544.88330078125,
-    "y": 4364.88330078125,
-    "z": "f8944603.71553",
+    "x": 4573.449966430664,
+    "y": 4420.449966430664,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "760290ae.a21e"
+        "3ff2617b.840e76"
       ]
     ]
   },
   {
-    "id": "760290ae.a21e",
+    "id": "3ff2617b.840e76",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4676.88330078125,
-    "y": 4364.88330078125,
-    "z": "f8944603.71553",
+    "x": 4705.449966430664,
+    "y": 4420.449966430664,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d0b7affb.c1db2"
+        "96149cb2.d633c"
       ]
     ]
   },
   {
-    "id": "d0b7affb.c1db2",
+    "id": "96149cb2.d633c",
     "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": 5069.566665649414,
+    "y": 4419.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c32fbe2a.4ce3f",
+    "id": "f0668881.7d6d6",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3478,
-    "y": 4622,
-    "z": "f8944603.71553",
+    "x": 3506.566665649414,
+    "y": 4677.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f2b98ff2.538df8"
+        "2492336a.68b20c"
       ]
     ]
   },
   {
-    "id": "f2b98ff2.538df8",
+    "id": "2492336a.68b20c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3658,
-    "y": 4621,
-    "z": "f8944603.71553",
+    "x": 3686.566665649414,
+    "y": 4676.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "44866831.1c971"
+        "f54b8794.2acdd"
       ]
     ]
   },
   {
-    "id": "44866831.1c971",
+    "id": "f54b8794.2acdd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3787,
-    "y": 4621,
-    "z": "f8944603.71553",
+    "x": 3815.566665649414,
+    "y": 4676.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "531a8e91.6c36e8"
+        "c3a4f53e.304d78"
       ]
     ]
   },
   {
-    "id": "6aa2083f.c88dc",
+    "id": "84f57def.b063a",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3523,
-    "y": 4680,
-    "z": "f8944603.71553",
+    "x": 3551.566665649414,
+    "y": 4735.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5db121cf.f62b2",
+    "id": "cebbd661.72d4b8",
     "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": 4117.566665649414,
+    "y": 4834.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "531a8e91.6c36e8",
+    "id": "c3a4f53e.304d78",
     "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": 3581.566665649414,
+    "y": 4768.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5ffa37b0.a29d98",
-        "2e65d2b6.ac2056",
-        "b5462b77.92e368"
+        "9d76d7ba.037948",
+        "c6779daf.7d7a8",
+        "62f3b274.175fb4"
       ]
     ]
   },
   {
-    "id": "2e65d2b6.ac2056",
+    "id": "c6779daf.7d7a8",
     "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": 3763.057632446289,
+    "y": 4746.140884399414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5fe821cf.842878"
+        "168b9f85.394368"
       ]
     ]
   },
   {
-    "id": "b5462b77.92e368",
+    "id": "62f3b274.175fb4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3723,
-    "y": 4730,
-    "z": "f8944603.71553",
+    "x": 3751.566665649414,
+    "y": 4785.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6ea658d1.17df7"
+        "6d9d5aec.85fd34"
       ]
     ]
   },
   {
-    "id": "5fe821cf.842878",
+    "id": "168b9f85.394368",
     "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": 3922.629165649414,
+    "y": 4744.426528930664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6ea658d1.17df7",
+    "id": "6d9d5aec.85fd34",
     "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": 3912.566665649414,
+    "y": 4786.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4792a0c5.aeb76",
+    "id": "1514bf18.105d59",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3886,
-    "y": 4775,
-    "z": "f8944603.71553",
+    "x": 3914.566665649414,
+    "y": 4830.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "78930237.780be4",
-        "5db121cf.f62b2"
+        "16719b54.ca935d",
+        "cebbd661.72d4b8"
       ]
     ]
   },
   {
-    "id": "5ffa37b0.a29d98",
+    "id": "9d76d7ba.037948",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3728,
-    "y": 4767,
-    "z": "f8944603.71553",
+    "x": 3756.566665649414,
+    "y": 4822.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4792a0c5.aeb76"
+        "1514bf18.105d59"
       ]
     ]
   },
   {
-    "id": "78930237.780be4",
+    "id": "16719b54.ca935d",
     "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": 4075.566665649414,
+    "y": 4762.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "74408c25.ef5164",
+    "id": "993866bb.1b2058",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4413,
-    "y": 5275,
-    "z": "f8944603.71553",
+    "x": 4441.566665649414,
+    "y": 5330.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d1a4e2c9.15ac9",
+    "id": "f715ac9f.9b32b8",
     "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": 4596.566665649414,
+    "y": 5371.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "748b1299.fd2144",
+    "id": "c2d27f90.576768",
     "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": 5039.566665649414,
+    "y": 5419.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "24040f90.d6a4",
+    "id": "79d51ab0.5a125c",
     "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": 4412.566665649414,
+    "y": 5429.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f8d36d32.9ac71",
-        "9cd0c03a.a311a"
+        "fbb7e2aa.d5f0a8",
+        "7443db3b.00f94c"
       ]
     ]
   },
   {
-    "id": "f8d36d32.9ac71",
+    "id": "fbb7e2aa.d5f0a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620,
-    "y": 5358,
-    "z": "f8944603.71553",
+    "x": 4648.566665649414,
+    "y": 5413.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d753b8f.12e03c8"
+        "2a6159e8.abaf0e"
       ]
     ]
   },
   {
-    "id": "d753b8f.12e03c8",
+    "id": "2a6159e8.abaf0e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4764,
-    "y": 5360,
-    "z": "f8944603.71553",
+    "x": 4792.566665649414,
+    "y": 5415.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "748b1299.fd2144",
-        "9643625b.90e238",
-        "c3f4caa.3b73cb8"
+        "c2d27f90.576768",
+        "5c6afd36.faf1f4",
+        "86183466.e0956"
       ]
     ]
   },
   {
-    "id": "9cd0c03a.a311a",
+    "id": "7443db3b.00f94c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4619,
-    "y": 5406,
-    "z": "f8944603.71553",
+    "x": 4647.566665649414,
+    "y": 5461.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "9643625b.90e238",
+    "id": "5c6afd36.faf1f4",
     "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": 5160.566665649414,
+    "y": 5466.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c3f4caa.3b73cb8",
+    "id": "86183466.e0956",
     "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": 5042.233657836914,
+    "y": 5551.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "433011d7.349ae8",
+    "id": "85909b06.96d1d8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5014.8837890625,
-    "y": 5454.88330078125,
-    "z": "f8944603.71553",
+    "x": 5043.450454711914,
+    "y": 5510.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e2691c6e.49966",
+    "id": "d5d61aed.e9642",
     "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": 5574.566665649414,
+    "y": 5898.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7492e58a.da53dc",
+    "id": "cfe4284f.245dc",
     "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": 4947.566665649414,
+    "y": 5908.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7d7daf2e.06b168",
-        "1dddd00a.b82ef8"
+        "67276eef.04fd3",
+        "9ce9471a.def67"
       ]
     ]
   },
   {
-    "id": "7d7daf2e.06b168",
+    "id": "67276eef.04fd3",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5152,
-    "y": 5847,
-    "z": "f8944603.71553",
+    "x": 5180.566665649414,
+    "y": 5902.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "51e74c47.c309bc"
+        "7fd061d3.3dea5"
       ]
     ]
   },
   {
-    "id": "51e74c47.c309bc",
+    "id": "7fd061d3.3dea5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5299,
-    "y": 5855,
-    "z": "f8944603.71553",
+    "x": 5327.566665649414,
+    "y": 5910.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e2691c6e.49966",
-        "f2071b27.722968",
-        "ce8449a1.6c0af8"
+        "d5d61aed.e9642",
+        "f7e19ea0.d5ede",
+        "ccb01b06.92e6a8"
       ]
     ]
   },
   {
-    "id": "1dddd00a.b82ef8",
+    "id": "9ce9471a.def67",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5153,
-    "y": 5897,
-    "z": "f8944603.71553",
+    "x": 5181.566665649414,
+    "y": 5952.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f2071b27.722968",
+    "id": "f7e19ea0.d5ede",
     "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": 5695.566665649414,
+    "y": 5945.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce8449a1.6c0af8",
+    "id": "ccb01b06.92e6a8",
     "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": 5577.233657836914,
+    "y": 6030.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "6cf05b70.9ecfd4",
+    "id": "e15ccbfd.b5904",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5549.8837890625,
-    "y": 5933.88330078125,
-    "z": "f8944603.71553",
+    "x": 5578.450454711914,
+    "y": 5989.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b08c7802.5d204",
+    "id": "986cd5c9.02e9d",
     "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": 5108.566665649414,
+    "y": 5858.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e97fbec2.db6de",
+    "id": "b4899b08.51e5b",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4914,
-    "y": 5764,
-    "z": "f8944603.71553",
+    "x": 4942.566665649414,
+    "y": 5819.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "651a17c0.63b678",
+    "id": "c617e6ee.8b983",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3241.25,
-    "y": 6373.25,
-    "z": "f8944603.71553",
+    "x": 3269.816665649414,
+    "y": 6428.816665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "74077cd7.2a1a94",
-        "f3174188.6084b"
+        "9cb4bafc.51db",
+        "31675b48.f480a4"
       ]
     ]
   },
   {
-    "id": "74077cd7.2a1a94",
+    "id": "9cb4bafc.51db",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3432.25,
-    "y": 6377.25,
-    "z": "f8944603.71553",
+    "x": 3460.816665649414,
+    "y": 6432.816665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f2351c78.3536d"
+        "4d6a56c7.6a325"
       ]
     ]
   },
   {
-    "id": "f2351c78.3536d",
+    "id": "4d6a56c7.6a325",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3559.25,
-    "y": 6376.25,
-    "z": "f8944603.71553",
+    "x": 3587.816665649414,
+    "y": 6431.816665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9d7f2116.baeda"
+        "c5539a8b.106aa"
       ]
     ]
   },
   {
-    "id": "f3174188.6084b",
+    "id": "31675b48.f480a4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3428.25,
-    "y": 6447.25,
-    "z": "f8944603.71553",
+    "x": 3456.816665649414,
+    "y": 6502.816665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "84ee4e22.34786"
+        "8a9f9d03.ba9c7"
       ]
     ]
   },
   {
-    "id": "bf4fd4bd.d3efb",
+    "id": "9f506842.a5d348",
     "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": 4006.316665649414,
+    "y": 6501.900161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "84ee4e22.34786",
+    "id": "8a9f9d03.ba9c7",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3561.75,
-    "y": 6449.33349609375,
-    "z": "f8944603.71553",
+    "x": 3590.316665649414,
+    "y": 6504.900161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bf4fd4bd.d3efb"
+        "9f506842.a5d348"
       ]
     ]
   }