From 7bd484302cdc29bc758cd9285ea191c17138bbcd Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Fri, 29 Apr 2022 09:50:05 -0400
Subject: [PATCH] Fixing a bug in calling path computation (for transport
 slicing and cloud leased-line use cases) when secondary root is null.

Issue-ID: SDNC-1694
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I264029fde5b6e721f5670447e36d0d6e301b85a9

Former-commit-id: 6fe357efda5cede3705b08a0c1c321c42fb3129f
---
 ...ogy-operation-get-otn-tunnel-path-from-oof.json | 2621 ++++++++++----------
 ...logy-operation-get-otn-tunnel-path-from-oof.xml |   32 +-
 2 files changed, 1336 insertions(+), 1317 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
index dc093640..1b156b99 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "55da1918.a645e",
+        "id": "fc9c1aac.15e298",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 271.566650390625,
-        "y": 122.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 267.566650390625,
+        "y": 147.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1bc5ef1e.555379"
+                "d48028b8.734c18"
             ]
         ]
     },
     {
-        "id": "1bc5ef1e.555379",
+        "id": "d48028b8.734c18",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,3805 +22,3822 @@
         "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": 418.566650390625,
-        "y": 697.5666809082031,
-        "z": "a133aed2.437bc",
+        "x": 414.566650390625,
+        "y": 722.5666809082031,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "72a47d96.f0464c"
+                "20ab20d.05eaa6"
             ]
         ]
     },
     {
-        "id": "72a47d96.f0464c",
+        "id": "20ab20d.05eaa6",
         "type": "method",
         "name": "tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<method rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 482.5667724609375,
-        "y": 790.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 478.5667724609375,
+        "y": 815.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "34c3e8c4.75c3c8"
+                "15c9c6e5.8adb41"
             ]
         ]
     },
     {
-        "id": "c7e5fdd1.51b5a",
+        "id": "7d1edda.6460624",
         "type": "execute",
         "name": "execute RestApiCallNode getPath from OOF",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url + '?ethsrvType=' + $prop.ethsrvType`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 528.5397186279297,
-        "y": 309.56266593933105,
-        "z": "a133aed2.437bc",
+        "x": 524.5397186279297,
+        "y": 334.56266593933105,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "d6e108d2.5fc108",
-                "c846370c.449d6"
+                "b836c23.f213d4",
+                "b41c1ac8.bdb5d8"
             ]
         ]
     },
     {
-        "id": "d6e108d2.5fc108",
+        "id": "b836c23.f213d4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 768.5398597717285,
-        "y": 333.56263542175293,
-        "z": "a133aed2.437bc",
+        "x": 764.5398597717285,
+        "y": 358.56263542175293,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "33dac520.fd9612"
+                "280c0da5.df047a"
             ]
         ]
     },
     {
-        "id": "1749300b.377e9",
+        "id": "ef8bf8a6.b8f32",
         "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=\"Error executing OOF api\" />\n",
         "comments": "",
-        "x": 938.5397796630859,
-        "y": 273.5627269744873,
-        "z": "a133aed2.437bc",
+        "x": 934.5397796630859,
+        "y": 298.5627269744873,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "c846370c.449d6",
+        "id": "b41c1ac8.bdb5d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 767.5396461486816,
-        "y": 282.562726020813,
-        "z": "a133aed2.437bc",
+        "x": 763.5396461486816,
+        "y": 307.562726020813,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1749300b.377e9"
+                "ef8bf8a6.b8f32"
             ]
         ]
     },
     {
-        "id": "aabf6007.38015",
+        "id": "58272be4.dd9a64",
         "type": "comment",
         "name": "OTN tunnel path computation",
         "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.",
         "comments": "",
-        "x": 500.04351806640625,
-        "y": 265.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 496.04351806640625,
+        "y": 290.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "66a1cd55.f26304",
+        "id": "fe39b144.2b541",
         "type": "for",
         "name": "for vidx..otn-oof.solutions_length[]",
         "xml": "<for index='vidx' start='0' end='`$otn-oof.solutions_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 956.53955078125,
-        "y": 758.8123931884766,
-        "z": "a133aed2.437bc",
+        "x": 952.53955078125,
+        "y": 783.8123931884766,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "34bde7e7.01eac8"
+                "96e8d308.a8c428"
             ]
         ]
     },
     {
-        "id": "b912adec.34afe",
+        "id": "b5c8fac8.0621d",
         "type": "comment",
         "name": "Loop through OTN links",
         "info": "",
         "comments": "",
-        "x": 1040.0398559570312,
-        "y": 838.3127593994141,
-        "z": "a133aed2.437bc",
+        "x": 1036.0398559570312,
+        "y": 863.3127593994141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "34bde7e7.01eac8",
+        "id": "96e8d308.a8c428",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1061.0667724609375,
-        "y": 949.8531646728516,
-        "z": "a133aed2.437bc",
+        "x": 1057.0667724609375,
+        "y": 974.8531646728516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "7334f4ec.cbdcec",
-                "a07b9575.5fb718",
-                "78ed6398.2c281c",
-                "a81521ff.85b448",
-                "f61d745e.897b28"
+                "3c519c2d.98476c",
+                "1de6c693.7d01c1",
+                "a1a53385.974798",
+                "9bfb8439.b10f28",
+                "783a66ea.ba8628"
             ]
         ]
     },
     {
-        "id": "7334f4ec.cbdcec",
+        "id": "3c519c2d.98476c",
         "type": "set",
         "name": "set otn-oof.link-name and etc.",
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].original_link`' />\n<parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].src_node`' />\n<parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].dst_node`' />",
         "comments": "",
-        "x": 1307.5667724609375,
-        "y": 842.8531646728516,
-        "z": "a133aed2.437bc",
+        "x": 1303.5667724609375,
+        "y": 867.8531646728516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "33dac520.fd9612",
+        "id": "280c0da5.df047a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 913.5669059753418,
-        "y": 331.30812072753906,
-        "z": "a133aed2.437bc",
+        "x": 909.5669059753418,
+        "y": 356.30812072753906,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "34c3e8c4.75c3c8",
+        "id": "15c9c6e5.8adb41",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 723.5355339050293,
-        "y": 717.3083028793335,
-        "z": "a133aed2.437bc",
+        "x": 719.5355339050293,
+        "y": 742.3083028793335,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "66a1cd55.f26304",
-                "10360917.9b8077",
-                "9aea1ae3.78f458",
-                "949527f9.d2ae5"
+                "fe39b144.2b541",
+                "f100fc15.cb611",
+                "a5abe9c0.4a1de8",
+                "ed4632fb.07dd2"
             ]
         ]
     },
     {
-        "id": "4f42b7a6.ec3be8",
+        "id": "fe68f179.056eb",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2475.0665283203125,
-        "y": 1275.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 2471.0665283203125,
+        "y": 1300.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "f61d745e.897b28",
+        "id": "783a66ea.ba8628",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1274.0667724609375,
-        "y": 1031.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 1270.0667724609375,
+        "y": 1056.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "edcf8a17.3c1388",
-                "21981b27.dc0a0c"
+                "7a308ca1.9cbfbc",
+                "19d9f05a.a412f"
             ]
         ]
     },
     {
-        "id": "d41411aa.2fbe08",
+        "id": "ce0e0e02.f12888",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2799.5665283203125,
-        "y": 766.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 2795.5665283203125,
+        "y": 791.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1b874a77.cb23d6"
+                "4d1bf28e.0579dc"
             ]
         ]
     },
     {
-        "id": "ec1c7dff.7ed9c",
+        "id": "c7bf5d64.76752",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2832.566650390625,
-        "y": 824.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 2828.566650390625,
+        "y": 849.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "6a0b9275.25af84"
+                "a670610c.4f3e28"
             ]
         ]
     },
     {
-        "id": "593d14b8.4d3af4",
+        "id": "fc569894.8123c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2835.566650390625,
-        "y": 876.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 2831.566650390625,
+        "y": 901.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "7711b881.aaafb8"
+                "e1a85bd7.1fa258"
             ]
         ]
     },
     {
-        "id": "6a0b9275.25af84",
+        "id": "a670610c.4f3e28",
         "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": 3017.566650390625,
-        "y": 828.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 3013.566650390625,
+        "y": 853.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "7711b881.aaafb8",
+        "id": "e1a85bd7.1fa258",
         "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": 3005.566650390625,
-        "y": 879.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 3001.566650390625,
+        "y": 904.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "c385141d.3475d8",
+        "id": "baff4d0c.aaca1",
         "type": "set",
         "name": "set domain A node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.ttp-id' value=\"`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4136.0665283203125,
-        "y": 681.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4132.0665283203125,
+        "y": 706.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "8b31beaa.98c0f8",
+        "id": "82ddb847.c08398",
         "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.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4144.0665283203125,
-        "y": 733.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4140.0665283203125,
+        "y": 758.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "d767d020.bad1e"
+                "437fe605.198888"
             ]
         ]
     },
     {
-        "id": "d767d020.bad1e",
+        "id": "437fe605.198888",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4350.5665283203125,
-        "y": 711.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4346.5665283203125,
+        "y": 736.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "d5ff040e.d2f8b"
+                "7e83e46.c53ab1c"
             ]
         ]
     },
     {
-        "id": "a5ba7946.9385e8",
+        "id": "284fe9f7.649b56",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3688.2349853515625,
-        "y": 760.0481719970703,
-        "z": "a133aed2.437bc",
+        "x": 3684.2349853515625,
+        "y": 785.0481719970703,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "325b8414.0a0f7c"
+                "ecfea11a.4af0a8"
             ]
         ]
     },
     {
-        "id": "dd30a478.a8f71",
+        "id": "e3b37de8.f69768",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pintsidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3150.9493408203125,
-        "y": 762.2263946533203,
-        "z": "a133aed2.437bc",
+        "x": 3146.9493408203125,
+        "y": 787.2263946533203,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "d8739293.dd811"
+                "bc95cd6e.89d798"
             ]
         ]
     },
     {
-        "id": "d8739293.dd811",
+        "id": "bc95cd6e.89d798",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3402.9493408203125,
-        "y": 759.2263946533203,
-        "z": "a133aed2.437bc",
+        "x": 3398.9493408203125,
+        "y": 784.2263946533203,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "a5ba7946.9385e8"
+                "284fe9f7.649b56"
             ]
         ]
     },
     {
-        "id": "325b8414.0a0f7c",
+        "id": "ecfea11a.4af0a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3915.0665283203125,
-        "y": 748.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 3911.0665283203125,
+        "y": 773.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "c385141d.3475d8",
-                "8b31beaa.98c0f8",
-                "9cb3666f.fe6288",
-                "cc03f562.203da8",
-                "b538ddb.0ac7ba"
+                "baff4d0c.aaca1",
+                "82ddb847.c08398",
+                "32be1e9f.8d32f2",
+                "8b458d6.d1c047",
+                "47876c9d.2d5e64"
             ]
         ]
     },
     {
-        "id": "edcf8a17.3c1388",
+        "id": "7a308ca1.9cbfbc",
         "type": "get-resource",
         "name": "get-resource dst tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2556.066650390625,
-        "y": 1171.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 2552.066650390625,
+        "y": 1196.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "966cd988.263208",
-                "2f0ba896.1bff08",
-                "5512ef83.d0409"
+                "18e8f4ed.e62f0b",
+                "6bcecaf3.608064",
+                "daca2c43.c064c"
             ]
         ]
     },
     {
-        "id": "966cd988.263208",
+        "id": "18e8f4ed.e62f0b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2778.5665283203125,
-        "y": 1313.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 2774.5665283203125,
+        "y": 1338.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "d01135ac.6fb8"
+                "1c008bda.b418e4"
             ]
         ]
     },
     {
-        "id": "2f0ba896.1bff08",
+        "id": "6bcecaf3.608064",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2762.5665283203125,
-        "y": 1364.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 2758.5665283203125,
+        "y": 1389.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "dc2d6a40.545b28"
+                "fc52fd91.ea4bc"
             ]
         ]
     },
     {
-        "id": "5512ef83.d0409",
+        "id": "daca2c43.c064c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2765.5665283203125,
-        "y": 1416.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 2761.5665283203125,
+        "y": 1441.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "f1dc200a.0079b8"
+                "f7ddd856.02ac8"
             ]
         ]
     },
     {
-        "id": "f1dc200a.0079b8",
+        "id": "f7ddd856.02ac8",
         "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": 2935.5665283203125,
-        "y": 1419.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 2931.5665283203125,
+        "y": 1444.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "dc2d6a40.545b28",
+        "id": "fc52fd91.ea4bc",
         "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": 2947.5665283203125,
-        "y": 1368.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 2943.5665283203125,
+        "y": 1393.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "eda7d352.9073e",
+        "id": "aeaaf44d.bee068",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pintdidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3134.9493408203125,
-        "y": 1324.2263946533203,
-        "z": "a133aed2.437bc",
+        "x": 3130.9493408203125,
+        "y": 1349.2263946533203,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "3127fdbc.48d8ba"
+                "483a13b3.bed314"
             ]
         ]
     },
     {
-        "id": "3127fdbc.48d8ba",
+        "id": "483a13b3.bed314",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3377.9493408203125,
-        "y": 1323.2263946533203,
-        "z": "a133aed2.437bc",
+        "x": 3373.9493408203125,
+        "y": 1348.2263946533203,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1629bb11.b51185"
+                "2191662c.b339a2"
             ]
         ]
     },
     {
-        "id": "2bfd4c7b.7322cc",
+        "id": "c3e020b0.f8e488",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5144.0665283203125,
-        "y": 1124.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 5140.0665283203125,
+        "y": 1149.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "83a9dba4.165df8",
-                "213b5817.319d6",
-                "eacf08ed.9b6908"
+                "9dea42c1.8bc43",
+                "ceda48be.b18b08",
+                "95babe9d.55be58"
             ]
         ]
     },
     {
-        "id": "1629bb11.b51185",
+        "id": "2191662c.b339a2",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3634.2349853515625,
-        "y": 1323.0481719970703,
-        "z": "a133aed2.437bc",
+        "x": 3630.2349853515625,
+        "y": 1348.0481719970703,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1697afc2.a7d658"
+                "ff383ac4.0c7878"
             ]
         ]
     },
     {
-        "id": "a4a4d9de.8b1e5",
+        "id": "621e0b6.dcff474",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4931.0665283203125,
-        "y": 1123.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4927.0665283203125,
+        "y": 1148.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "2bfd4c7b.7322cc"
+                "c3e020b0.f8e488"
             ]
         ]
     },
     {
-        "id": "1697afc2.a7d658",
+        "id": "ff383ac4.0c7878",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3934.0665283203125,
-        "y": 1320.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 3930.0665283203125,
+        "y": 1345.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "64565dd0.7224d4",
-                "60e5c227.98dd4c",
-                "aa1de99e.ebfdb8",
-                "1e08769.d5ce909",
-                "19848a3.1ad4df6"
+                "9cfb57c0.ea373",
+                "3ddfd145.96f4a6",
+                "9f1a5b61.2db4f8",
+                "d886450f.a1491",
+                "52d7e7df.a91a1"
             ]
         ]
     },
     {
-        "id": "64565dd0.7224d4",
+        "id": "9cfb57c0.ea373",
         "type": "set",
         "name": "set domain B node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-B.ttp-id' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4176.0665283203125,
-        "y": 1274.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4172.0665283203125,
+        "y": 1299.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "60e5c227.98dd4c",
+        "id": "3ddfd145.96f4a6",
         "type": "get-resource",
         "name": "get-resource dst 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.domain-B.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4166.0665283203125,
-        "y": 1325.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4162.0665283203125,
+        "y": 1350.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1423a8aa.1e5bbf"
+                "8168eb1f.c9019"
             ]
         ]
     },
     {
-        "id": "1423a8aa.1e5bbf",
+        "id": "8168eb1f.c9019",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4353.5665283203125,
-        "y": 1323.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4349.5665283203125,
+        "y": 1348.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "fe536508.3d42a8"
+                "dcc1c099.d5e73"
             ]
         ]
     },
     {
-        "id": "83a9dba4.165df8",
+        "id": "9dea42c1.8bc43",
         "type": "set",
         "name": "set domain B network-id",
         "xml": "<set>\n<parameter name='tmp.domain-B.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5414.0665283203125,
-        "y": 1100.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 5410.0665283203125,
+        "y": 1125.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "213b5817.319d6",
+        "id": "ceda48be.b18b08",
         "type": "get-resource",
         "name": "get-resource dst network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-B.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5424.0665283203125,
-        "y": 1146.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 5420.0665283203125,
+        "y": 1171.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "93d4670b.467a7"
+                "5211d808.8195d"
             ]
         ]
     },
     {
-        "id": "93d4670b.467a7",
+        "id": "5211d808.8195d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5639.5665283203125,
-        "y": 1137.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 5635.5665283203125,
+        "y": 1162.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "3c1a17a3.7c5698"
+                "a23302e4.374318"
             ]
         ]
     },
     {
-        "id": "3c1a17a3.7c5698",
+        "id": "a23302e4.374318",
         "type": "set",
         "name": "set domain B network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-B.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-B.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-B.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-B.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-B.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-id`' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-provider-id`' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-client-id`' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-topology-id`' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-type`' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 5894.0665283203125,
-        "y": 1143.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 5890.0665283203125,
+        "y": 1168.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "1b874a77.cb23d6",
+        "id": "4d1bf28e.0579dc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2933.5665283203125,
-        "y": 762.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 2929.5665283203125,
+        "y": 787.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "dd30a478.a8f71"
+                "e3b37de8.f69768"
             ]
         ]
     },
     {
-        "id": "d01135ac.6fb8",
+        "id": "1c008bda.b418e4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2924.5665283203125,
-        "y": 1304.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 2920.5665283203125,
+        "y": 1329.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "eda7d352.9073e"
+                "aeaaf44d.bee068"
             ]
         ]
     },
     {
-        "id": "d5ff040e.d2f8b",
+        "id": "7e83e46.c53ab1c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4525.5665283203125,
-        "y": 707.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4521.5665283203125,
+        "y": 732.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "7a85cdc9.21de74"
+                "74f28a96.737404"
             ]
         ]
     },
     {
-        "id": "fe536508.3d42a8",
+        "id": "dcc1c099.d5e73",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4542.5665283203125,
-        "y": 1312.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4538.5665283203125,
+        "y": 1337.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "7f789c56.73a404"
+                "c1ec44c6.22ea78"
             ]
         ]
     },
     {
-        "id": "21981b27.dc0a0c",
+        "id": "19d9f05a.a412f",
         "type": "get-resource",
         "name": "get-resource src tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2602.066650390625,
-        "y": 805.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 2598.066650390625,
+        "y": 830.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "d41411aa.2fbe08",
-                "ec1c7dff.7ed9c",
-                "593d14b8.4d3af4"
+                "ce0e0e02.f12888",
+                "c7bf5d64.76752",
+                "fc569894.8123c8"
             ]
         ]
     },
     {
-        "id": "9cb3666f.fe6288",
+        "id": "32be1e9f.8d32f2",
         "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-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4005.5665283203125,
-        "y": 551.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4001.5665283203125,
+        "y": 576.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "2d596f92.386da",
-                "b8bb35c7.68022",
-                "50dbd465.907d94"
+                "cd21ae8c.c1c9b",
+                "4cf02804.c7fa68",
+                "c9dba533.6e697"
             ]
         ]
     },
     {
-        "id": "2d596f92.386da",
+        "id": "cd21ae8c.c1c9b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4201.066650390625,
-        "y": 503.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 4197.066650390625,
+        "y": 528.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "7b9cb223.733344"
+                "6b1de9c1.5b1d"
             ]
         ]
     },
     {
-        "id": "b8bb35c7.68022",
+        "id": "4cf02804.c7fa68",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4193.066650390625,
-        "y": 558.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4189.066650390625,
+        "y": 583.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "def9d226.6d2cf8"
+                "23c3a37b.be4e3c"
             ]
         ]
     },
     {
-        "id": "50dbd465.907d94",
+        "id": "c9dba533.6e697",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4198.066650390625,
-        "y": 615.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4194.066650390625,
+        "y": 640.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "7c7e6039.479ca8"
+                "89ce9fdb.da4ea"
             ]
         ]
     },
     {
-        "id": "7c7e6039.479ca8",
+        "id": "89ce9fdb.da4ea",
         "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": 4350.066650390625,
-        "y": 616.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4346.066650390625,
+        "y": 641.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "def9d226.6d2cf8",
+        "id": "23c3a37b.be4e3c",
         "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": 4361.066650390625,
-        "y": 561.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4357.066650390625,
+        "y": 586.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "7b9cb223.733344",
+        "id": "6b1de9c1.5b1d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4345.448974609375,
-        "y": 501.2223358154297,
-        "z": "a133aed2.437bc",
+        "x": 4341.448974609375,
+        "y": 526.2223358154297,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "726f1c43.81de24",
-                "6baa44bf.896aa4"
+                "87b391d0.8621b",
+                "6f392240.0b632c"
             ]
         ]
     },
     {
-        "id": "726f1c43.81de24",
+        "id": "87b391d0.8621b",
         "type": "set",
         "name": "set domain A node-id and tpn",
         "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />",
         "comments": "",
-        "x": 4570.5665283203125,
-        "y": 456.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 4566.5665283203125,
+        "y": 481.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "cc03f562.203da8",
+        "id": "8b458d6.d1c047",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4092.5665283203125,
-        "y": 798.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4088.5665283203125,
+        "y": 823.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "7a85cdc9.21de74",
+        "id": "74f28a96.737404",
         "type": "set",
         "name": "set domain A tunnel tp ip",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-tunnel-tp-id`' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\n",
         "comments": "",
-        "x": 4786.5665283203125,
-        "y": 704.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4782.5665283203125,
+        "y": 729.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "1e08769.d5ce909",
+        "id": "d886450f.a1491",
         "type": "get-resource",
         "name": "get-resource dst pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4002.5665283203125,
-        "y": 1154.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 3998.5665283203125,
+        "y": 1179.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1a2b49d5.b5a17e",
-                "7bc68f65.9bf008",
-                "aa0e1591.186978"
+                "528769ed.08eb38",
+                "67791430.0cdf44",
+                "ba1deb5c.e8edb8"
             ]
         ]
     },
     {
-        "id": "aa0e1591.186978",
+        "id": "ba1deb5c.e8edb8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4198.066650390625,
-        "y": 1106.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4194.066650390625,
+        "y": 1131.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "d1b079c.9297d08"
+                "c395e5e2.5d2d6"
             ]
         ]
     },
     {
-        "id": "7bc68f65.9bf008",
+        "id": "67791430.0cdf44",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4190.066650390625,
-        "y": 1161.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4186.066650390625,
+        "y": 1186.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "2daddcb3.194964"
+                "859829ca.3b85f8"
             ]
         ]
     },
     {
-        "id": "1a2b49d5.b5a17e",
+        "id": "528769ed.08eb38",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4195.066650390625,
-        "y": 1218.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4191.066650390625,
+        "y": 1243.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "ec80c220.eda94"
+                "d0ef5793.559118"
             ]
         ]
     },
     {
-        "id": "d1b079c.9297d08",
+        "id": "c395e5e2.5d2d6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4342.448974609375,
-        "y": 1104.2223358154297,
-        "z": "a133aed2.437bc",
+        "x": 4338.448974609375,
+        "y": 1129.2223358154297,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "86d91eb8.1d4188",
-                "ccc8b0e3.aa30a"
+                "3ef2a6b2.4dd6a2",
+                "fe50ef3b.6e4d2"
             ]
         ]
     },
     {
-        "id": "2daddcb3.194964",
+        "id": "859829ca.3b85f8",
         "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": 4358.066650390625,
-        "y": 1164.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4354.066650390625,
+        "y": 1189.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "ec80c220.eda94",
+        "id": "d0ef5793.559118",
         "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": 4347.066650390625,
-        "y": 1219.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4343.066650390625,
+        "y": 1244.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "86d91eb8.1d4188",
+        "id": "3ef2a6b2.4dd6a2",
         "type": "set",
         "name": "set domain B node-id and tpn",
         "xml": "<set>\n<parameter name='domain-B.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-B.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-node-id`' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4551.5665283203125,
-        "y": 1071.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4547.5665283203125,
+        "y": 1096.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "aa1de99e.ebfdb8",
+        "id": "9f1a5b61.2db4f8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4121.5665283203125,
-        "y": 1366.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4117.5665283203125,
+        "y": 1391.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "7f789c56.73a404",
+        "id": "c1ec44c6.22ea78",
         "type": "set",
         "name": "set domain B tunnel tp id",
         "xml": "<set>\n<parameter name='domain-B.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-tunnel-tp-id`' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4775.5665283203125,
-        "y": 1311.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4771.5665283203125,
+        "y": 1336.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "4af47e1.d24b48",
+        "id": "e6402312.02204",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4927.5665283203125,
-        "y": 519.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4923.5665283203125,
+        "y": 544.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "4f3cf505.2fca3c"
+                "ae40da49.306bf8"
             ]
         ]
     },
     {
-        "id": "4f3cf505.2fca3c",
+        "id": "ae40da49.306bf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5104.5665283203125,
-        "y": 511.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 5100.5665283203125,
+        "y": 536.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "3a45344a.82c99c",
-                "6a555c5c.0d6d94",
-                "bc9971ad.98e16"
+                "600d9c1d.04f94c",
+                "4c90758b.fa245c",
+                "a0cc954a.cdcae"
             ]
         ]
     },
     {
-        "id": "3a45344a.82c99c",
+        "id": "600d9c1d.04f94c",
         "type": "set",
         "name": "set domain A network-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5319.5665283203125,
-        "y": 492.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 5315.5665283203125,
+        "y": 517.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "6a555c5c.0d6d94",
+        "id": "4c90758b.fa245c",
         "type": "get-resource",
         "name": "get-resource src network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5336.5665283203125,
-        "y": 556.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 5332.5665283203125,
+        "y": 581.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "12908a50.109196"
+                "fbbce759.fdbdd8"
             ]
         ]
     },
     {
-        "id": "12908a50.109196",
+        "id": "fbbce759.fdbdd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5560.0665283203125,
-        "y": 557.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 5556.0665283203125,
+        "y": 582.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "d7f6c969.bf14a8"
+                "e83993b4.07a278"
             ]
         ]
     },
     {
-        "id": "d7f6c969.bf14a8",
+        "id": "e83993b4.07a278",
         "type": "set",
         "name": "set domain A network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-id`' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-provider-id`' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-client-id`' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-topology-id`' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-type`' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\n\n\n",
         "comments": "",
-        "x": 5824.5665283203125,
-        "y": 546.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 5820.5665283203125,
+        "y": 571.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "6baa44bf.896aa4",
+        "id": "6f392240.0b632c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4529.5665283203125,
-        "y": 515.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4525.5665283203125,
+        "y": 540.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "c5bce932.312ae8"
+                "af53c562.f6a408"
             ]
         ]
     },
     {
-        "id": "c5bce932.312ae8",
+        "id": "af53c562.f6a408",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4724.5665283203125,
-        "y": 515.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4720.5665283203125,
+        "y": 540.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "4af47e1.d24b48"
+                "e6402312.02204"
             ]
         ]
     },
     {
-        "id": "bc9971ad.98e16",
+        "id": "a0cc954a.cdcae",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5263.5665283203125,
-        "y": 609.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 5259.5665283203125,
+        "y": 634.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "ccc8b0e3.aa30a",
+        "id": "fe50ef3b.6e4d2",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4530.5665283203125,
-        "y": 1122.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4526.5665283203125,
+        "y": 1147.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "2505107d.3aa54"
+                "b483ead6.847598"
             ]
         ]
     },
     {
-        "id": "2505107d.3aa54",
+        "id": "b483ead6.847598",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4725.5665283203125,
-        "y": 1122.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 4721.5665283203125,
+        "y": 1147.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "a4a4d9de.8b1e5"
+                "621e0b6.dcff474"
             ]
         ]
     },
     {
-        "id": "eacf08ed.9b6908",
+        "id": "95babe9d.55be58",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5349.5665283203125,
-        "y": 1202.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 5345.5665283203125,
+        "y": 1227.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "b538ddb.0ac7ba",
+        "id": "47876c9d.2d5e64",
         "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.src-tp`'/>-->\n<parameter name=\"original_string\" value='`$tmp.aai.src-tp.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-src-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4033.5665283203125,
-        "y": 345.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 4029.5665283203125,
+        "y": 370.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "e05ff3f0.c79818",
-                "bfafe917.9e0828"
+                "780141cf.677a88",
+                "f51e8b25.33a49"
             ]
         ]
     },
     {
-        "id": "bfafe917.9e0828",
+        "id": "f51e8b25.33a49",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4254.5665283203125,
-        "y": 313.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 4250.5665283203125,
+        "y": 338.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "984c7f99.dba1f8"
+                "f143f0b.3a07c1"
             ]
         ]
     },
     {
-        "id": "e05ff3f0.c79818",
+        "id": "780141cf.677a88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4254.5665283203125,
-        "y": 360.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 4250.5665283203125,
+        "y": 385.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "ab85b68d.00fab8"
+                "5a762005.4bb698"
             ]
         ]
     },
     {
-        "id": "984c7f99.dba1f8",
+        "id": "f143f0b.3a07c1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4419.5665283203125,
-        "y": 310.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 4415.5665283203125,
+        "y": 335.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1167b845.d3eb88"
+                "cf3b3b93.559ff8"
             ]
         ]
     },
     {
-        "id": "1167b845.d3eb88",
+        "id": "cf3b3b93.559ff8",
         "type": "set",
         "name": "set domain-A.ltpId",
         "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-ltp-id`' value=\"`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />",
         "comments": "",
-        "x": 4601.5665283203125,
-        "y": 314.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 4597.5665283203125,
+        "y": 339.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "ab85b68d.00fab8",
+        "id": "5a762005.4bb698",
         "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": 4421.5665283203125,
-        "y": 360.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 4417.5665283203125,
+        "y": 385.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "19848a3.1ad4df6",
+        "id": "52d7e7df.a91a1",
         "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.dst-tp`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-dst-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4041.5665283203125,
-        "y": 969.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4037.5665283203125,
+        "y": 994.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "bcadf20f.09707",
-                "f49b197.760f268"
+                "b790dd89.107528",
+                "fa4381d0.a02478"
             ]
         ]
     },
     {
-        "id": "f49b197.760f268",
+        "id": "fa4381d0.a02478",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4262.5665283203125,
-        "y": 937.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4258.5665283203125,
+        "y": 962.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "7a4a14cb.2c7cc4"
+                "c3eeee94.1a5ec8"
             ]
         ]
     },
     {
-        "id": "bcadf20f.09707",
+        "id": "b790dd89.107528",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4262.5665283203125,
-        "y": 984.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4258.5665283203125,
+        "y": 1009.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "f8a2353e.30053"
+                "bd6ffbec.5ba5c8"
             ]
         ]
     },
     {
-        "id": "7a4a14cb.2c7cc4",
+        "id": "c3eeee94.1a5ec8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4427.5665283203125,
-        "y": 934.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4423.5665283203125,
+        "y": 959.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "c7ad40e1.18d2e8"
+                "11dcb504.78adf3"
             ]
         ]
     },
     {
-        "id": "c7ad40e1.18d2e8",
+        "id": "11dcb504.78adf3",
         "type": "set",
         "name": "set domain-B.ltpId",
         "xml": "<set>\n<parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-ltp-id`' value=\"`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4623.5665283203125,
-        "y": 931.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4619.5665283203125,
+        "y": 956.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "f8a2353e.30053",
+        "id": "bd6ffbec.5ba5c8",
         "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": 4429.5665283203125,
-        "y": 984.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4425.5665283203125,
+        "y": 1009.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "a07b9575.5fb718",
+        "id": "1de6c693.7d01c1",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='' />\n<!--<parameter name='tmp.aai.cross-link' value='' />-->\n<parameter name='tmp.aai.cross-link.' value='' />\n<!--<parameter name='tmp.aai.cross-link.link-role' value='' />-->",
         "comments": "",
-        "x": 1298.566650390625,
-        "y": 771.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 1294.566650390625,
+        "y": 796.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "49f4a3da.f830dc",
+        "id": "26a161aa.2643be",
         "type": "comment",
         "name": "Not useful anymore",
         "info": "this domain-A.ltpId is not used anymore",
         "comments": "",
-        "x": 4644.5665283203125,
-        "y": 290.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 4640.5665283203125,
+        "y": 315.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "6c8ca0d9.ae8db8",
+        "id": "5487d1ff.eac0c8",
         "type": "comment",
         "name": "Not useful anymore",
         "info": "this domain-B.ltpId is not used anymore",
         "comments": "",
-        "x": 4666.5665283203125,
-        "y": 903.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 4662.5665283203125,
+        "y": 928.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "10360917.9b8077",
+        "id": "f100fc15.cb611",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='`tmp.otninfo.`' value='' />\n<!--<parameter name='`tmp.otninfo_length`' value='0' />-->\n<parameter name='`tmp.otninfoProtect.`' value='' />",
         "comments": "",
-        "x": 939.566650390625,
-        "y": 699.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 935.566650390625,
+        "y": 724.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "197c2e5d.40b5c2",
+        "id": "9b78b55b.4bf9a8",
         "type": "comment",
         "name": "May not be necessary",
         "info": "",
         "comments": "",
-        "x": 950.566650390625,
-        "y": 652.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 946.566650390625,
+        "y": 677.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "9aea1ae3.78f458",
+        "id": "a5abe9c0.4a1de8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 930.566650390625,
-        "y": 449.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 926.566650390625,
+        "y": 474.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "8d20e71f.73ff3",
-                "a7d23344.01d178",
-                "bdabda22.abbcf",
-                "2d95a78.15b9dd8",
-                "fa4a5e3a.f8a4e8",
-                "1732667e.72f262",
-                "2d0258cc.74942",
-                "52bfffd9.b2be3",
-                "9fbe4c7e.064f2",
-                "272b0d1.5ea4172",
-                "c5b8562e.825c2",
-                "f2fd0ea2.f13608",
-                "5207916.8d843f"
+                "cf81370c.645668",
+                "6acb8746.707c6",
+                "b62b9d9c.e5b378",
+                "bdc49cf5.f2028",
+                "30bab9df.0fb49e",
+                "9da40736.322f1",
+                "8ed4edf7.ad067",
+                "58cff761.b82798",
+                "bfa2854e.87e33",
+                "e1bfc658.320cc8",
+                "eff9186e.125608",
+                "94f6beae.dc07e",
+                "7b0887bb.99971"
             ]
         ]
     },
     {
-        "id": "b34bb5ff.c918e",
+        "id": "944b5459.a274f8",
         "type": "execute",
         "name": "execute PCE in ccsdk/sli/core",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePaths' >\n<parameter name=\"pnfs-pfx\" value='ccsdkTopopnfs'/>\n<parameter name=\"links-pfx\" value=\"ccsdkTopologicalLinks\"/>\n<parameter name=\"response-pfx\" value=\"otn-oof\"/>\n<parameter name=\"output-end-to-end-path\" value=\"false\"/>\n<!--<parameter name=\"src-node\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"dst-node\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"src-node\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"dst-node\" value=\"`$tmp.pce-dst-node`\"/>\n<parameter name=\"dst-node-backup\" value=\"`$tmp.pce-dst-node-backup`\"/>\n<parameter name=\"require-backuppath\" value=\"`$hasSecondary`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1752.566650390625,
-        "y": 696.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 1800.566650390625,
+        "y": 614.566650390625,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "d8269b88.a628f",
-                "bd71ad8b.09afd",
-                "ab86e983.081cb"
+                "f1f2058b.751c8",
+                "7a5d3ea0.b3f9",
+                "923aea28.d945"
             ]
         ]
     },
     {
-        "id": "8d20e71f.73ff3",
+        "id": "cf81370c.645668",
         "type": "record",
         "name": "record tmp.pce-src and dst node and backup",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<!--<parameter name=\"field1\" value=\"Path computation succeed!\"/>-->\n<!--<parameter name=\"field2\" value=\"`$ccsdkTopo.resp.solutions_length`\"/>-->\n\n<!--<parameter name=\"field1\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"field2\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"field1\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"field2\" value=\"`$tmp.pce-dst-node`\"/>\n<parameter name=\"field3\" value=\"`$tmp.pce-dst-node-backup`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1226.566650390625,
-        "y": 482.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1222.566650390625,
+        "y": 507.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d8269b88.a628f",
+        "id": "f1f2058b.751c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1997.566650390625,
-        "y": 728.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 2045.566650390625,
+        "y": 646.566650390625,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "bd71ad8b.09afd",
+        "id": "7a5d3ea0.b3f9",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2004.566650390625,
-        "y": 770.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 2052.566650390625,
+        "y": 688.566650390625,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ab86e983.081cb",
+        "id": "923aea28.d945",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1999.566650390625,
-        "y": 691.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 2047.566650390625,
+        "y": 609.566650390625,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a7d23344.01d178",
+        "id": "6acb8746.707c6",
         "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": 1147.566650390625,
-        "y": 354.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1143.566650390625,
+        "y": 379.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "bdabda22.abbcf",
+        "id": "b62b9d9c.e5b378",
         "type": "set",
         "name": "set tmp.pce-dst-node",
         "xml": "<set>\n<!--<parameter name='$tmp.pce-dst-node' 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<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.pce-dst-node' 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                                                   $otnTopoIdDst + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />",
         "comments": "",
-        "x": 1147.566650390625,
-        "y": 394.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1143.566650390625,
+        "y": 419.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "78ed6398.2c281c",
+        "id": "a1a53385.974798",
         "type": "set",
         "name": "set src-ltpId",
         "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$otn-oof.solutions[$vidx].src_pinterface`\" />\n<parameter name='tmp.src-pnf-name' value=\"`$otn-oof.solutions[$vidx].src_node`\" />\n",
         "comments": "",
-        "x": 1280.566650390625,
-        "y": 902.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 1276.566650390625,
+        "y": 927.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "a81521ff.85b448",
+        "id": "9bfb8439.b10f28",
         "type": "set",
         "name": "set dst-ltpId",
         "xml": "<set>\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$otn-oof.solutions[$vidx].dst_pinterface`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$otn-oof.solutions[$vidx].dst_node`\" />\n\n\n",
         "comments": "",
-        "x": 1281.566650390625,
-        "y": 952.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 1277.566650390625,
+        "y": 977.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "2d95a78.15b9dd8",
+        "id": "bdc49cf5.f2028",
         "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/v21/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
         "comments": "",
         "outputs": 1,
-        "x": 1204.566650390625,
-        "y": 78.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1200.566650390625,
+        "y": 103.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "85160fe1.7646a8",
-                "5cf07174.f97d5",
-                "95dd25f4.16dd98"
+                "7438fc42.8bf3c4",
+                "86d1788.90fdc88",
+                "c2668ef6.6942a8"
             ]
         ]
     },
     {
-        "id": "5cf07174.f97d5",
+        "id": "86d1788.90fdc88",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1437.566650390625,
-        "y": 102.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1433.566650390625,
+        "y": 127.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "95dd25f4.16dd98",
+        "id": "c2668ef6.6942a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1451.566650390625,
-        "y": 142.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1447.566650390625,
+        "y": 167.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "85160fe1.7646a8",
+        "id": "7438fc42.8bf3c4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1440.566650390625,
-        "y": 61.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1436.566650390625,
+        "y": 86.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "fa4a5e3a.f8a4e8",
+        "id": "30bab9df.0fb49e",
         "type": "for",
         "name": "for netwidx..allNetworksList_length",
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 1196.566650390625,
-        "y": 124.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1192.566650390625,
+        "y": 149.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "a46c1b09.222d88"
+                "1efd95dd.c4201a"
             ]
         ]
     },
     {
-        "id": "a46c1b09.222d88",
+        "id": "1efd95dd.c4201a",
         "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": 1517.566650390625,
-        "y": 200.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1513.566650390625,
+        "y": 225.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "d01d8d32.ec5d38",
-                "81f4ca42.44c8"
+                "bbe8ec0c.253de",
+                "883a9f4d.559ca"
             ]
         ]
     },
     {
-        "id": "d01d8d32.ec5d38",
+        "id": "bbe8ec0c.253de",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1741.566650390625,
-        "y": 262.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1737.566650390625,
+        "y": 287.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "87874c93.14d4c8"
+                "afd0ea45.773d98"
             ]
         ]
     },
     {
-        "id": "87874c93.14d4c8",
+        "id": "afd0ea45.773d98",
         "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": 1954.566650390625,
-        "y": 262.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1950.566650390625,
+        "y": 287.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1f97427e.3bd1ce"
+                "ed49f4d6.4912c8"
             ]
         ]
     },
     {
-        "id": "1f97427e.3bd1ce",
+        "id": "ed49f4d6.4912c8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2119.566650390625,
-        "y": 262.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 2115.566650390625,
+        "y": 287.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "e1187fc2.b7873"
+                "21777200.d11516"
             ]
         ]
     },
     {
-        "id": "e1187fc2.b7873",
+        "id": "21777200.d11516",
         "type": "set",
         "name": "set otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 2288.566650390625,
-        "y": 262.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 2284.566650390625,
+        "y": 287.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "81f4ca42.44c8",
+        "id": "883a9f4d.559ca",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1741.566650390625,
-        "y": 315.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1737.566650390625,
+        "y": 340.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "c4d51181.d481d"
+                "64bf9628.6125c8"
             ]
         ]
     },
     {
-        "id": "c4d51181.d481d",
+        "id": "64bf9628.6125c8",
         "type": "switchNode",
         "name": "switch provider-id domainB",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainB-pnfName[2]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1929.566650390625,
-        "y": 315.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1925.566650390625,
+        "y": 340.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1eb6a395.543214",
-                "aff2e998.39f418"
+                "79533178.406688",
+                "2e7334d4.9ca8fc"
             ]
         ]
     },
     {
-        "id": "1eb6a395.543214",
+        "id": "79533178.406688",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2119.566650390625,
-        "y": 315.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 2115.566650390625,
+        "y": 340.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "131fed58.61933b"
+                "6704f6f.e3e6c88"
             ]
         ]
     },
     {
-        "id": "131fed58.61933b",
+        "id": "6704f6f.e3e6c88",
         "type": "switchNode",
         "name": "switch te-topo-id",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainB-pnfName[6]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2287.566650390625,
-        "y": 315.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 2283.566650390625,
+        "y": 340.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "beb59651.122648"
+                "3eaa1b32.d6627c"
             ]
         ]
     },
     {
-        "id": "beb59651.122648",
+        "id": "3eaa1b32.d6627c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2443.566650390625,
-        "y": 315.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 2439.566650390625,
+        "y": 340.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "27e9a268.b581ce"
+                "1e64b2b7.385b1d"
             ]
         ]
     },
     {
-        "id": "fe5f3417.d45418",
+        "id": "82fe228a.5ad828",
         "type": "set",
         "name": "set otnTopoIdDst",
         "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 3138.566650390625,
-        "y": 219.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 3134.566650390625,
+        "y": 244.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "1732667e.72f262",
+        "id": "9da40736.322f1",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<!--<parameter name='`otn-oof`' value='' />-->\n<parameter name='otn-oof.' value='' />\n<!--<parameter name='`otn-oof.solutions`' value='' />-->\n<!--<parameter name='`otn-oof.solutions.`' value='' />-->\n<!--<parameter name='`otn-oof.solutions_length`' value='0' />-->",
         "comments": "",
-        "x": 1141.566650390625,
-        "y": 295.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1137.566650390625,
+        "y": 320.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "2d0258cc.74942",
+        "id": "8ed4edf7.ad067",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
         "comments": "",
-        "x": 1150.566650390625,
-        "y": 177.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1146.566650390625,
+        "y": 202.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "52bfffd9.b2be3",
+        "id": "58cff761.b82798",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node.' value='' />\n",
         "comments": "",
-        "x": 1148.566650390625,
-        "y": 219.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1144.566650390625,
+        "y": 244.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "9fbe4c7e.064f2",
+        "id": "bfa2854e.87e33",
         "type": "record",
         "name": "record otn-oof.",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$otn-oof.`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1137.566650390625,
-        "y": 530.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 1133.566650390625,
+        "y": 555.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6130a3db.8f4a2c",
+        "id": "375fbf69.a0241",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1159.566650390625,
-        "y": 603.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 1155.566650390625,
+        "y": 628.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "272b0d1.5ea4172",
+        "id": "e1bfc658.320cc8",
         "type": "set",
         "name": "set filename",
         "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='filenamemm' value=\"`$tmp.pce-src-node + $tmp.pce-dst-node + $tmp.pce-dst-node-backup`\" />",
         "comments": "",
-        "x": 1133.566650390625,
-        "y": 566.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 1129.566650390625,
+        "y": 591.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "aff2e998.39f418",
+        "id": "2e7334d4.9ca8fc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2109.566650390625,
-        "y": 379.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 2105.566650390625,
+        "y": 404.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "45368237.09cbd4"
+                "411c67c5.e1d9e8"
             ]
         ]
     },
     {
-        "id": "45368237.09cbd4",
+        "id": "411c67c5.e1d9e8",
         "type": "switchNode",
         "name": "switch provider-id domainC",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainC-pnfName[2]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2310.566650390625,
-        "y": 380.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 2306.566650390625,
+        "y": 405.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "60978bb2.ce9a04"
+                "27025665.dd4562"
             ]
         ]
     },
     {
-        "id": "60978bb2.ce9a04",
+        "id": "27025665.dd4562",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2520.566650390625,
-        "y": 380.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 2516.566650390625,
+        "y": 405.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "cc22664a.751d9"
+                "e947b95b.27d1a8"
             ]
         ]
     },
     {
-        "id": "2b3da5c.c5bcc5a",
+        "id": "c6b462ec.d5ec38",
         "type": "set",
         "name": "set otnTopoIdDstBackup",
         "xml": "<set>\n<parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 3228.566650390625,
-        "y": 470.5666961669922,
-        "z": "a133aed2.437bc",
+        "x": 3224.566650390625,
+        "y": 495.5666961669922,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "c5b8562e.825c2",
+        "id": "eff9186e.125608",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node-backup.' value='' />\n",
         "comments": "",
-        "x": 1146.566650390625,
-        "y": 257.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1142.566650390625,
+        "y": 282.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "f2fd0ea2.f13608",
+        "id": "94f6beae.dc07e",
         "type": "set",
         "name": "set tmp.pce-dst-node-backup",
         "xml": "<set>\n<!--<parameter name='$tmp.pce-dst-node' 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<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.pce-dst-node-backup' 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                                                   $otnTopoIdDstBackup + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />",
         "comments": "",
-        "x": 1178.566650390625,
-        "y": 435.56666564941406,
-        "z": "a133aed2.437bc",
+        "x": 1174.566650390625,
+        "y": 460.56666564941406,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "5207916.8d843f",
+        "id": "7b0887bb.99971",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1182.566650390625,
-        "y": 682.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 1178.566650390625,
+        "y": 707.5666656494141,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "9d24bff4.f7fc3",
-                "53b4e0bd.3986c8"
+                "92b6aeb7.23ac68",
+                "21cc841a.968b4c"
             ]
         ]
     },
     {
-        "id": "9d24bff4.f7fc3",
+        "id": "92b6aeb7.23ac68",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1373.566650390625,
-        "y": 686.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 1421.566650390625,
+        "y": 604.566650390625,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "c8813a5.7f98b48"
+                "1d1085ac.753a0a"
             ]
         ]
     },
     {
-        "id": "c8813a5.7f98b48",
+        "id": "1d1085ac.753a0a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1500.566650390625,
-        "y": 685.5666656494141,
-        "z": "a133aed2.437bc",
-        "wires": [
-            [
-                "b34bb5ff.c918e"
-            ]
-        ]
-    },
-    {
-        "id": "53b4e0bd.3986c8",
-        "type": "outcomeTrue",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1375.566650390625,
-        "y": 639.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 1548.566650390625,
+        "y": 603.566650390625,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "758c479c.bf4b8"
+                "944b5459.a274f8"
             ]
         ]
     },
     {
-        "id": "758c479c.bf4b8",
+        "id": "1548db64.e4c295",
         "type": "execute",
         "name": "execute PCE in ccsdk/sli/core",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >\n<parameter name=\"pnfs-pfx\" value='ccsdkTopopnfs'/>\n<parameter name=\"links-pfx\" value=\"ccsdkTopologicalLinks\"/>\n<parameter name=\"response-pfx\" value=\"otn-oof\"/>\n<parameter name=\"output-end-to-end-path\" value=\"false\"/>\n<!--<parameter name=\"src-node\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"dst-node\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"src-node\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"dst-node\" value=\"`$tmp.pce-dst-node`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1749.566650390625,
-        "y": 569.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 1800.566650390625,
+        "y": 756.566650390625,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "b6552b0f.7b51e8",
-                "e27e8a21.4f0d3",
-                "b3bc4161.bbb128"
+                "eea15d82.e13c8",
+                "86fb305c.19fe88",
+                "e46cbc18.4abe38"
             ]
         ]
     },
     {
-        "id": "b6552b0f.7b51e8",
+        "id": "eea15d82.e13c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1994.566650390625,
-        "y": 601.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 2045.566650390625,
+        "y": 788.566650390625,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e27e8a21.4f0d3",
+        "id": "86fb305c.19fe88",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2001.566650390625,
-        "y": 643.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 2052.566650390625,
+        "y": 830.566650390625,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b3bc4161.bbb128",
+        "id": "e46cbc18.4abe38",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1996.566650390625,
-        "y": 564.5666656494141,
-        "z": "a133aed2.437bc",
+        "x": 2047.566650390625,
+        "y": 751.566650390625,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c19998ca.837848",
+        "id": "29b9a31c.a264c4",
         "type": "for",
         "name": "for vidx..otn-oof.secondarySolutions_length[]",
         "xml": "<for index='vidx' start='0' end='`$otn-oof.secondarySolutions_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 947.566650390625,
-        "y": 2100.566665649414,
-        "z": "a133aed2.437bc",
+        "x": 943.566650390625,
+        "y": 2125.566665649414,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "decd0bab.6330f"
+                "72742319.713a0c"
             ]
         ]
     },
     {
-        "id": "decd0bab.6330f",
+        "id": "72742319.713a0c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1052.0938720703125,
-        "y": 2291.607437133789,
-        "z": "a133aed2.437bc",
+        "x": 1048.0938720703125,
+        "y": 2316.607437133789,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "81b9ae35.358fd",
-                "74f1c10d.f5627",
-                "64fb9896.7c1ac8",
-                "74b04e90.089e28",
-                "d162f07e.eec04"
+                "65028d7c.8b8c9c",
+                "8944f22e.dc9748",
+                "7f065ced.91ecac",
+                "dd82f408.a50d68",
+                "2e2b77b7.7faa3"
             ]
         ]
     },
     {
-        "id": "81b9ae35.358fd",
+        "id": "65028d7c.8b8c9c",
         "type": "set",
         "name": "set otn-oof.link-name and etc.",
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.secondarySolutions[$vidx].original_link`' />\n<parameter name='otn-oof.start-node' value='`$otn-oof.secondarySolutions[$vidx].src_node`' />\n<parameter name='otn-oof.end-node' value='`$otn-oof.secondarySolutions[$vidx].dst_node`' />",
         "comments": "",
-        "x": 1298.5938720703125,
-        "y": 2184.607437133789,
-        "z": "a133aed2.437bc",
+        "x": 1294.5938720703125,
+        "y": 2209.607437133789,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "d162f07e.eec04",
+        "id": "2e2b77b7.7faa3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1265.0938720703125,
-        "y": 2373.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 1261.0938720703125,
+        "y": 2398.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "9a15bd2c.c28818",
-                "85fd58d.daa8628"
+                "5f266d1.d23e694",
+                "87205bbb.f159d"
             ]
         ]
     },
     {
-        "id": "74f1c10d.f5627",
+        "id": "8944f22e.dc9748",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='' />\n<!--<parameter name='tmp.aai.cross-link' value='' />-->\n<parameter name='tmp.aai.cross-link.' value='' />\n<!--<parameter name='tmp.aai.cross-link.link-role' value='' />-->\n\n<parameter name='tmp.src-pnf-name' value='' />\n<parameter name='tmp.cross-link.' value='' />\n<parameter name='tmp.dst-pnf-name' value='' />\n<parameter name='tmp.aai.src-tp.' value='' />\n<parameter name='param-prefix-src-tp.' value='' />\n<parameter name='tmp.aai.src-pnf.' value='' />\n<parameter name='tmp.domain-A.network-id' value='' />\n<parameter name='tmp.aai.src-network-resource.' value='' />\n<parameter name='tmp.domain-A.ttp-id' value='' />\n<parameter name='tmp.aai.src-ttp.' value='' />\n\n<parameter name='tmp.aai.dst-tp.' value='' />\n<parameter name='param-prefix-dst-tp.' value='' />\n<parameter name='tmp.aai.dst-pnf.' value='' />\n<parameter name='tmp.domain-C.network-id' value='' />\n<parameter name='tmp.aai.dst-network-resource.' value='' />\n<parameter name='tmp.domain-C.ttp-id' value='' />\n<parameter name='tmp.aai.dst-ttp.' value='' />\n\n",
         "comments": "",
-        "x": 1289.59375,
-        "y": 2113.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 1285.59375,
+        "y": 2138.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "64fb9896.7c1ac8",
+        "id": "7f065ced.91ecac",
         "type": "set",
         "name": "set src-ltpId",
         "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$otn-oof.secondarySolutions[$vidx].src_pinterface`\" />\n<parameter name='tmp.src-pnf-name' value=\"`$otn-oof.secondarySolutions[$vidx].src_node`\" />\n",
         "comments": "",
-        "x": 1271.59375,
-        "y": 2244.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 1267.59375,
+        "y": 2269.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "74b04e90.089e28",
+        "id": "dd82f408.a50d68",
         "type": "set",
         "name": "set dst-ltpId",
         "xml": "<set>\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$otn-oof.secondarySolutions[$vidx].dst_pinterface`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$otn-oof.secondarySolutions[$vidx].dst_node`\" />\n\n\n",
         "comments": "",
-        "x": 1272.59375,
-        "y": 2294.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 1268.59375,
+        "y": 2319.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "46c3f571.5e6ab4",
+        "id": "e7a453b4.217a88",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2790.5936279296875,
-        "y": 2108.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2786.5936279296875,
+        "y": 2133.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "190fafd3.9d5618"
+                "a6ec239b.39ee68"
             ]
         ]
     },
     {
-        "id": "1af50a9f.ba08f5",
+        "id": "b46c3c11.2737c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2823.59375,
-        "y": 2166.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2819.59375,
+        "y": 2191.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "eb6a21e7.d2544"
+                "7915fc0.cce3804"
             ]
         ]
     },
     {
-        "id": "9ac3f118.22cc9",
+        "id": "a88e58be.776e6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2826.59375,
-        "y": 2218.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2822.59375,
+        "y": 2243.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "5df935cf.d90ef4"
+                "ff0b2c64.5ad4b8"
             ]
         ]
     },
     {
-        "id": "eb6a21e7.d2544",
+        "id": "7915fc0.cce3804",
         "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": 3008.59375,
-        "y": 2170.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 3004.59375,
+        "y": 2195.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "5df935cf.d90ef4",
+        "id": "ff0b2c64.5ad4b8",
         "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": 2996.59375,
-        "y": 2221.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2992.59375,
+        "y": 2246.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "76d93361.427b24",
+        "id": "189f7ad9.7daed5",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pintsidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3141.9764404296875,
-        "y": 2103.980667114258,
-        "z": "a133aed2.437bc",
+        "x": 3137.9764404296875,
+        "y": 2128.980667114258,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "3f5fbc68.02a224"
+                "53709e5e.d75de"
             ]
         ]
     },
     {
-        "id": "3f5fbc68.02a224",
+        "id": "53709e5e.d75de",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3393.9764404296875,
-        "y": 2100.980667114258,
-        "z": "a133aed2.437bc",
+        "x": 3389.9764404296875,
+        "y": 2125.980667114258,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "ba2b4720.d65cf"
+                "7637ca2d.741c2c"
             ]
         ]
     },
     {
-        "id": "190fafd3.9d5618",
+        "id": "a6ec239b.39ee68",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2924.5936279296875,
-        "y": 2104.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2920.5936279296875,
+        "y": 2129.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "76d93361.427b24"
+                "189f7ad9.7daed5"
             ]
         ]
     },
     {
-        "id": "85fd58d.daa8628",
+        "id": "87205bbb.f159d",
         "type": "get-resource",
         "name": "get-resource src tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2593.09375,
-        "y": 2147.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2589.09375,
+        "y": 2172.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "46c3f571.5e6ab4",
-                "1af50a9f.ba08f5",
-                "9ac3f118.22cc9"
+                "e7a453b4.217a88",
+                "b46c3c11.2737c8",
+                "a88e58be.776e6"
             ]
         ]
     },
     {
-        "id": "17b12d07.01db03",
+        "id": "b5bc8dfa.18e39",
         "type": "set",
         "name": "set domain A node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.ttp-id' value=\"`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4127.0936279296875,
-        "y": 2023.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4123.0936279296875,
+        "y": 2048.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "56dc3866.a81c4",
+        "id": "4d4171cc.48b25",
         "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.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4135.0936279296875,
-        "y": 2075.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4131.0936279296875,
+        "y": 2100.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "bd3f106f.63b0f8"
+                "99655efb.80b65"
             ]
         ]
     },
     {
-        "id": "bd3f106f.63b0f8",
+        "id": "99655efb.80b65",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4341.5936279296875,
-        "y": 2053.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4337.5936279296875,
+        "y": 2078.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "e873d0c7.864da"
+                "8f6c7450.ef1c"
             ]
         ]
     },
     {
-        "id": "ba2b4720.d65cf",
+        "id": "7637ca2d.741c2c",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3679.2620849609375,
-        "y": 2101.802444458008,
-        "z": "a133aed2.437bc",
+        "x": 3675.2620849609375,
+        "y": 2126.802444458008,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "53671013.434608"
+                "5bfd3b7c.5be7ac"
             ]
         ]
     },
     {
-        "id": "53671013.434608",
+        "id": "5bfd3b7c.5be7ac",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3906.0936279296875,
-        "y": 2090.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 3902.0936279296875,
+        "y": 2115.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "17b12d07.01db03",
-                "56dc3866.a81c4",
-                "c0980ef4.f86658",
-                "1febeafa.37d915",
-                "ab68a575.dbe428"
+                "b5bc8dfa.18e39",
+                "4d4171cc.48b25",
+                "f91d3228.bde968",
+                "f52dc6a0.330a3",
+                "5d21c2b3.c568f4"
             ]
         ]
     },
     {
-        "id": "e873d0c7.864da",
+        "id": "8f6c7450.ef1c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4516.5936279296875,
-        "y": 2049.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4512.5936279296875,
+        "y": 2074.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "42a0b5ef.0a3e6c"
+                "4ef7dcb5.6e7414"
             ]
         ]
     },
     {
-        "id": "c0980ef4.f86658",
+        "id": "f91d3228.bde968",
         "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-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3996.5936279296875,
-        "y": 1893.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 3992.5936279296875,
+        "y": 1918.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "fabc0bd7.062ae",
-                "cfe003ed.a587d",
-                "45d38fe1.3add68"
+                "11fdba85.d2e555",
+                "c4446af6.0110f8",
+                "f32a5dd3.e26328"
             ]
         ]
     },
     {
-        "id": "fabc0bd7.062ae",
+        "id": "11fdba85.d2e555",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4192.09375,
-        "y": 1845.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4188.09375,
+        "y": 1870.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "c6a1c641.2a058"
+                "148f5625.68ca22"
             ]
         ]
     },
     {
-        "id": "cfe003ed.a587d",
+        "id": "c4446af6.0110f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4184.09375,
-        "y": 1900.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4180.09375,
+        "y": 1925.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1b4dfe50.a881e2"
+                "9347116a.3058c8"
             ]
         ]
     },
     {
-        "id": "45d38fe1.3add68",
+        "id": "f32a5dd3.e26328",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4189.09375,
-        "y": 1957.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4185.09375,
+        "y": 1982.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "6ffbe3ea.ec634c"
+                "9b351c5a.c32878"
             ]
         ]
     },
     {
-        "id": "6ffbe3ea.ec634c",
+        "id": "9b351c5a.c32878",
         "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": 4341.09375,
-        "y": 1958.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4337.09375,
+        "y": 1983.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "1b4dfe50.a881e2",
+        "id": "9347116a.3058c8",
         "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": 4352.09375,
-        "y": 1903.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4348.09375,
+        "y": 1928.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "c6a1c641.2a058",
+        "id": "148f5625.68ca22",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4336.47607421875,
-        "y": 1842.9766082763672,
-        "z": "a133aed2.437bc",
+        "x": 4332.47607421875,
+        "y": 1867.9766082763672,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "59cb321.8a1954c",
-                "49c6e1ec.24535"
+                "351bcf46.2fdac",
+                "23e1fb86.3e9064"
             ]
         ]
     },
     {
-        "id": "59cb321.8a1954c",
+        "id": "351bcf46.2fdac",
         "type": "set",
         "name": "set domain A node-id and tpn",
         "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />",
         "comments": "",
-        "x": 4561.5936279296875,
-        "y": 1798.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4557.5936279296875,
+        "y": 1823.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "1febeafa.37d915",
+        "id": "f52dc6a0.330a3",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4083.5936279296875,
-        "y": 2140.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4079.5936279296875,
+        "y": 2165.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "49c6e1ec.24535",
+        "id": "23e1fb86.3e9064",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4520.5936279296875,
-        "y": 1857.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4516.5936279296875,
+        "y": 1882.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "8d839c87.82ade8"
+                "42d6b89e.bcfbd"
             ]
         ]
     },
     {
-        "id": "ab68a575.dbe428",
+        "id": "5d21c2b3.c568f4",
         "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.src-tp`'/>-->\n<parameter name=\"original_string\" value='`$tmp.aai.src-tp.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-src-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4024.5936279296875,
-        "y": 1687.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4020.5936279296875,
+        "y": 1712.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "f1409763.115658",
-                "697906a6.2f581"
+                "beac11e9.8b163",
+                "775594b3.5e9f34"
             ]
         ]
     },
     {
-        "id": "697906a6.2f581",
+        "id": "775594b3.5e9f34",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4245.5936279296875,
-        "y": 1655.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4241.5936279296875,
+        "y": 1680.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "54d6be87.274308"
+                "62125b93.79eaac"
             ]
         ]
     },
     {
-        "id": "f1409763.115658",
+        "id": "beac11e9.8b163",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4245.5936279296875,
-        "y": 1702.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4241.5936279296875,
+        "y": 1727.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "6390534f.61c684"
+                "6928fcc.f0dc584"
             ]
         ]
     },
     {
-        "id": "54d6be87.274308",
+        "id": "62125b93.79eaac",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4410.5936279296875,
-        "y": 1652.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4406.5936279296875,
+        "y": 1677.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "f9eb1fe5.bf94b8"
+                "ab5f1155.b15a3"
             ]
         ]
     },
     {
-        "id": "f9eb1fe5.bf94b8",
+        "id": "ab5f1155.b15a3",
         "type": "set",
         "name": "set domain-A.ltpId",
         "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-ltp-id`' value=\"`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />",
         "comments": "",
-        "x": 4592.5936279296875,
-        "y": 1656.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4588.5936279296875,
+        "y": 1681.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "6390534f.61c684",
+        "id": "6928fcc.f0dc584",
         "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": 4412.5936279296875,
-        "y": 1702.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4408.5936279296875,
+        "y": 1727.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "78eb0221.5dfc84",
+        "id": "befd05b9.a30de",
         "type": "comment",
         "name": "Not useful anymore",
         "info": "this domain-A.ltpId is not used anymore",
         "comments": "",
-        "x": 4635.5936279296875,
-        "y": 1632.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4631.5936279296875,
+        "y": 1657.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "42a0b5ef.0a3e6c",
+        "id": "4ef7dcb5.6e7414",
         "type": "set",
         "name": "set domain A tunnel tp ip",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-tunnel-tp-id`' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />\n",
         "comments": "",
-        "x": 4777.5936279296875,
-        "y": 2046.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4773.5936279296875,
+        "y": 2071.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "ba5b9e92.be837",
+        "id": "f0218229.275af8",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4918.5936279296875,
-        "y": 1861.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4914.5936279296875,
+        "y": 1886.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "897ba475.c5f53"
+                "480722d5.cb6b3c"
             ]
         ]
     },
     {
-        "id": "8d839c87.82ade8",
+        "id": "42d6b89e.bcfbd",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4715.5936279296875,
-        "y": 1857.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4711.5936279296875,
+        "y": 1882.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "ba5b9e92.be837"
+                "f0218229.275af8"
             ]
         ]
     },
     {
-        "id": "897ba475.c5f53",
+        "id": "480722d5.cb6b3c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5095.5936279296875,
-        "y": 1853.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 5091.5936279296875,
+        "y": 1878.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "bef188d5.c786d8",
-                "792f44ce.13c154",
-                "18753ca.06672c3"
+                "36af77c8.926fd8",
+                "18e52414.c15f84",
+                "18749988.48ed66"
             ]
         ]
     },
     {
-        "id": "bef188d5.c786d8",
+        "id": "36af77c8.926fd8",
         "type": "set",
         "name": "set domain A network-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5310.5936279296875,
-        "y": 1834.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 5306.5936279296875,
+        "y": 1859.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "792f44ce.13c154",
+        "id": "18e52414.c15f84",
         "type": "get-resource",
         "name": "get-resource src network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5327.5936279296875,
-        "y": 1898.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 5323.5936279296875,
+        "y": 1923.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "5b892dc0.3c8d04"
+                "d15fc532.410808"
             ]
         ]
     },
     {
-        "id": "5b892dc0.3c8d04",
+        "id": "d15fc532.410808",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5551.0936279296875,
-        "y": 1899.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 5547.0936279296875,
+        "y": 1924.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "ba2d6189.94da7"
+                "8cba8498.001648"
             ]
         ]
     },
     {
-        "id": "ba2d6189.94da7",
+        "id": "8cba8498.001648",
         "type": "set",
         "name": "set domain A network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-network-id`' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-provider-id`' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-client-id`' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-topology-id`' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-network-type`' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n<parameter name='`tmp.otninfoProtect`' value='`$vidx + 1`' />\n\n\n",
         "comments": "",
-        "x": 5815.5936279296875,
-        "y": 1888.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 5811.5936279296875,
+        "y": 1913.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "18753ca.06672c3",
+        "id": "18749988.48ed66",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5254.5936279296875,
-        "y": 1951.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 5250.5936279296875,
+        "y": 1976.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "8130be42.c4b418",
+        "id": "e3152c7b.42988",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2466.0936279296875,
-        "y": 2617.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2462.0936279296875,
+        "y": 2642.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "9a15bd2c.c28818",
+        "id": "5f266d1.d23e694",
         "type": "get-resource",
         "name": "get-resource dst tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2547.09375,
-        "y": 2513.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2543.09375,
+        "y": 2538.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "bbfaea50.2f8978",
-                "48b1011.95ef3",
-                "f850bc1.45f5a4"
+                "e3416277.a5383",
+                "35cf03db.613854",
+                "96b92483.78f348"
             ]
         ]
     },
     {
-        "id": "bbfaea50.2f8978",
+        "id": "e3416277.a5383",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2769.5936279296875,
-        "y": 2655.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2765.5936279296875,
+        "y": 2680.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "8bd3d4c4.129cd"
+                "695f1ad6.255c0c"
             ]
         ]
     },
     {
-        "id": "48b1011.95ef3",
+        "id": "35cf03db.613854",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2753.5936279296875,
-        "y": 2706.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2749.5936279296875,
+        "y": 2731.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "31d51c19.564114"
+                "95ff46ae.989338"
             ]
         ]
     },
     {
-        "id": "f850bc1.45f5a4",
+        "id": "96b92483.78f348",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2756.5936279296875,
-        "y": 2758.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2752.5936279296875,
+        "y": 2783.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "e3e65a88.eeb708"
+                "702c044d.a276dc"
             ]
         ]
     },
     {
-        "id": "e3e65a88.eeb708",
+        "id": "702c044d.a276dc",
         "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": 2926.5936279296875,
-        "y": 2761.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2922.5936279296875,
+        "y": 2786.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "31d51c19.564114",
+        "id": "95ff46ae.989338",
         "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": 2938.5936279296875,
-        "y": 2710.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2934.5936279296875,
+        "y": 2735.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "93be1dc8.40e81",
+        "id": "cf47c4e.3b665b8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pintdidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3125.9764404296875,
-        "y": 2665.980667114258,
-        "z": "a133aed2.437bc",
+        "x": 3121.9764404296875,
+        "y": 2690.980667114258,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "fdc63182.4572f"
+                "1dd200a7.125687"
             ]
         ]
     },
     {
-        "id": "fdc63182.4572f",
+        "id": "1dd200a7.125687",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3368.9764404296875,
-        "y": 2664.980667114258,
-        "z": "a133aed2.437bc",
+        "x": 3364.9764404296875,
+        "y": 2689.980667114258,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "d054e714.1f47"
+                "9d100149.51fc1"
             ]
         ]
     },
     {
-        "id": "8bd3d4c4.129cd",
+        "id": "695f1ad6.255c0c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2915.5936279296875,
-        "y": 2646.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 2911.5936279296875,
+        "y": 2671.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "93be1dc8.40e81"
+                "cf47c4e.3b665b8"
             ]
         ]
     },
     {
-        "id": "d054e714.1f47",
+        "id": "9d100149.51fc1",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3625.2620849609375,
-        "y": 2664.802444458008,
-        "z": "a133aed2.437bc",
+        "x": 3621.2620849609375,
+        "y": 2689.802444458008,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "64e60c2e.997314"
+                "883aea1c.549738"
             ]
         ]
     },
     {
-        "id": "64e60c2e.997314",
+        "id": "883aea1c.549738",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3925.0936279296875,
-        "y": 2662.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 3921.0936279296875,
+        "y": 2687.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1bae9a4e.9212ce",
-                "de2043de.3cb548",
-                "3a2030d6.3a864",
-                "5ff21da9.833f84",
-                "8657cf90.772ff"
+                "94206f0d.95ccf",
+                "16ed1500.9f0433",
+                "d67bf507.0e5f9",
+                "4435dab.dca2424",
+                "25e20a20.a9dcb6"
             ]
         ]
     },
     {
-        "id": "1bae9a4e.9212ce",
+        "id": "94206f0d.95ccf",
         "type": "set",
         "name": "set domain C node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-C.ttp-id' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4167.0936279296875,
-        "y": 2616.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4163.0936279296875,
+        "y": 2641.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "de2043de.3cb548",
+        "id": "16ed1500.9f0433",
         "type": "get-resource",
         "name": "get-resource dst 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.domain-C.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4157.0936279296875,
-        "y": 2667.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4153.0936279296875,
+        "y": 2692.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "5c3476dc.51e558"
+                "104922c4.11428d"
             ]
         ]
     },
     {
-        "id": "5c3476dc.51e558",
+        "id": "104922c4.11428d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4344.5936279296875,
-        "y": 2665.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4340.5936279296875,
+        "y": 2690.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "4eaafddf.a6a3f4"
+                "78d5a007.cba0e"
             ]
         ]
     },
     {
-        "id": "4eaafddf.a6a3f4",
+        "id": "78d5a007.cba0e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4533.5936279296875,
-        "y": 2654.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4529.5936279296875,
+        "y": 2679.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "c29c48f8.7f86a8"
+                "b81d23ea.740b38"
             ]
         ]
     },
     {
-        "id": "5ff21da9.833f84",
+        "id": "4435dab.dca2424",
         "type": "get-resource",
         "name": "get-resource dst pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3993.5936279296875,
-        "y": 2496.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 3989.5936279296875,
+        "y": 2521.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "89d8cb14.97ad38",
-                "b75d0391.114cc8",
-                "e1054df9.4be03"
+                "9f7deca5.5268a8",
+                "da4c932e.8f9b7",
+                "910b7b2f.6b9a08"
             ]
         ]
     },
     {
-        "id": "e1054df9.4be03",
+        "id": "910b7b2f.6b9a08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4189.09375,
-        "y": 2448.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4185.09375,
+        "y": 2473.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1aa1ec12.0bb82c"
+                "6f27e8e2.ede448"
             ]
         ]
     },
     {
-        "id": "b75d0391.114cc8",
+        "id": "da4c932e.8f9b7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4181.09375,
-        "y": 2503.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4177.09375,
+        "y": 2528.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "e4160067.4070c"
+                "a119b495.536c2"
             ]
         ]
     },
     {
-        "id": "89d8cb14.97ad38",
+        "id": "9f7deca5.5268a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4186.09375,
-        "y": 2560.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4182.09375,
+        "y": 2585.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "f68c7777.771208"
+                "80a7eb88.54c458"
             ]
         ]
     },
     {
-        "id": "1aa1ec12.0bb82c",
+        "id": "6f27e8e2.ede448",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4333.47607421875,
-        "y": 2445.976608276367,
-        "z": "a133aed2.437bc",
+        "x": 4329.47607421875,
+        "y": 2470.976608276367,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "f0006d82.9607f",
-                "e28e5fb.1f15da"
+                "9413138d.7b038",
+                "7ef053da.372d9c"
             ]
         ]
     },
     {
-        "id": "e4160067.4070c",
+        "id": "a119b495.536c2",
         "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": 4349.09375,
-        "y": 2506.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4345.09375,
+        "y": 2531.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "f68c7777.771208",
+        "id": "80a7eb88.54c458",
         "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": 4338.09375,
-        "y": 2561.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4334.09375,
+        "y": 2586.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "f0006d82.9607f",
+        "id": "9413138d.7b038",
         "type": "set",
         "name": "set domain C node-id and tpn",
         "xml": "<set>\n<parameter name='domain-C.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-C.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-node-id`' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4542.5936279296875,
-        "y": 2413.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4538.5936279296875,
+        "y": 2438.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "3a2030d6.3a864",
+        "id": "d67bf507.0e5f9",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4112.5936279296875,
-        "y": 2708.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4108.5936279296875,
+        "y": 2733.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "e28e5fb.1f15da",
+        "id": "7ef053da.372d9c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4521.5936279296875,
-        "y": 2464.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4517.5936279296875,
+        "y": 2489.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "6f7c8401.0c5c44"
+                "10136030.42aa18"
             ]
         ]
     },
     {
-        "id": "8657cf90.772ff",
+        "id": "25e20a20.a9dcb6",
         "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.dst-tp`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-dst-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4032.5936279296875,
-        "y": 2311.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4028.5936279296875,
+        "y": 2336.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1edc2bcc.25093c",
-                "7c75489d.8c3e48"
+                "a07d9f67.66341",
+                "93c9defd.2bdfa"
             ]
         ]
     },
     {
-        "id": "7c75489d.8c3e48",
+        "id": "93c9defd.2bdfa",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4253.5936279296875,
-        "y": 2279.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4249.5936279296875,
+        "y": 2304.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "1008d1fe.94472e"
+                "9382b345.a1d1e8"
             ]
         ]
     },
     {
-        "id": "1edc2bcc.25093c",
+        "id": "a07d9f67.66341",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4253.5936279296875,
-        "y": 2326.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4249.5936279296875,
+        "y": 2351.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "409a6e6.a5b3f9"
+                "2d3dee9f.64531a"
             ]
         ]
     },
     {
-        "id": "1008d1fe.94472e",
+        "id": "9382b345.a1d1e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4418.5936279296875,
-        "y": 2276.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4414.5936279296875,
+        "y": 2301.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "e91b8d2.d0cd6f"
+                "1c50740e.4fe454"
             ]
         ]
     },
     {
-        "id": "e91b8d2.d0cd6f",
+        "id": "1c50740e.4fe454",
         "type": "set",
         "name": "set domain-C.ltpId",
         "xml": "<set>\n<parameter name='domain-C.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-ltp-id`' value=\"`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4614.5936279296875,
-        "y": 2273.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4610.5936279296875,
+        "y": 2298.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "409a6e6.a5b3f9",
+        "id": "2d3dee9f.64531a",
         "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": 4420.5936279296875,
-        "y": 2326.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4416.5936279296875,
+        "y": 2351.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "8a9fa566.6d58a8",
+        "id": "ba27cb3.c1b8838",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5135.0936279296875,
-        "y": 2466.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 5131.0936279296875,
+        "y": 2491.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "7fa0b1d.d6b0bd",
-                "7faa7643.b3f3a8",
-                "2f37cf12.b49ef8"
+                "e4862910.0d6dd",
+                "4d9794ed.0f0c74",
+                "41d192df.878f6c"
             ]
         ]
     },
     {
-        "id": "19157173.11a35f",
+        "id": "2c077af9.3f7116",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4922.0936279296875,
-        "y": 2465.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4918.0936279296875,
+        "y": 2490.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "8a9fa566.6d58a8"
+                "ba27cb3.c1b8838"
             ]
         ]
     },
     {
-        "id": "c29c48f8.7f86a8",
+        "id": "b81d23ea.740b38",
         "type": "set",
         "name": "set domain C tunnel tp id",
         "xml": "<set>\n<parameter name='domain-C.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-tunnel-tp-id`' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4766.5936279296875,
-        "y": 2653.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4762.5936279296875,
+        "y": 2678.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "6f7c8401.0c5c44",
+        "id": "10136030.42aa18",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4716.5936279296875,
-        "y": 2464.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4712.5936279296875,
+        "y": 2489.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "19157173.11a35f"
+                "2c077af9.3f7116"
             ]
         ]
     },
     {
-        "id": "2f37cf12.b49ef8",
+        "id": "41d192df.878f6c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5340.5936279296875,
-        "y": 2544.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 5336.5936279296875,
+        "y": 2569.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "be660170.47dfc",
+        "id": "993481fc.0a9cc",
         "type": "comment",
         "name": "Not useful anymore",
         "info": "this domain-B.ltpId is not used anymore",
         "comments": "",
-        "x": 4657.5936279296875,
-        "y": 2245.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 4653.5936279296875,
+        "y": 2270.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "7fa0b1d.d6b0bd",
+        "id": "e4862910.0d6dd",
         "type": "set",
         "name": "set domain C network-id",
         "xml": "<set>\n<parameter name='tmp.domain-C.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5405.0936279296875,
-        "y": 2442.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 5401.0936279296875,
+        "y": 2467.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "7faa7643.b3f3a8",
+        "id": "4d9794ed.0f0c74",
         "type": "get-resource",
         "name": "get-resource dst network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-C.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5415.0936279296875,
-        "y": 2488.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 5411.0936279296875,
+        "y": 2513.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "e4da28c1.f29fa8"
+                "df2dbdcc.750e8"
             ]
         ]
     },
     {
-        "id": "e4da28c1.f29fa8",
+        "id": "df2dbdcc.750e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5630.5936279296875,
-        "y": 2479.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 5626.5936279296875,
+        "y": 2504.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "93b6182a.3d472"
+                "190b6efa.058019"
             ]
         ]
     },
     {
-        "id": "93b6182a.3d472",
+        "id": "190b6efa.058019",
         "type": "set",
         "name": "set domain B network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-C.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-C.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-C.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-C.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-C.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-network-id`' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-provider-id`' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-client-id`' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-topology-id`' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-network-type`' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n<parameter name='`tmp.otninfoProtect`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 5885.0936279296875,
-        "y": 2485.3209381103516,
-        "z": "a133aed2.437bc",
+        "x": 5881.0936279296875,
+        "y": 2510.3209381103516,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "4ccd67a2.a775c8",
+        "id": "21a1b6cf.f58d12",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2791.7666015625,
-        "y": 303.6499938964844,
-        "z": "a133aed2.437bc",
+        "x": 2787.7666015625,
+        "y": 328.6499938964844,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "aa20e714.81e31",
-                "2de4f8e2.b5cb18"
+                "4aea8251.037e9c",
+                "52f89c33.605164"
             ]
         ]
     },
     {
-        "id": "aa20e714.81e31",
+        "id": "4aea8251.037e9c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2982.7666015625,
-        "y": 307.6499938964844,
-        "z": "a133aed2.437bc",
+        "x": 2978.7666015625,
+        "y": 332.6499938964844,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "4f32b0ce.2765f8"
+                "835e11a3.ae9b18"
             ]
         ]
     },
     {
-        "id": "4f32b0ce.2765f8",
+        "id": "835e11a3.ae9b18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3109.7666015625,
-        "y": 306.6499938964844,
-        "z": "a133aed2.437bc",
+        "x": 3105.7666015625,
+        "y": 331.6499938964844,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "fabeb9f8.04ca88"
+                "609cdd79.df387c"
             ]
         ]
     },
     {
-        "id": "fabeb9f8.04ca88",
+        "id": "609cdd79.df387c",
         "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": 3332.64990234375,
-        "y": 301.53330993652344,
-        "z": "a133aed2.437bc",
+        "x": 3328.64990234375,
+        "y": 326.53330993652344,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "412e1237.d5a904",
-                "43345576.1d340c"
+                "b6173df.3337a4",
+                "e7365ac5.4ed5b"
             ]
         ]
     },
     {
-        "id": "412e1237.d5a904",
+        "id": "b6173df.3337a4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3539.64990234375,
-        "y": 238.53330993652344,
-        "z": "a133aed2.437bc",
+        "x": 3535.64990234375,
+        "y": 263.53330993652344,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "f849ec26.60ce68"
+                "ed7ff15a.b9a05"
             ]
         ]
     },
     {
-        "id": "43345576.1d340c",
+        "id": "e7365ac5.4ed5b",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3469.64990234375,
-        "y": 429.53334045410156,
-        "z": "a133aed2.437bc",
+        "x": 3465.64990234375,
+        "y": 454.53334045410156,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "2b8c6199.dff38e"
+                "687dbd4d.7679f4"
             ]
         ]
     },
     {
-        "id": "f849ec26.60ce68",
+        "id": "ed7ff15a.b9a05",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3681.64990234375,
-        "y": 228.53330993652344,
-        "z": "a133aed2.437bc",
+        "x": 3677.64990234375,
+        "y": 253.53330993652344,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "7903a049.c8cd48",
-                "db701786.21e23"
+                "89b993df.07b78",
+                "5e2c6ea6.2dfa38"
             ]
         ]
     },
     {
-        "id": "2b8c6199.dff38e",
+        "id": "687dbd4d.7679f4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3595.64990234375,
-        "y": 429.53334045410156,
-        "z": "a133aed2.437bc",
+        "x": 3591.64990234375,
+        "y": 454.53334045410156,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "66a832b6.6cd354"
+                "a4105892.c0505"
             ]
         ]
     },
     {
-        "id": "27e9a268.b581ce",
+        "id": "1e64b2b7.385b1d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2592.533447265625,
-        "y": 306.65000915527344,
-        "z": "a133aed2.437bc",
+        "x": 2588.533447265625,
+        "y": 331.65000915527344,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "4ccd67a2.a775c8"
+                "21a1b6cf.f58d12"
             ]
         ]
     },
     {
-        "id": "2de4f8e2.b5cb18",
+        "id": "52f89c33.605164",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2987.5,
-        "y": 259.6499938964844,
-        "z": "a133aed2.437bc",
+        "x": 2983.5,
+        "y": 284.6499938964844,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "fe5f3417.d45418"
+                "82fe228a.5ad828"
             ]
         ]
     },
     {
-        "id": "7903a049.c8cd48",
+        "id": "89b993df.07b78",
         "type": "set",
         "name": "set otnTopoIdDst",
         "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 3840.2333984375,
-        "y": 207.64999389648438,
-        "z": "a133aed2.437bc",
+        "x": 3836.2333984375,
+        "y": 232.64999389648438,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "db701786.21e23",
+        "id": "5e2c6ea6.2dfa38",
         "type": "set",
         "name": "set otnTopoIdDstBackup",
         "xml": "<set>\n<parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 3862.2333984375,
-        "y": 255.64999389648438,
-        "z": "a133aed2.437bc",
+        "x": 3858.2333984375,
+        "y": 280.6499938964844,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "66a832b6.6cd354",
+        "id": "a4105892.c0505",
         "type": "set",
         "name": "set otnTopoIdDst",
         "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 3766.2333984375,
-        "y": 429.65000915527344,
-        "z": "a133aed2.437bc",
+        "x": 3762.2333984375,
+        "y": 454.65000915527344,
+        "z": "67ca1183.dbac8",
         "wires": []
     },
     {
-        "id": "cc22664a.751d9",
+        "id": "e947b95b.27d1a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2661.25,
-        "y": 381.4499969482422,
-        "z": "a133aed2.437bc",
+        "x": 2657.25,
+        "y": 406.4499969482422,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "2f2b5b65.5b64dc"
+                "c74c236.99ba66"
             ]
         ]
     },
     {
-        "id": "2f2b5b65.5b64dc",
+        "id": "c74c236.99ba66",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2860.483154296875,
-        "y": 378.4499816894531,
-        "z": "a133aed2.437bc",
+        "x": 2856.483154296875,
+        "y": 403.4499816894531,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "36697354.fca184"
+                "befa4e01.9ed388"
             ]
         ]
     },
     {
-        "id": "36697354.fca184",
+        "id": "befa4e01.9ed388",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3051.483154296875,
-        "y": 382.4499816894531,
-        "z": "a133aed2.437bc",
+        "x": 3047.483154296875,
+        "y": 407.4499816894531,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "5c3e361c.5c18a8"
+                "98517b17.6a6348"
             ]
         ]
     },
     {
-        "id": "5c3e361c.5c18a8",
+        "id": "98517b17.6a6348",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3178.483154296875,
-        "y": 381.4499816894531,
-        "z": "a133aed2.437bc",
+        "x": 3174.483154296875,
+        "y": 406.4499816894531,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b1b9b64d.59ccf8",
+        "id": "d77821ed.16483",
         "type": "switchNode",
         "name": "switch secondarySolutions empty?",
         "xml": "<switch test='`length($otn-oof.secondarySolutions) == 0`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1522.13330078125,
-        "y": 1685.133316040039,
-        "z": "a133aed2.437bc",
+        "x": 1518.13330078125,
+        "y": 1710.133316040039,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "65a1fc27.84c2b4",
-                "d975b6ca.6d1d08"
+                "f463fee4.443ea",
+                "587b05b.a97cbfc"
             ]
         ]
     },
     {
-        "id": "65a1fc27.84c2b4",
+        "id": "f463fee4.443ea",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1748.0333251953125,
-        "y": 1657.133316040039,
-        "z": "a133aed2.437bc",
+        "x": 1744.0333251953125,
+        "y": 1682.133316040039,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "c43f0dda.93b268"
+                "9e1884a5.b31a88"
             ]
         ]
     },
     {
-        "id": "d975b6ca.6d1d08",
+        "id": "587b05b.a97cbfc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1746.0333251953125,
-        "y": 1707.133316040039,
-        "z": "a133aed2.437bc",
+        "x": 1742.0333251953125,
+        "y": 1732.133316040039,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c43f0dda.93b268",
+        "id": "9e1884a5.b31a88",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1890.13330078125,
-        "y": 1657.133316040039,
-        "z": "a133aed2.437bc",
+        "x": 1886.13330078125,
+        "y": 1682.133316040039,
+        "z": "67ca1183.dbac8",
         "wires": [
             []
         ]
     },
     {
-        "id": "949527f9.d2ae5",
+        "id": "ed4632fb.07dd2",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 901.0333251953125,
-        "y": 1874.133316040039,
-        "z": "a133aed2.437bc",
+        "x": 897.0333251953125,
+        "y": 1899.133316040039,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "c20cf138.dc1e5"
+                "9a39a481.b29ef"
             ]
         ]
     },
     {
-        "id": "c20cf138.dc1e5",
+        "id": "9a39a481.b29ef",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1087.0333251953125,
-        "y": 1875.133316040039,
-        "z": "a133aed2.437bc",
+        "x": 1083.0333251953125,
+        "y": 1900.133316040039,
+        "z": "67ca1183.dbac8",
+        "wires": [
+            [
+                "29d17717.6b3378"
+            ]
+        ]
+    },
+    {
+        "id": "29d17717.6b3378",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1213.0333251953125,
+        "y": 1900.133316040039,
+        "z": "67ca1183.dbac8",
+        "wires": [
+            [
+                "29b9a31c.a264c4"
+            ]
+        ]
+    },
+    {
+        "id": "21cc841a.968b4c",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1419.566650390625,
+        "y": 710.566650390625,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "2941d5fe.c9ad8a"
+                "a199714f.963fb"
             ]
         ]
     },
     {
-        "id": "2941d5fe.c9ad8a",
+        "id": "a199714f.963fb",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1217.0333251953125,
-        "y": 1875.133316040039,
-        "z": "a133aed2.437bc",
+        "x": 1559.566650390625,
+        "y": 710.566650390625,
+        "z": "67ca1183.dbac8",
         "wires": [
             [
-                "c19998ca.837848"
+                "1548db64.e4c295"
             ]
         ]
     }
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
index 35853b85..2f2e4d96 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
@@ -187,21 +187,6 @@
                     <parameter name='filenamemm' value="`$tmp.pce-src-node + $tmp.pce-dst-node + $tmp.pce-dst-node-backup`" />
                 </set>
                 <switch test='`$hasSecondary`'>
-                    <outcome value='false'>
-                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >
-                            <parameter name="pnfs-pfx" value='ccsdkTopopnfs'/>
-                            <parameter name="links-pfx" value="ccsdkTopologicalLinks"/>
-                            <parameter name="response-pfx" value="otn-oof"/>
-                            <parameter name="output-end-to-end-path" value="false"/>
-                            <!--<parameter name="src-node" value="`$tmp.src.domainA.pnf-name`"/>-->
-                            <!--<parameter name="dst-node" value="`$tmp.dst.domainB.pnf-name`"/>-->
-                            <parameter name="src-node" value="`$tmp.pce-src-node`"/>
-                            <parameter name="dst-node" value="`$tmp.pce-dst-node`"/>
-                            <outcome value='success'></outcome>
-                            <outcome value='Other'></outcome>
-                            <outcome value='not-found'></outcome>
-                        </execute>
-                    </outcome>
                     <outcome value='true'>
                         <block>
                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePaths' >
@@ -221,6 +206,23 @@
                             </execute>
                         </block>
                     </outcome>
+                    <outcome value='Other'>
+                        <block>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >
+                                <parameter name="pnfs-pfx" value='ccsdkTopopnfs'/>
+                                <parameter name="links-pfx" value="ccsdkTopologicalLinks"/>
+                                <parameter name="response-pfx" value="otn-oof"/>
+                                <parameter name="output-end-to-end-path" value="false"/>
+                                <!--<parameter name="src-node" value="`$tmp.src.domainA.pnf-name`"/>-->
+                                <!--<parameter name="dst-node" value="`$tmp.dst.domainB.pnf-name`"/>-->
+                                <parameter name="src-node" value="`$tmp.pce-src-node`"/>
+                                <parameter name="dst-node" value="`$tmp.pce-dst-node`"/>
+                                <outcome value='success'></outcome>
+                                <outcome value='Other'></outcome>
+                                <outcome value='not-found'></outcome>
+                            </execute>
+                        </block>
+                    </outcome>
                 </switch>
             </block>
             <set>
-- 
2.16.6