From 2b6f24fe23ac60d0d9cf885687bf9786bc521ec1 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Fri, 16 Apr 2021 20:54:28 +0000
Subject: Bug fixing required for integration testing with PCE.

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

Former-commit-id: fa60f239af143e446fa4227644df5efaf77396b0
---
 ...ogy-operation-get-otn-tunnel-path-from-oof.json | 1783 +++++-----
 ...nf-topology-operation-trans-slice-activate.json | 1582 ++++-----
 ...nf-topology-operation-trans-slice-allocate.json | 3389 +++++++++---------
 ...-topology-operation-trans-slice-deactivate.json |  696 ++--
 ...-vnf-topology-operation-trans-slice-delete.json |  706 ++--
 ...-vnf-topology-operation-trans-slice-modify.json | 3750 ++++++++++----------
 ...logy-operation-get-otn-tunnel-path-from-oof.xml |  804 ++---
 ...vnf-topology-operation-trans-slice-allocate.xml |   49 +-
 8 files changed, 6398 insertions(+), 6361 deletions(-)

(limited to 'platform-logic/generic-resource-api')

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 6d4c48ff..6ccf7ae2 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": "fa52a170.206e7",
+        "id": "4bc4e8ab.1cf33",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 178,
-        "y": 101,
-        "z": "97fec48c.8eada",
+        "x": 93,
+        "y": 85,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "2c5db495.a5dd34"
+                "7e764ef5.0f0ce8"
             ]
         ]
     },
     {
-        "id": "2c5db495.a5dd34",
+        "id": "7e764ef5.0f0ce8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,2009 +22,1912 @@
         "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": 303,
-        "y": 427.00001525878906,
-        "z": "97fec48c.8eada",
+        "x": 240,
+        "y": 660.0000152587891,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "4ae6db6f.435c7c"
+                "dba1761d.84c318"
             ]
         ]
     },
     {
-        "id": "4ae6db6f.435c7c",
+        "id": "dba1761d.84c318",
         "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": 367.0001220703125,
-        "y": 520,
-        "z": "97fec48c.8eada",
+        "x": 304.0001220703125,
+        "y": 753,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "6312c3c3.704cf4"
+                "45853653.2d7d8"
             ]
         ]
     },
     {
-        "id": "6bdd3c50.e0d3d4",
+        "id": "29b9ed96.3b1cca",
         "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": 879.9730682373047,
-        "y": 71.99600028991699,
-        "z": "97fec48c.8eada",
+        "x": 349.9730682373047,
+        "y": 271.996000289917,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "7939df96.b1122",
-                "945597b.d7df068"
+                "5ed3456b.75dffc",
+                "d4b7459.be16038"
             ]
         ]
     },
     {
-        "id": "7939df96.b1122",
+        "id": "5ed3456b.75dffc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1119.9732093811035,
-        "y": 95.99596977233887,
-        "z": "97fec48c.8eada",
+        "x": 589.9732093811035,
+        "y": 295.99596977233887,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "50ded459.a3ce3c"
+                "c8e36f8b.a2bbd8"
             ]
         ]
     },
     {
-        "id": "b5aef0e7.4cc018",
+        "id": "e29f4917.f911e8",
         "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": 1289.973129272461,
-        "y": 35.99606132507324,
-        "z": "97fec48c.8eada",
+        "x": 759.9731292724609,
+        "y": 235.99606132507324,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "945597b.d7df068",
+        "id": "d4b7459.be16038",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1118.9729957580566,
-        "y": 44.996060371398926,
-        "z": "97fec48c.8eada",
+        "x": 588.9729957580566,
+        "y": 244.99606037139893,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "b5aef0e7.4cc018"
+                "e29f4917.f911e8"
             ]
         ]
     },
     {
-        "id": "e01d4a36.839a2",
+        "id": "a76b8924.9422c",
         "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": 851.4768676757812,
-        "y": 28,
-        "z": "97fec48c.8eada",
+        "x": 321.47686767578125,
+        "y": 228,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "9cfd026a.5e4728",
+        "id": "485028.3d8fcfd8",
         "type": "for",
         "name": "for vidx..otn-oof.solutions_length[]",
         "xml": "<for index='vidx' start='0' end='`$otn-oof.solutions_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 840.972900390625,
-        "y": 488.2457275390625,
-        "z": "97fec48c.8eada",
+        "x": 777.972900390625,
+        "y": 721.2457275390625,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "8402c7cf.20d6c"
+                "b7d2be7c.5e3ac8"
             ]
         ]
     },
     {
-        "id": "e807132a.83466",
+        "id": "c4646d25.9ab0f",
         "type": "comment",
         "name": "Loop through OTN links",
         "info": "",
         "comments": "",
-        "x": 924.4732055664062,
-        "y": 567.74609375,
-        "z": "97fec48c.8eada",
+        "x": 861.4732055664062,
+        "y": 800.74609375,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "8402c7cf.20d6c",
+        "id": "b7d2be7c.5e3ac8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 945.5001220703125,
-        "y": 679.2864990234375,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "5b85782.fa3db08",
-                "2d5a2685.b40dfa",
-                "20564e8a.e84492"
-            ]
-        ]
-    },
-    {
-        "id": "5b85782.fa3db08",
-        "type": "get-resource",
-        "name": "get-resource cross-link",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"logical-link\" \n\t\tkey=\"logical-link.link-name = $otn-oof.link-name\"\n        pfx='tmp.aai.cross-link' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1202.5001220703125,
-        "y": 669.2864990234375,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "d48feed1.3a38",
-                "5943270e.4826e8",
-                "990db839.99a8f8"
-            ]
-        ]
-    },
-    {
-        "id": "990db839.99a8f8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1404.0001220703125,
-        "y": 544.2864685058594,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "a9f1b4b6.1c30e8"
-            ]
-        ]
-    },
-    {
-        "id": "d48feed1.3a38",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1440.0001220703125,
-        "y": 669.2864990234375,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "ac3b3843.658d4"
-            ]
-        ]
-    },
-    {
-        "id": "5943270e.4826e8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1434.0001220703125,
-        "y": 719.2864990234375,
-        "z": "97fec48c.8eada",
+        "x": 882.5001220703125,
+        "y": 912.2864990234375,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "da410969.0b2cc"
+                "6750495a.41286",
+                "abe518b.cefde68",
+                "165db6ae.de2bb9",
+                "fda3acff.66dac8",
+                "188880e9.f084a7"
             ]
         ]
     },
     {
-        "id": "ac3b3843.658d4",
-        "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": 1601.0001220703125,
-        "y": 658.2864990234375,
-        "z": "97fec48c.8eada",
-        "wires": []
-    },
-    {
-        "id": "da410969.0b2cc",
-        "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": 1599.0001220703125,
-        "y": 714.2864990234375,
-        "z": "97fec48c.8eada",
-        "wires": []
-    },
-    {
-        "id": "d48fe5f1.e695e8",
-        "type": "comment",
-        "name": "get cross-domain-link information",
-        "info": "",
-        "comments": "",
-        "x": 1208.5001220703125,
-        "y": 618.2864990234375,
-        "z": "97fec48c.8eada",
-        "wires": []
-    },
-    {
-        "id": "2d5a2685.b40dfa",
+        "id": "6750495a.41286",
         "type": "set",
         "name": "set otn-oof.link-name and etc.",
-        "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />\n<parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].start_node`' />\n<parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].end_node`' />",
+        "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": 1192.0001220703125,
-        "y": 572.2864990234375,
-        "z": "97fec48c.8eada",
+        "x": 1129.0001220703125,
+        "y": 805.2864990234375,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "50ded459.a3ce3c",
+        "id": "c8e36f8b.a2bbd8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1265.0002555847168,
-        "y": 93.741455078125,
-        "z": "97fec48c.8eada",
+        "x": 735.0002555847168,
+        "y": 293.741455078125,
+        "z": "6311a927.78727",
         "wires": [
             []
         ]
     },
     {
-        "id": "6312c3c3.704cf4",
+        "id": "45853653.2d7d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 607.9688835144043,
-        "y": 446.74163722991943,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "9cfd026a.5e4728",
-                "6bdd3c50.e0d3d4",
-                "3d2e0b8f.457abc",
-                "27ac90d.484a9f"
-            ]
-        ]
-    },
-    {
-        "id": "2581c748.7cabd8",
-        "type": "switchNode",
-        "name": "test cross-domain-link role",
-        "xml": "<switch test='`$tmp.aai.cross-link.link-role`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1719.5001220703125,
-        "y": 544,
-        "z": "97fec48c.8eada",
+        "x": 544.9688835144043,
+        "y": 679.7416372299194,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "22f3b1f4.9256fe"
+                "485028.3d8fcfd8",
+                "7882cf69.81bba",
+                "f346bebe.50149"
             ]
         ]
     },
     {
-        "id": "22f3b1f4.9256fe",
-        "type": "outcome",
-        "name": "outcome cross-domain",
-        "xml": "<outcome value='cross-domain'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1955.5001220703125,
-        "y": 545,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "8b1c590c.dc55d"
-            ]
-        ]
-    },
-    {
-        "id": "a2b70b63.3ba9c8",
+        "id": "9f64f3d6.06a948",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2359.4998779296875,
-        "y": 1005,
-        "z": "97fec48c.8eada",
+        "x": 2296.4998779296875,
+        "y": 1238,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "8b1c590c.dc55d",
+        "id": "188880e9.f084a7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2158.5001220703125,
-        "y": 546,
-        "z": "97fec48c.8eada",
+        "x": 1095.5001220703125,
+        "y": 994,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "a2b70b63.3ba9c8",
-                "4ab81af3.e377f4",
-                "b2e8772a.8ac6e8",
-                "a42edec8.e98fb"
+                "d9b8b0f0.11df08",
+                "16b2f778.e973e1"
             ]
         ]
     },
     {
-        "id": "3bc9b9f2.81b29e",
+        "id": "6f8fa296.cf0b14",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2683.9998779296875,
-        "y": 496,
-        "z": "97fec48c.8eada",
+        "x": 2620.9998779296875,
+        "y": 729,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "5d4d6dbf.b923ac"
+                "53738595.29239c"
             ]
         ]
     },
     {
-        "id": "37303a4c.954af6",
+        "id": "dfb73ef2.d6e5",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2717,
-        "y": 554,
-        "z": "97fec48c.8eada",
+        "x": 2654,
+        "y": 787,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "9e71e39b.7fa1"
+                "3b0779f0.32a56e"
             ]
         ]
     },
     {
-        "id": "fd9ad854.5b33c8",
+        "id": "a2313ee1.1bd3f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2720,
-        "y": 606,
-        "z": "97fec48c.8eada",
+        "x": 2657,
+        "y": 839,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "72bd806e.4e60a8"
+                "28c1fd94.c84d7a"
             ]
         ]
     },
     {
-        "id": "9e71e39b.7fa1",
+        "id": "3b0779f0.32a56e",
         "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": 2902,
-        "y": 558,
-        "z": "97fec48c.8eada",
+        "x": 2839,
+        "y": 791,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "72bd806e.4e60a8",
+        "id": "28c1fd94.c84d7a",
         "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": 2890,
-        "y": 609,
-        "z": "97fec48c.8eada",
+        "x": 2827,
+        "y": 842,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "a1ab74dd.259888",
+        "id": "e56a35d6.459af8",
         "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[$vidx].relationship-data[0].relationship-value`\" />\n",
+        "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": 4020.4998779296875,
-        "y": 411,
-        "z": "97fec48c.8eada",
+        "x": 3957.4998779296875,
+        "y": 644,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "78028b3.737cf74",
+        "id": "a811b593.25ff8",
         "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": 4028.4998779296875,
-        "y": 463,
-        "z": "97fec48c.8eada",
+        "x": 3965.4998779296875,
+        "y": 696,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "f334aa73.fafd8"
+                "d6328bc3.e91228"
             ]
         ]
     },
     {
-        "id": "f334aa73.fafd8",
+        "id": "d6328bc3.e91228",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4234.9998779296875,
-        "y": 441,
-        "z": "97fec48c.8eada",
+        "x": 4171.9998779296875,
+        "y": 674,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "198591da.45bba6"
+                "fcc7de43.1b588"
             ]
         ]
     },
     {
-        "id": "c586fad5.100ad",
+        "id": "f5150efc.cab85",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3572.6683349609375,
-        "y": 489.48150634765625,
-        "z": "97fec48c.8eada",
+        "x": 3509.6683349609375,
+        "y": 722.4815063476562,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "8d515769.aa6f4"
+                "912955c2.11e7a"
             ]
         ]
     },
     {
-        "id": "18757b7c.bab055",
+        "id": "fd862c08.f8b4a",
         "type": "for",
         "name": "for each relationship",
-        "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",
+        "xml": "<for silentFailure='true' index='pintsidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3035.3826904296875,
-        "y": 491.65972900390625,
-        "z": "97fec48c.8eada",
+        "x": 2972.3826904296875,
+        "y": 724.6597290039062,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "e5aaccbc.1746e"
+                "8c595bd0.378e98"
             ]
         ]
     },
     {
-        "id": "e5aaccbc.1746e",
+        "id": "8c595bd0.378e98",
         "type": "switchNode",
         "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$vidx].related-to`'>\n",
+        "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3287.3826904296875,
-        "y": 488.65972900390625,
-        "z": "97fec48c.8eada",
+        "x": 3224.3826904296875,
+        "y": 721.6597290039062,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "c586fad5.100ad"
+                "f5150efc.cab85"
             ]
         ]
     },
     {
-        "id": "8d515769.aa6f4",
+        "id": "912955c2.11e7a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3799.4998779296875,
-        "y": 478,
-        "z": "97fec48c.8eada",
+        "x": 3736.4998779296875,
+        "y": 711,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "a1ab74dd.259888",
-                "78028b3.737cf74",
-                "e29873e7.48a55",
-                "60eed173.f1208",
-                "c69a19d0.8fe6d"
+                "e56a35d6.459af8",
+                "a811b593.25ff8",
+                "2abf934.785ecec",
+                "bc51fa32.9144b",
+                "4ad035fb.c384cc"
             ]
         ]
     },
     {
-        "id": "4ab81af3.e377f4",
+        "id": "d9b8b0f0.11df08",
         "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": 2440.5,
-        "y": 901,
-        "z": "97fec48c.8eada",
+        "x": 2377.5,
+        "y": 1134,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "995af278.af1ac8",
-                "c9dcb57d.818b28",
-                "86496d30.4c8b08"
+                "2a761980.732196",
+                "d9fef4c9.0420c",
+                "6bc11e9d.31baa8"
             ]
         ]
     },
     {
-        "id": "995af278.af1ac8",
+        "id": "2a761980.732196",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2662.9998779296875,
-        "y": 1043,
-        "z": "97fec48c.8eada",
+        "x": 2599.9998779296875,
+        "y": 1276,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "298c76a3.790b2a"
+                "6a724ed4.0c2ee"
             ]
         ]
     },
     {
-        "id": "c9dcb57d.818b28",
+        "id": "d9fef4c9.0420c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2646.9998779296875,
-        "y": 1094,
-        "z": "97fec48c.8eada",
+        "x": 2583.9998779296875,
+        "y": 1327,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "e35f9b5f.fe69c8"
+                "5b682716.7565c"
             ]
         ]
     },
     {
-        "id": "86496d30.4c8b08",
+        "id": "6bc11e9d.31baa8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2649.9998779296875,
-        "y": 1146,
-        "z": "97fec48c.8eada",
+        "x": 2586.9998779296875,
+        "y": 1379,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "fe485369.3b129"
+                "f53f8dec.b8eab8"
             ]
         ]
     },
     {
-        "id": "fe485369.3b129",
+        "id": "f53f8dec.b8eab8",
         "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": 2819.9998779296875,
-        "y": 1149,
-        "z": "97fec48c.8eada",
+        "x": 2756.9998779296875,
+        "y": 1382,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "e35f9b5f.fe69c8",
+        "id": "5b682716.7565c",
         "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": 2831.9998779296875,
-        "y": 1098,
-        "z": "97fec48c.8eada",
+        "x": 2768.9998779296875,
+        "y": 1331,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "b29ef002.3d9bd8",
+        "id": "6b5c01f3.fe6da8",
         "type": "for",
         "name": "for each relationship",
-        "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",
+        "xml": "<for silentFailure='true' index='pintdidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3019.3826904296875,
-        "y": 1053.6597290039062,
-        "z": "97fec48c.8eada",
+        "x": 2956.3826904296875,
+        "y": 1286.6597290039062,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "1420228.3521e5e"
+                "1a571bfc.aeed5c"
             ]
         ]
     },
     {
-        "id": "1420228.3521e5e",
+        "id": "1a571bfc.aeed5c",
         "type": "switchNode",
         "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$vidx].related-to`'>\n",
+        "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3262.3826904296875,
-        "y": 1052.6597290039062,
-        "z": "97fec48c.8eada",
+        "x": 3199.3826904296875,
+        "y": 1285.6597290039062,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "5d8a1ce9.20e95c"
+                "90623cd4.fe0a58"
             ]
         ]
     },
     {
-        "id": "50d5c6dd.fd8458",
+        "id": "aa0b1701.8dfea",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5028.4998779296875,
-        "y": 854,
-        "z": "97fec48c.8eada",
+        "x": 4965.4998779296875,
+        "y": 1087,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "6e9eddf0.722754",
-                "4df00122.6ae7d8",
-                "5c18dd82.55be5c"
+                "550b57d7.8fa528",
+                "74f2c02.a79f64",
+                "f2bb305d.4422b8"
             ]
         ]
     },
     {
-        "id": "5d8a1ce9.20e95c",
+        "id": "90623cd4.fe0a58",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3518.6683349609375,
-        "y": 1052.4815063476562,
-        "z": "97fec48c.8eada",
+        "x": 3455.6683349609375,
+        "y": 1285.4815063476562,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "431b8e7f.397f08"
+                "2cff3582.3d605a"
             ]
         ]
     },
     {
-        "id": "5d78c070.cc21d",
+        "id": "66c4a517.3f3fd4",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4815.4998779296875,
-        "y": 853,
-        "z": "97fec48c.8eada",
+        "x": 4752.4998779296875,
+        "y": 1086,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "50d5c6dd.fd8458"
+                "aa0b1701.8dfea"
             ]
         ]
     },
     {
-        "id": "431b8e7f.397f08",
+        "id": "2cff3582.3d605a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3818.4998779296875,
-        "y": 1050,
-        "z": "97fec48c.8eada",
+        "x": 3755.4998779296875,
+        "y": 1283,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "9fe095e8.34fca",
-                "9f30760a.8f0188",
-                "3e68bf5c.62e23",
-                "16edc927.badbff",
-                "c1a0d70e.9bb548"
+                "34a1c052.ba37a8",
+                "ce64c552.7245c",
+                "3a5f117c.72df06",
+                "668e003.0972e8",
+                "888129ab.9ea2a8"
             ]
         ]
     },
     {
-        "id": "9fe095e8.34fca",
+        "id": "34a1c052.ba37a8",
         "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[$vidx].relationship-data[0].relationship-value`\" />\n",
+        "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": 4060.4998779296875,
-        "y": 1004,
-        "z": "97fec48c.8eada",
+        "x": 3997.4998779296875,
+        "y": 1237,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "9f30760a.8f0188",
+        "id": "ce64c552.7245c",
         "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": 4050.4998779296875,
-        "y": 1055,
-        "z": "97fec48c.8eada",
+        "x": 3987.4998779296875,
+        "y": 1288,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "f0dbdf9f.2f9a"
+                "c6558909.ba61"
             ]
         ]
     },
     {
-        "id": "f0dbdf9f.2f9a",
+        "id": "c6558909.ba61",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4237.9998779296875,
-        "y": 1053,
-        "z": "97fec48c.8eada",
+        "x": 4174.9998779296875,
+        "y": 1286,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "aaf730ad.ded658"
+                "b166ec42.f7a328"
             ]
         ]
     },
     {
-        "id": "6e9eddf0.722754",
+        "id": "550b57d7.8fa528",
         "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": 5298.4998779296875,
-        "y": 830,
-        "z": "97fec48c.8eada",
+        "x": 5235.4998779296875,
+        "y": 1063,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "4df00122.6ae7d8",
+        "id": "74f2c02.a79f64",
         "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": 5308.4998779296875,
-        "y": 876,
-        "z": "97fec48c.8eada",
+        "x": 5245.4998779296875,
+        "y": 1109,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "6bfb2c0.fcf9cd4"
+                "e85530cd.ad8bf8"
             ]
         ]
     },
     {
-        "id": "6bfb2c0.fcf9cd4",
+        "id": "e85530cd.ad8bf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5523.9998779296875,
-        "y": 867,
-        "z": "97fec48c.8eada",
+        "x": 5460.9998779296875,
+        "y": 1100,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "46a8e7db.6247c8"
+                "e3266a0a.5cb158"
             ]
         ]
     },
     {
-        "id": "46a8e7db.6247c8",
+        "id": "e3266a0a.5cb158",
         "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": 5778.4998779296875,
-        "y": 873,
-        "z": "97fec48c.8eada",
+        "x": 5715.4998779296875,
+        "y": 1106,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "5d4d6dbf.b923ac",
+        "id": "53738595.29239c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2817.9998779296875,
-        "y": 492,
-        "z": "97fec48c.8eada",
+        "x": 2754.9998779296875,
+        "y": 725,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "18757b7c.bab055"
+                "fd862c08.f8b4a"
             ]
         ]
     },
     {
-        "id": "298c76a3.790b2a",
+        "id": "6a724ed4.0c2ee",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2808.9998779296875,
-        "y": 1034,
-        "z": "97fec48c.8eada",
+        "x": 2745.9998779296875,
+        "y": 1267,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "b29ef002.3d9bd8"
+                "6b5c01f3.fe6da8"
             ]
         ]
     },
     {
-        "id": "a9f1b4b6.1c30e8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1538,
-        "y": 546,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "2581c748.7cabd8"
-            ]
-        ]
-    },
-    {
-        "id": "b2e8772a.8ac6e8",
-        "type": "for",
-        "name": "for each relationship",
-        "xml": "<for index='lridx' start='0' end='`$tmp.aai.cross-link.relationship-list.relationship_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2392.9998779296875,
-        "y": 313,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "3399a4f5.011714"
-            ]
-        ]
-    },
-    {
-        "id": "3399a4f5.011714",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2591.9998779296875,
-        "y": 310,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "d2b9c322.61b4e"
-            ]
-        ]
-    },
-    {
-        "id": "d2b9c322.61b4e",
-        "type": "outcome",
-        "name": "p-interface",
-        "xml": "<outcome value='p-interface'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2769.1173095703125,
-        "y": 308.34027099609375,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "daf680e0.e985f"
-            ]
-        ]
-    },
-    {
-        "id": "614113e.09a2a6c",
-        "type": "set",
-        "name": "set src-ltpId",
-        "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n\n<!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-ltp-id`' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />-->\n<!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />-->\n\n<!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />-->\n",
-        "comments": "",
-        "x": 3620.9998779296875,
-        "y": 222,
-        "z": "97fec48c.8eada",
-        "wires": []
-    },
-    {
-        "id": "daf680e0.e985f",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2908.9998779296875,
-        "y": 293,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "56dc1543.ce88ec",
-                "b07af7fc.6b63b8"
-            ]
-        ]
-    },
-    {
-        "id": "198591da.45bba6",
+        "id": "fcc7de43.1b588",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4409.9998779296875,
-        "y": 437,
-        "z": "97fec48c.8eada",
+        "x": 4346.9998779296875,
+        "y": 670,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "c08fd8d6.2bd66"
+                "a813a414.4bba4"
             ]
         ]
     },
     {
-        "id": "aaf730ad.ded658",
+        "id": "b166ec42.f7a328",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4426.9998779296875,
-        "y": 1042,
-        "z": "97fec48c.8eada",
+        "x": 4363.9998779296875,
+        "y": 1275,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "64775e7a.bf3908"
+                "6ce614ed.7484ac"
             ]
         ]
     },
     {
-        "id": "a42edec8.e98fb",
+        "id": "16b2f778.e973e1",
         "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": 2486.5,
-        "y": 535,
-        "z": "97fec48c.8eada",
+        "x": 2423.5,
+        "y": 768,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "3bc9b9f2.81b29e",
-                "37303a4c.954af6",
-                "fd9ad854.5b33c8"
+                "6f8fa296.cf0b14",
+                "dfb73ef2.d6e5",
+                "a2313ee1.1bd3f8"
             ]
         ]
     },
     {
-        "id": "e29873e7.48a55",
+        "id": "2abf934.785ecec",
         "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": 3889.9998779296875,
-        "y": 281,
-        "z": "97fec48c.8eada",
+        "x": 3826.9998779296875,
+        "y": 514,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "98eef2c3.4b1e6",
-                "b3fdc3b3.daa6d",
-                "bb3698f8.9dc54"
+                "2718cbe0.743744",
+                "c770af9d.e00ad8",
+                "4dc6603f.cfce08"
             ]
         ]
     },
     {
-        "id": "98eef2c3.4b1e6",
+        "id": "2718cbe0.743744",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4085.5,
-        "y": 233,
-        "z": "97fec48c.8eada",
+        "x": 4022.5,
+        "y": 466,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "1e54913c.73cd4f"
+                "d9208e7d.606"
             ]
         ]
     },
     {
-        "id": "b3fdc3b3.daa6d",
+        "id": "c770af9d.e00ad8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4077.5,
-        "y": 288,
-        "z": "97fec48c.8eada",
+        "x": 4014.5,
+        "y": 521,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "8746e11a.2a66c"
+                "6bb9b9b7.b2076"
             ]
         ]
     },
     {
-        "id": "bb3698f8.9dc54",
+        "id": "4dc6603f.cfce08",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4082.5,
-        "y": 345,
-        "z": "97fec48c.8eada",
+        "x": 4019.5,
+        "y": 578,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "be336b5b.cedab8"
+                "59153395.1608bc"
             ]
         ]
     },
     {
-        "id": "be336b5b.cedab8",
+        "id": "59153395.1608bc",
         "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": 4234.5,
-        "y": 346,
-        "z": "97fec48c.8eada",
+        "x": 4171.5,
+        "y": 579,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "8746e11a.2a66c",
+        "id": "6bb9b9b7.b2076",
         "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": 4245.5,
-        "y": 291,
-        "z": "97fec48c.8eada",
+        "x": 4182.5,
+        "y": 524,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "1e54913c.73cd4f",
+        "id": "d9208e7d.606",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4229.88232421875,
-        "y": 230.65567016601562,
-        "z": "97fec48c.8eada",
+        "x": 4166.88232421875,
+        "y": 463.6556701660156,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "e08a0980.5d50e",
-                "8e112ac6.c7732"
+                "55254083.c38b58",
+                "8aa824b7.0c6278"
             ]
         ]
     },
     {
-        "id": "e08a0980.5d50e",
+        "id": "55254083.c38b58",
         "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": 4454.9998779296875,
-        "y": 186,
-        "z": "97fec48c.8eada",
+        "x": 4391.9998779296875,
+        "y": 419,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "60eed173.f1208",
+        "id": "bc51fa32.9144b",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3976.9998779296875,
-        "y": 528,
-        "z": "97fec48c.8eada",
+        "x": 3913.9998779296875,
+        "y": 761,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "c08fd8d6.2bd66",
+        "id": "a813a414.4bba4",
         "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": 4670.9998779296875,
-        "y": 434,
-        "z": "97fec48c.8eada",
+        "x": 4607.9998779296875,
+        "y": 667,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "16edc927.badbff",
+        "id": "668e003.0972e8",
         "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": 3886.9998779296875,
-        "y": 884,
-        "z": "97fec48c.8eada",
+        "x": 3823.9998779296875,
+        "y": 1117,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "123bf516.85c49b",
-                "6c28943b.60b994",
-                "19639884.e536cf"
+                "ba64936b.6e28a",
+                "60671a93.606c04",
+                "68c36f77.2ea158"
             ]
         ]
     },
     {
-        "id": "19639884.e536cf",
+        "id": "68c36f77.2ea158",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4082.5,
-        "y": 836,
-        "z": "97fec48c.8eada",
+        "x": 4019.5,
+        "y": 1069,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "c2d1aecb.85e098"
+                "90c8108b.3d46b8"
             ]
         ]
     },
     {
-        "id": "6c28943b.60b994",
+        "id": "60671a93.606c04",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4074.5,
-        "y": 891,
-        "z": "97fec48c.8eada",
+        "x": 4011.5,
+        "y": 1124,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "1ac89a13.d0df06"
+                "694c4d07.5571c4"
             ]
         ]
     },
     {
-        "id": "123bf516.85c49b",
+        "id": "ba64936b.6e28a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4079.5,
-        "y": 948,
-        "z": "97fec48c.8eada",
+        "x": 4016.5,
+        "y": 1181,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "b06bf8cb.62556"
+                "8a4ef9a5.3b77b8"
             ]
         ]
     },
     {
-        "id": "c2d1aecb.85e098",
+        "id": "90c8108b.3d46b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4226.88232421875,
-        "y": 833.6556701660156,
-        "z": "97fec48c.8eada",
+        "x": 4163.88232421875,
+        "y": 1066.6556701660156,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "a9a60061.b99928",
-                "cfa839ce.804738"
+                "925c2765.45f7c",
+                "a7906754.f0e008"
             ]
         ]
     },
     {
-        "id": "1ac89a13.d0df06",
+        "id": "694c4d07.5571c4",
         "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": 4242.5,
-        "y": 894,
-        "z": "97fec48c.8eada",
+        "x": 4179.5,
+        "y": 1127,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "b06bf8cb.62556",
+        "id": "8a4ef9a5.3b77b8",
         "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": 4231.5,
-        "y": 949,
-        "z": "97fec48c.8eada",
+        "x": 4168.5,
+        "y": 1182,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "a9a60061.b99928",
+        "id": "925c2765.45f7c",
         "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": 4435.9998779296875,
-        "y": 801,
-        "z": "97fec48c.8eada",
+        "x": 4372.9998779296875,
+        "y": 1034,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "3e68bf5c.62e23",
+        "id": "3a5f117c.72df06",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4005.9998779296875,
-        "y": 1096,
-        "z": "97fec48c.8eada",
+        "x": 3942.9998779296875,
+        "y": 1329,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "64775e7a.bf3908",
+        "id": "6ce614ed.7484ac",
         "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": 4659.9998779296875,
-        "y": 1041,
-        "z": "97fec48c.8eada",
+        "x": 4596.9998779296875,
+        "y": 1274,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "8aefd07e.260d8",
+        "id": "73216d1e.d409d4",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4811.9998779296875,
-        "y": 249,
-        "z": "97fec48c.8eada",
+        "x": 4748.9998779296875,
+        "y": 482,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "4f8861e6.824728"
+                "8e56eb89.dcf8d"
             ]
         ]
     },
     {
-        "id": "4f8861e6.824728",
+        "id": "8e56eb89.dcf8d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4988.9998779296875,
-        "y": 241,
-        "z": "97fec48c.8eada",
+        "x": 4925.9998779296875,
+        "y": 474,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "8261f1c0.e8f31",
-                "36d8211f.467a7e",
-                "49234c70.a5c64c"
+                "8a97b17a.8e6468",
+                "4190236a.ccd374",
+                "2d2f03c2.a9effc"
             ]
         ]
     },
     {
-        "id": "8261f1c0.e8f31",
+        "id": "8a97b17a.8e6468",
         "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": 5203.9998779296875,
-        "y": 222,
-        "z": "97fec48c.8eada",
+        "x": 5140.9998779296875,
+        "y": 455,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "36d8211f.467a7e",
+        "id": "4190236a.ccd374",
         "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": 5220.9998779296875,
-        "y": 286,
-        "z": "97fec48c.8eada",
+        "x": 5157.9998779296875,
+        "y": 519,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "92167a44.d7bee"
+                "84a43718.34957"
             ]
         ]
     },
     {
-        "id": "92167a44.d7bee",
+        "id": "84a43718.34957",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5444.4998779296875,
-        "y": 287,
-        "z": "97fec48c.8eada",
+        "x": 5381.4998779296875,
+        "y": 520,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "eafcd68a.31cbf"
+                "95ce66c5.711c6"
             ]
         ]
     },
     {
-        "id": "eafcd68a.31cbf",
+        "id": "95ce66c5.711c6",
         "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": 5708.9998779296875,
-        "y": 276,
-        "z": "97fec48c.8eada",
+        "x": 5645.9998779296875,
+        "y": 509,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "8e112ac6.c7732",
+        "id": "8aa824b7.0c6278",
         "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": 4413.9998779296875,
-        "y": 245,
-        "z": "97fec48c.8eada",
+        "x": 4350.9998779296875,
+        "y": 478,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "7a3db7fd.944d68"
+                "5a4b07ac.8d3028"
             ]
         ]
     },
     {
-        "id": "7a3db7fd.944d68",
+        "id": "5a4b07ac.8d3028",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4608.9998779296875,
-        "y": 245,
-        "z": "97fec48c.8eada",
+        "x": 4545.9998779296875,
+        "y": 478,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "8aefd07e.260d8"
+                "73216d1e.d409d4"
             ]
         ]
     },
     {
-        "id": "49234c70.a5c64c",
+        "id": "2d2f03c2.a9effc",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5147.9998779296875,
-        "y": 339,
-        "z": "97fec48c.8eada",
+        "x": 5084.9998779296875,
+        "y": 572,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "cfa839ce.804738",
+        "id": "a7906754.f0e008",
         "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": 4414.9998779296875,
-        "y": 852,
-        "z": "97fec48c.8eada",
+        "x": 4351.9998779296875,
+        "y": 1085,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "4d05ba94.558ef4"
+                "6641c07e.096d18"
             ]
         ]
     },
     {
-        "id": "4d05ba94.558ef4",
+        "id": "6641c07e.096d18",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4609.9998779296875,
-        "y": 852,
-        "z": "97fec48c.8eada",
+        "x": 4546.9998779296875,
+        "y": 1085,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "5d78c070.cc21d"
+                "66c4a517.3f3fd4"
             ]
         ]
     },
     {
-        "id": "5c18dd82.55be5c",
+        "id": "f2bb305d.4422b8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5233.9998779296875,
-        "y": 932,
-        "z": "97fec48c.8eada",
+        "x": 5170.9998779296875,
+        "y": 1165,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "c69a19d0.8fe6d",
+        "id": "4ad035fb.c384cc",
         "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=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-src-tp\"/>\n\n",
+        "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": 3917.9998779296875,
-        "y": 75,
-        "z": "97fec48c.8eada",
+        "x": 3854.9998779296875,
+        "y": 308,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "4ca85973.1ae2a",
-                "285acc14.d6b794"
+                "5bd2f425.157014",
+                "a6025f31.cc3d4"
             ]
         ]
     },
     {
-        "id": "285acc14.d6b794",
+        "id": "a6025f31.cc3d4",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4138.9998779296875,
-        "y": 43,
-        "z": "97fec48c.8eada",
+        "x": 4075.9998779296875,
+        "y": 276,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "2fdf8051.c7f6a8"
+                "61178ee6.46287"
             ]
         ]
     },
     {
-        "id": "4ca85973.1ae2a",
+        "id": "5bd2f425.157014",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4138.9998779296875,
-        "y": 90,
-        "z": "97fec48c.8eada",
+        "x": 4075.9998779296875,
+        "y": 323,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "be0791af.66d9e"
+                "3bd5270a.9b3388"
             ]
         ]
     },
     {
-        "id": "2fdf8051.c7f6a8",
+        "id": "61178ee6.46287",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4303.9998779296875,
-        "y": 40,
-        "z": "97fec48c.8eada",
+        "x": 4240.9998779296875,
+        "y": 273,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "a66ce9ac.c44538"
+                "30bc001a.081c6"
             ]
         ]
     },
     {
-        "id": "a66ce9ac.c44538",
+        "id": "30bc001a.081c6",
         "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": 4485.9998779296875,
-        "y": 44,
-        "z": "97fec48c.8eada",
+        "x": 4422.9998779296875,
+        "y": 277,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "be0791af.66d9e",
+        "id": "3bd5270a.9b3388",
         "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": 4305.9998779296875,
-        "y": 90,
-        "z": "97fec48c.8eada",
+        "x": 4242.9998779296875,
+        "y": 323,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "c1a0d70e.9bb548",
+        "id": "888129ab.9ea2a8",
         "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": 3925.9998779296875,
-        "y": 699,
-        "z": "97fec48c.8eada",
+        "x": 3862.9998779296875,
+        "y": 932,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "50687959.886b6",
-                "99d4fed5.f7a3f"
+                "f5b036b5.9d3fe",
+                "c8627fdc.4ca238"
             ]
         ]
     },
     {
-        "id": "99d4fed5.f7a3f",
+        "id": "c8627fdc.4ca238",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4146.9998779296875,
-        "y": 667,
-        "z": "97fec48c.8eada",
+        "x": 4083.9998779296875,
+        "y": 900,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "9d94fa7.027cb88"
+                "5d59aabb.f55db4"
             ]
         ]
     },
     {
-        "id": "50687959.886b6",
+        "id": "f5b036b5.9d3fe",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4146.9998779296875,
-        "y": 714,
-        "z": "97fec48c.8eada",
+        "x": 4083.9998779296875,
+        "y": 947,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "7a52ffa3.7e9d28"
+                "8fc5e8a.5216b18"
             ]
         ]
     },
     {
-        "id": "9d94fa7.027cb88",
+        "id": "5d59aabb.f55db4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4311.9998779296875,
-        "y": 664,
-        "z": "97fec48c.8eada",
+        "x": 4248.9998779296875,
+        "y": 897,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "675b55d9.b9c0ec"
+                "c8487895.7a94"
             ]
         ]
     },
     {
-        "id": "675b55d9.b9c0ec",
+        "id": "c8487895.7a94",
         "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": 4507.9998779296875,
-        "y": 661,
-        "z": "97fec48c.8eada",
+        "x": 4444.9998779296875,
+        "y": 894,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "7a52ffa3.7e9d28",
+        "id": "8fc5e8a.5216b18",
         "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": 4313.9998779296875,
-        "y": 714,
-        "z": "97fec48c.8eada",
+        "x": 4250.9998779296875,
+        "y": 947,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "20564e8a.e84492",
+        "id": "abe518b.cefde68",
         "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='' />",
+        "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": 1183,
-        "y": 501,
-        "z": "97fec48c.8eada",
+        "x": 1120,
+        "y": 734,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "56dc1543.ce88ec",
-        "type": "switchNode",
-        "name": "switch value == start-node",
-        "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.start-node`'>",
+        "id": "cf555e48.aeaaa8",
+        "type": "comment",
+        "name": "Not useful anymore",
+        "info": "this domain-A.ltpId is not used anymore",
         "comments": "",
-        "outputs": 1,
-        "x": 3103.9998779296875,
-        "y": 254,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "a156113e.6f73f"
-            ]
-        ]
+        "x": 4465.9998779296875,
+        "y": 253,
+        "z": "6311a927.78727",
+        "wires": []
     },
     {
-        "id": "edb2a900.9a7b1",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3433.9998779296875,
-        "y": 238,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "614113e.09a2a6c"
-            ]
-        ]
+        "id": "29edf5a1.e0b48a",
+        "type": "comment",
+        "name": "Not useful anymore",
+        "info": "this domain-B.ltpId is not used anymore",
+        "comments": "",
+        "x": 4487.9998779296875,
+        "y": 866,
+        "z": "6311a927.78727",
+        "wires": []
     },
     {
-        "id": "bc992c4c.01fac8",
+        "id": "7882cf69.81bba",
         "type": "set",
-        "name": "set dst-ltpId",
-        "xml": "<set>\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n\n<!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-ltp-id`' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />-->\n<!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-node-id`' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />-->\n\n<!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />-->\n\n",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='`tmp.otninfo.`' value='' />\n<!--<parameter name='`tmp.otninfo_length`' value='0' />-->",
         "comments": "",
-        "x": 3630.9998779296875,
-        "y": 324,
-        "z": "97fec48c.8eada",
+        "x": 761,
+        "y": 662,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "7a290eee.406588",
+        "id": "1e669820.d1af2",
+        "type": "comment",
+        "name": "May not be necessary",
+        "info": "",
+        "comments": "",
+        "x": 772,
+        "y": 615,
+        "z": "6311a927.78727",
+        "wires": []
+    },
+    {
+        "id": "f346bebe.50149",
         "type": "block",
         "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
+        "xml": "<block atomic='true'>",
         "atomic": "true",
+        "comments": "",
         "outputs": 1,
-        "x": 3451.9998779296875,
-        "y": 336,
-        "z": "97fec48c.8eada",
+        "x": 752,
+        "y": 412,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "bc992c4c.01fac8"
+                "bf6f0512.491f98",
+                "50fbaa58.2b30a4",
+                "9c16d091.cb39f8",
+                "67b4d462.48c1b4",
+                "47a588a1.c73f2",
+                "7663f303.03da94",
+                "9122c7e9.cadbc8",
+                "45b9551b.0a437c",
+                "3cc2e9be.dc0176",
+                "5092ace7.ae1144",
+                "652147e8.77864"
             ]
         ]
     },
     {
-        "id": "a156113e.6f73f",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "bf6f0512.491f98",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 3291.9998779296875,
-        "y": 241,
-        "z": "97fec48c.8eada",
+        "x": 1026,
+        "y": 632,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "edb2a900.9a7b1"
+                "278e4eda.dd1afa",
+                "95a448d5.61bae",
+                "396c6fcc.348ef"
             ]
         ]
     },
     {
-        "id": "b07af7fc.6b63b8",
-        "type": "switchNode",
-        "name": "switch value == end-node",
-        "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.end-node`'>",
+        "id": "50fbaa58.2b30a4",
+        "type": "record",
+        "name": "record tmp.pce-src and dst node",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 3101.9998779296875,
-        "y": 318,
-        "z": "97fec48c.8eada",
+        "x": 1003,
+        "y": 449,
+        "z": "6311a927.78727",
         "wires": [
-            [
-                "adae2c31.77bd68"
-            ]
+            []
         ]
     },
     {
-        "id": "adae2c31.77bd68",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "278e4eda.dd1afa",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3286.9998779296875,
-        "y": 322,
-        "z": "97fec48c.8eada",
+        "x": 1271,
+        "y": 664,
+        "z": "6311a927.78727",
         "wires": [
-            [
-                "7a290eee.406588"
-            ]
+            []
         ]
     },
     {
-        "id": "fdcdd209.036438",
-        "type": "comment",
-        "name": "Not useful anymore",
-        "info": "this domain-A.ltpId is not used anymore",
+        "id": "95a448d5.61bae",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
-        "x": 4528.9998779296875,
-        "y": 20,
-        "z": "97fec48c.8eada",
+        "outputs": 1,
+        "x": 1278,
+        "y": 706,
+        "z": "6311a927.78727",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "396c6fcc.348ef",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1273,
+        "y": 627,
+        "z": "6311a927.78727",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9c16d091.cb39f8",
+        "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": 971,
+        "y": 357,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "335fd86d.6b1ff",
-        "type": "comment",
-        "name": "Not useful anymore",
-        "info": "this domain-B.ltpId is not used anymore",
+        "id": "67b4d462.48c1b4",
+        "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": 4550.9998779296875,
-        "y": 633,
-        "z": "97fec48c.8eada",
+        "x": 971,
+        "y": 403,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "3d2e0b8f.457abc",
+        "id": "165db6ae.de2bb9",
         "type": "set",
-        "name": "unset parameters",
-        "xml": "<set>\n<parameter name='`tmp.otninfo.`' value='' />\n<parameter name='`tmp.otninfo_length`' value='0' />",
+        "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": 824,
-        "y": 429,
-        "z": "97fec48c.8eada",
+        "x": 1102,
+        "y": 865,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "d9b3c779.af79",
-        "type": "comment",
-        "name": "May not be necessary",
-        "info": "",
+        "id": "fda3acff.66dac8",
+        "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": 836,
-        "y": 397,
-        "z": "97fec48c.8eada",
+        "x": 1103,
+        "y": 915,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "27ac90d.484a9f",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
+        "id": "47a588a1.c73f2",
+        "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": 825,
-        "y": 265,
-        "z": "97fec48c.8eada",
+        "x": 1023,
+        "y": 102,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "b00cf456.1fcfd8",
-                "22917417.40dffc",
-                "9d01bdd0.0fc258"
+                "a6aa209b.6892d",
+                "487dbe5b.696ae8",
+                "81fa26f.09db858"
             ]
         ]
     },
     {
-        "id": "b00cf456.1fcfd8",
-        "type": "get-resource",
-        "name": "get-resource pnfs-list",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopo.pnfs\" >",
+        "id": "487dbe5b.696ae8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1072,
-        "y": 218,
-        "z": "97fec48c.8eada",
+        "x": 1256,
+        "y": 126,
+        "z": "6311a927.78727",
         "wires": [
-            [
-                "e9ef8fc5.a18d1",
-                "701f5a59.c009ac",
-                "88137b8e.f20ce"
-            ]
+            []
         ]
     },
     {
-        "id": "22917417.40dffc",
-        "type": "get-resource",
-        "name": "get-resource logical-links",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopo.logicalLinks\" >",
+        "id": "81fa26f.09db858",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1270,
+        "y": 166,
+        "z": "6311a927.78727",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a6aa209b.6892d",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1082,
-        "y": 275,
-        "z": "97fec48c.8eada",
+        "x": 1259,
+        "y": 85,
+        "z": "6311a927.78727",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7663f303.03da94",
+        "type": "for",
+        "name": "for netwidx..allNetworksList_length",
+        "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1015,
+        "y": 148,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "701f5a59.c009ac",
-                "88137b8e.f20ce",
-                "f79f6d93.33fad8"
+                "27c5b08b.38fb5"
             ]
         ]
     },
     {
-        "id": "9d01bdd0.0fc258",
-        "type": "execute",
-        "name": "execute PCE in ccsdk/sli/core",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.slitopologyutils.SliTopologyUtils' method='computePath' >\n<parameter name=\"pnfs-pfx\" value='`$ccsdkTopo.pnfs`'/>\n<parameter name=\"links-pfx\" value=\"`$ccsdkTopo.logicalLinks`\"/>\n<parameter name=\"response-pfx\" value=\"otn-oof\"/>\n<parameter name=\"output-end-to-end-path\" value=\"true\"/>\n<parameter name=\"src-node\" value=\"`$tmp.src.domainA.pnf-name`\"/>\n<parameter name=\"dst-node\" value=\"`$tmp.src.domainB.pnf-name`\"/>\n",
+        "id": "27c5b08b.38fb5",
+        "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": 1095,
-        "y": 327,
-        "z": "97fec48c.8eada",
+        "x": 1336,
+        "y": 224,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "d13c5cda.e31cf8",
-                "75643e28.77914"
+                "22cbcd57.e91ce2",
+                "119bae13.8994fa"
             ]
         ]
     },
     {
-        "id": "701f5a59.c009ac",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "22cbcd57.e91ce2",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1329,
-        "y": 163,
-        "z": "97fec48c.8eada",
+        "x": 1563,
+        "y": 225,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "2909bfef.cce208"
+                "1f8d2ed3.4f6c09"
             ]
         ]
     },
     {
-        "id": "e9ef8fc5.a18d1",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "1f8d2ed3.4f6c09",
+        "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": 1337,
-        "y": 240,
-        "z": "97fec48c.8eada",
+        "x": 1776,
+        "y": 225,
+        "z": "6311a927.78727",
         "wires": [
-            []
+            [
+                "cfa8e423.6dd988"
+            ]
         ]
     },
     {
-        "id": "2d0a238b.9b0514",
-        "type": "record",
-        "name": "record",
-        "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=\"Pnfs retrieved!\"/>\n<parameter name=\"field2\" value=\"`$ccsdkTopo.pnfs.pnf_length`\"/>\n",
+        "id": "cfa8e423.6dd988",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1496,
-        "y": 237,
-        "z": "97fec48c.8eada",
+        "x": 1941,
+        "y": 225,
+        "z": "6311a927.78727",
         "wires": [
-            []
+            [
+                "3bd110a6.a8ba8"
+            ]
         ]
     },
     {
-        "id": "2909bfef.cce208",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "3bd110a6.a8ba8",
+        "type": "set",
+        "name": "set otnTopoIdSrc",
+        "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 1515,
-        "y": 163,
-        "z": "97fec48c.8eada",
+        "x": 2110,
+        "y": 225,
+        "z": "6311a927.78727",
         "wires": []
     },
     {
-        "id": "88137b8e.f20ce",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "119bae13.8994fa",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1340,
-        "y": 201,
-        "z": "97fec48c.8eada",
+        "x": 1563,
+        "y": 278,
+        "z": "6311a927.78727",
         "wires": [
             [
-                "5baa421f.eeaaec"
+                "4e665bce.dd8f3c"
             ]
         ]
     },
     {
-        "id": "5baa421f.eeaaec",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "4e665bce.dd8f3c",
+        "type": "switchNode",
+        "name": "switch provider-id domainB",
+        "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainB-pnfName[2]`'>\n",
         "comments": "",
-        "x": 1512,
-        "y": 201,
-        "z": "97fec48c.8eada",
-        "wires": []
+        "outputs": 1,
+        "x": 1751,
+        "y": 278,
+        "z": "6311a927.78727",
+        "wires": [
+            [
+                "5471d1aa.c2b568"
+            ]
+        ]
     },
     {
-        "id": "f79f6d93.33fad8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "5471d1aa.c2b568",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1341,
-        "y": 275,
-        "z": "97fec48c.8eada",
+        "x": 1941,
+        "y": 278,
+        "z": "6311a927.78727",
         "wires": [
-            []
+            [
+                "aa5bb707.4bb48"
+            ]
         ]
     },
     {
-        "id": "8cc43261.20f998",
-        "type": "record",
-        "name": "record",
-        "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=\"Logical-links retrieved!\"/>\n<parameter name=\"field2\" value=\"`$ccsdkTopo.logicalLinks.logical-link_length`\"/>\n",
+        "id": "aa5bb707.4bb48",
+        "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": 1502,
-        "y": 275,
-        "z": "97fec48c.8eada",
+        "x": 2109,
+        "y": 278,
+        "z": "6311a927.78727",
         "wires": [
-            []
+            [
+                "3a63aeee.a8bb3a"
+            ]
         ]
     },
     {
-        "id": "d13c5cda.e31cf8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "3a63aeee.a8bb3a",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1336,
-        "y": 314,
-        "z": "97fec48c.8eada",
+        "x": 2265,
+        "y": 278,
+        "z": "6311a927.78727",
         "wires": [
-            []
+            [
+                "1438c95.a2947b7"
+            ]
         ]
     },
     {
-        "id": "75643e28.77914",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "1438c95.a2947b7",
+        "type": "set",
+        "name": "set otnTopoIdDst",
+        "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+        "comments": "",
+        "x": 2424,
+        "y": 278,
+        "z": "6311a927.78727",
+        "wires": []
+    },
+    {
+        "id": "9122c7e9.cadbc8",
+        "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": 964,
+        "y": 304,
+        "z": "6311a927.78727",
+        "wires": []
+    },
+    {
+        "id": "45b9551b.0a437c",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
+        "comments": "",
+        "x": 968,
+        "y": 219,
+        "z": "6311a927.78727",
+        "wires": []
+    },
+    {
+        "id": "3cc2e9be.dc0176",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='tmp.pce-dst-node.' value='' />\n",
+        "comments": "",
+        "x": 966,
+        "y": 261,
+        "z": "6311a927.78727",
+        "wires": []
+    },
+    {
+        "id": "5092ace7.ae1144",
+        "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": 1328,
-        "y": 361,
-        "z": "97fec48c.8eada",
+        "x": 959,
+        "y": 493,
+        "z": "6311a927.78727",
         "wires": [
             []
         ]
     },
     {
-        "id": "117e8dda.79f3d2",
-        "type": "record",
-        "name": "record",
-        "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",
+        "id": "ab172df4.a758b",
+        "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": 1503,
-        "y": 320,
-        "z": "97fec48c.8eada",
+        "x": 978,
+        "y": 575,
+        "z": "6311a927.78727",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "652147e8.77864",
+        "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`\" />",
+        "comments": "",
+        "x": 955,
+        "y": 529,
+        "z": "6311a927.78727",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
index d6eb6865..02a760d5 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "eb07fd3d.499fe",
+        "id": "acf9e544.d632d8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 142,
-        "y": 92,
-        "z": "f351885d.7dcd3",
+        "x": 130,
+        "y": 80,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "39c5ac20.45e1d4"
+                "ca913714.8e299"
             ]
         ]
     },
     {
-        "id": "39c5ac20.45e1d4",
+        "id": "ca913714.8e299",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,2326 +22,2326 @@
         "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": 273.2856903076172,
-        "y": 141.23810863494873,
-        "z": "f351885d.7dcd3",
+        "x": 261.2856903076172,
+        "y": 129.23810863494873,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "2ea16900.365168"
+                "fb417168.600308"
             ]
         ]
     },
     {
-        "id": "2ea16900.365168",
+        "id": "fb417168.600308",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-activate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 276.4286193847656,
-        "y": 226.00003242492676,
-        "z": "f351885d.7dcd3",
+        "x": 264.4286193847656,
+        "y": 214.00003242492676,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "65a4788.f116c88"
+                "b8f0421e.565ff8"
             ]
         ]
     },
     {
-        "id": "65a4788.f116c88",
+        "id": "b8f0421e.565ff8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 426.238037109375,
-        "y": 355.6666564941406,
-        "z": "f351885d.7dcd3",
+        "x": 414.238037109375,
+        "y": 343.6666564941406,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "57f656d8.02c09",
-                "6ee54bdc.2fdd5c",
-                "4cf7ab90.c1f3ec"
+                "77ab8d82.d7040c",
+                "161b3712.e40a99",
+                "441438f3.47d108"
             ]
         ]
     },
     {
-        "id": "57f656d8.02c09",
+        "id": "77ab8d82.d7040c",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 694.5716552734375,
-        "y": 742.59716796875,
-        "z": "f351885d.7dcd3",
+        "x": 682.5716552734375,
+        "y": 730.59716796875,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "d36cebd.8be9418",
+        "id": "cd3b0e66.721858",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 726,
-        "y": 417,
-        "z": "f351885d.7dcd3",
+        "x": 714,
+        "y": 405,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "6ee54bdc.2fdd5c",
+        "id": "161b3712.e40a99",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 746,
-        "y": 513,
-        "z": "f351885d.7dcd3",
+        "x": 734,
+        "y": 501,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "4321e029.b0b21",
-                "df857197.b37508",
-                "caa9bf62.bc7768"
+                "a50bfd24.6ac44",
+                "3bd3a68e.896b3a",
+                "320764b6.9fa15c"
             ]
         ]
     },
     {
-        "id": "4321e029.b0b21",
+        "id": "a50bfd24.6ac44",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 965,
-        "y": 451,
-        "z": "f351885d.7dcd3",
+        "x": 953,
+        "y": 439,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "1399e348.49a41d"
+                "b122e042.5ab94"
             ]
         ]
     },
     {
-        "id": "df857197.b37508",
+        "id": "3bd3a68e.896b3a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 974.490966796875,
-        "y": 493.57403564453125,
-        "z": "f351885d.7dcd3",
+        "x": 962.490966796875,
+        "y": 481.57403564453125,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "9c66f3b5.ba5a"
+                "4e666373.42b6cc"
             ]
         ]
     },
     {
-        "id": "caa9bf62.bc7768",
+        "id": "320764b6.9fa15c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 963,
-        "y": 540,
-        "z": "f351885d.7dcd3",
+        "x": 951,
+        "y": 528,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "83f89a00.0c0e7"
+                "422b64b3.e06004"
             ]
         ]
     },
     {
-        "id": "9c66f3b5.ba5a",
+        "id": "4e666373.42b6cc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1128.0623779296875,
-        "y": 496.8597717285156,
-        "z": "f351885d.7dcd3",
+        "x": 1116.0623779296875,
+        "y": 484.8597717285156,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "83f89a00.0c0e7",
+        "id": "422b64b3.e06004",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1132,
-        "y": 541,
-        "z": "f351885d.7dcd3",
+        "x": 1120,
+        "y": 529,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "1399e348.49a41d",
+        "id": "b122e042.5ab94",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1162,
-        "y": 447,
-        "z": "f351885d.7dcd3",
+        "x": 1150,
+        "y": 435,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "8c655e36.efa51"
+                "111942fe.354315"
             ]
         ]
     },
     {
-        "id": "8c655e36.efa51",
+        "id": "111942fe.354315",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1385.33349609375,
-        "y": 446.99993896484375,
-        "z": "f351885d.7dcd3",
+        "x": 1373.33349609375,
+        "y": 434.99993896484375,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "dae7ff66.9b9c6"
+                "ff15f851.7a7528"
             ]
         ]
     },
     {
-        "id": "dae7ff66.9b9c6",
+        "id": "ff15f851.7a7528",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1586.0001335144043,
-        "y": 448.00002098083496,
-        "z": "f351885d.7dcd3",
+        "x": 1574.0001335144043,
+        "y": 436.00002098083496,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "5afc15bc.b14b2c"
+                "cf901b65.835fc8"
             ]
         ]
     },
     {
-        "id": "73d91f0d.979448",
+        "id": "72376cd1.cdcaec",
         "type": "set",
         "name": "set attachment_param for OTN A",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
         "comments": "",
-        "x": 4405,
-        "y": 164,
-        "z": "f351885d.7dcd3",
+        "x": 4393,
+        "y": 152,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "53d5aef.e4ebbd",
+        "id": "2a89aa53.8890b6",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\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": 4486,
-        "y": 479,
-        "z": "f351885d.7dcd3",
+        "x": 4474,
+        "y": 467,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "ecc00da.2c7107",
-                "8ec5d396.327df"
+                "40316706.17eb48",
+                "6c473f1b.946a08"
             ]
         ]
     },
     {
-        "id": "ecc00da.2c7107",
+        "id": "40316706.17eb48",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4795.5,
-        "y": 448,
-        "z": "f351885d.7dcd3",
+        "x": 4783.5,
+        "y": 436,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "30cb0de4.d526fa"
+                "aea69973.33e85"
             ]
         ]
     },
     {
-        "id": "8ec5d396.327df",
+        "id": "6c473f1b.946a08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4800.5,
-        "y": 513,
-        "z": "f351885d.7dcd3",
+        "x": 4788.5,
+        "y": 501,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "d98d92f9.c81fa"
+                "d21a082d.2cad68"
             ]
         ]
     },
     {
-        "id": "30cb0de4.d526fa",
+        "id": "aea69973.33e85",
         "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 Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4971.5,
-        "y": 448,
-        "z": "f351885d.7dcd3",
+        "x": 4959.5,
+        "y": 436,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "d98d92f9.c81fa",
+        "id": "d21a082d.2cad68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4967,
-        "y": 513,
-        "z": "f351885d.7dcd3",
+        "x": 4955,
+        "y": 501,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]
     },
     {
-        "id": "b72def38.869578",
+        "id": "de94f6d4.eda0e",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
         "comments": "",
-        "x": 4352.5,
-        "y": 667,
-        "z": "f351885d.7dcd3",
+        "x": 4340.5,
+        "y": 655,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "61d206ce.c84cc",
+        "id": "342bfbf3.ee642c",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4506.5,
-        "y": 715,
-        "z": "f351885d.7dcd3",
+        "x": 4494.5,
+        "y": 703,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "4c218232.9ff344",
-                "70cfc429.d9d73c"
+                "8236b8ec.5fd17",
+                "51c5e2c3.871744"
             ]
         ]
     },
     {
-        "id": "4c218232.9ff344",
+        "id": "8236b8ec.5fd17",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4852,
-        "y": 696,
-        "z": "f351885d.7dcd3",
+        "x": 4840,
+        "y": 684,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "508ab9bd.6f59b"
+                "b89e8953.c6ac88"
             ]
         ]
     },
     {
-        "id": "70cfc429.d9d73c",
+        "id": "51c5e2c3.871744",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4856,
-        "y": 736,
-        "z": "f351885d.7dcd3",
+        "x": 4844,
+        "y": 724,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "4484b215.bd52a4"
+                "933ba47e.14e65"
             ]
         ]
     },
     {
-        "id": "508ab9bd.6f59b",
+        "id": "b89e8953.c6ac88",
         "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 Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 5010,
-        "y": 696,
-        "z": "f351885d.7dcd3",
+        "x": 4998,
+        "y": 684,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "4484b215.bd52a4",
+        "id": "933ba47e.14e65",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5013.5,
-        "y": 736,
-        "z": "f351885d.7dcd3",
+        "x": 5001.5,
+        "y": 724,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "d5eb1314.bae0c8",
-                "10b6b358.4dd2d5"
+                "363131ab.be28b6",
+                "fcee3485.dea4a"
             ]
         ]
     },
     {
-        "id": "1158b528.feaadb",
+        "id": "776cbd7.844f0c4",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 4350,
-        "y": 623,
-        "z": "f351885d.7dcd3",
+        "x": 4338,
+        "y": 611,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "d5eb1314.bae0c8",
+        "id": "363131ab.be28b6",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5344,
-        "y": 701,
-        "z": "f351885d.7dcd3",
+        "x": 5332,
+        "y": 689,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]
     },
     {
-        "id": "4e452bee.48e2ac",
+        "id": "d8ba5ee6.a5736",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 5208,
-        "y": 660,
-        "z": "f351885d.7dcd3",
+        "x": 5196,
+        "y": 648,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "10b6b358.4dd2d5",
+        "id": "fcee3485.dea4a",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5271,
-        "y": 747,
-        "z": "f351885d.7dcd3",
+        "x": 5259,
+        "y": 735,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]
     },
     {
-        "id": "cdb19fe7.3fcc18",
+        "id": "9b9c3cba.716c78",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4343,
-        "y": 212,
-        "z": "f351885d.7dcd3",
+        "x": 4331,
+        "y": 200,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "83225463.070fc",
+        "id": "5f8cf8c6.3002c8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4369,
-        "y": 329,
-        "z": "f351885d.7dcd3",
+        "x": 4357,
+        "y": 317,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "c77a135e.0cf11",
-                "733c4b21.b0276c",
-                "dfbdc2b7.10d7d"
+                "33823e1a.9269c2",
+                "b38b9e38.f8c8a8",
+                "9f21383a.68cb9"
             ]
         ]
     },
     {
-        "id": "c77a135e.0cf11",
+        "id": "33823e1a.9269c2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4564.5001220703125,
-        "y": 281,
-        "z": "f351885d.7dcd3",
+        "x": 4552.5001220703125,
+        "y": 269,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "fc1575d4.07ce9"
+                "755b5bf3.347744"
             ]
         ]
     },
     {
-        "id": "733c4b21.b0276c",
+        "id": "b38b9e38.f8c8a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4556.5001220703125,
-        "y": 336,
-        "z": "f351885d.7dcd3",
+        "x": 4544.5001220703125,
+        "y": 324,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "2d634f91.a839c8"
+                "5d1291bc.3b9d5"
             ]
         ]
     },
     {
-        "id": "fc1575d4.07ce9",
+        "id": "755b5bf3.347744",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4708.8824462890625,
-        "y": 280.6556701660156,
-        "z": "f351885d.7dcd3",
+        "x": 4696.8824462890625,
+        "y": 268.6556701660156,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "26c3005d.c41c58"
+                "5007d6bb.a571d"
             ]
         ]
     },
     {
-        "id": "fb614f2c.314568",
+        "id": "c0da9575.eb2c6",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5291,
-        "y": 283,
-        "z": "f351885d.7dcd3",
+        "x": 5279,
+        "y": 271,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "5511aade.71874c"
+                "1053f3a3.2846c4"
             ]
         ]
     },
     {
-        "id": "26c3005d.c41c58",
+        "id": "5007d6bb.a571d",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4893,
-        "y": 279,
-        "z": "f351885d.7dcd3",
+        "x": 4881,
+        "y": 267,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "d1afc9f2.3db068"
+                "33b94d0d.c61ee2"
             ]
         ]
     },
     {
-        "id": "d1afc9f2.3db068",
+        "id": "33b94d0d.c61ee2",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5088,
-        "y": 279,
-        "z": "f351885d.7dcd3",
+        "x": 5076,
+        "y": 267,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "fb614f2c.314568"
+                "c0da9575.eb2c6"
             ]
         ]
     },
     {
-        "id": "dfbdc2b7.10d7d",
+        "id": "9f21383a.68cb9",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4561.5001220703125,
-        "y": 393,
-        "z": "f351885d.7dcd3",
+        "x": 4549.5001220703125,
+        "y": 381,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "1874b649.d37aaa"
+                "e621d08a.7d07a8"
             ]
         ]
     },
     {
-        "id": "1874b649.d37aaa",
+        "id": "e621d08a.7d07a8",
         "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": 4713.5001220703125,
-        "y": 394,
-        "z": "f351885d.7dcd3",
+        "x": 4701.5001220703125,
+        "y": 382,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "2d634f91.a839c8",
+        "id": "5d1291bc.3b9d5",
         "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": 4724.5001220703125,
-        "y": 337,
-        "z": "f351885d.7dcd3",
+        "x": 4712.5001220703125,
+        "y": 325,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "37df0014.a385b",
+        "id": "bace4f35.dcb4f",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5676,
-        "y": 296,
-        "z": "f351885d.7dcd3",
+        "x": 5664,
+        "y": 284,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "43de30da.db75e8",
-                "e5ad5cbe.572928",
-                "12e2c219.e2a25e"
+                "41428f.b99c7d7",
+                "92b16ebc.198be8",
+                "47593c0a.609b2c"
             ]
         ]
     },
     {
-        "id": "5511aade.71874c",
+        "id": "1053f3a3.2846c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5470,
-        "y": 283,
-        "z": "f351885d.7dcd3",
+        "x": 5458,
+        "y": 271,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "29681795.e63f18",
-                "37df0014.a385b"
+                "db2fdd1f.f44e1",
+                "bace4f35.dcb4f"
             ]
         ]
     },
     {
-        "id": "29681795.e63f18",
+        "id": "db2fdd1f.f44e1",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5706,
-        "y": 244,
-        "z": "f351885d.7dcd3",
+        "x": 5694,
+        "y": 232,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "43de30da.db75e8",
+        "id": "41428f.b99c7d7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5886,
-        "y": 287,
-        "z": "f351885d.7dcd3",
+        "x": 5874,
+        "y": 275,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "9fb5e37f.eaa9f"
+                "d8c57966.bba2b8"
             ]
         ]
     },
     {
-        "id": "e5ad5cbe.572928",
+        "id": "92b16ebc.198be8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5878,
-        "y": 342,
-        "z": "f351885d.7dcd3",
+        "x": 5866,
+        "y": 330,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "24f5f29e.218576"
+                "bbecf65b.0991f"
             ]
         ]
     },
     {
-        "id": "12e2c219.e2a25e",
+        "id": "47593c0a.609b2c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5883,
-        "y": 399,
-        "z": "f351885d.7dcd3",
+        "x": 5871,
+        "y": 387,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "cd568772.16e428"
+                "17aa566c.ce27ba"
             ]
         ]
     },
     {
-        "id": "cd568772.16e428",
+        "id": "17aa566c.ce27ba",
         "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": 6035,
-        "y": 400,
-        "z": "f351885d.7dcd3",
+        "x": 6023,
+        "y": 388,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "24f5f29e.218576",
+        "id": "bbecf65b.0991f",
         "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": 6046,
-        "y": 345,
-        "z": "f351885d.7dcd3",
+        "x": 6034,
+        "y": 333,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "9fb5e37f.eaa9f",
+        "id": "d8c57966.bba2b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6030.38232421875,
-        "y": 284.6556701660156,
-        "z": "f351885d.7dcd3",
+        "x": 6018.38232421875,
+        "y": 272.6556701660156,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "2b11e0ba.ac6cd8"
+                "eeaaed9f.46288"
             ]
         ]
     },
     {
-        "id": "2b11e0ba.ac6cd8",
+        "id": "eeaaed9f.46288",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 6245,
-        "y": 281,
-        "z": "f351885d.7dcd3",
+        "x": 6233,
+        "y": 269,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "4cf7ab90.c1f3ec",
+        "id": "441438f3.47d108",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 712,
-        "y": 461,
-        "z": "f351885d.7dcd3",
+        "x": 700,
+        "y": 449,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]
     },
     {
-        "id": "fec1365a.907b4",
+        "id": "48e88b1.fd2c9f4",
         "type": "set",
         "name": "set attachment_param for OTN B",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
         "comments": "",
-        "x": 3812,
-        "y": 1621,
-        "z": "f351885d.7dcd3",
+        "x": 3800,
+        "y": 1609,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "eb21cc8f.003df8",
+        "id": "46863424.f49acc",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\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": 3875,
-        "y": 1950,
-        "z": "f351885d.7dcd3",
+        "x": 3863,
+        "y": 1938,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "fc655ff.669232",
-                "dfbdc395.b4aa"
+                "dcc57379.86dfe8",
+                "c898077c.fa069"
             ]
         ]
     },
     {
-        "id": "fc655ff.669232",
+        "id": "dcc57379.86dfe8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4170.5,
-        "y": 1917,
-        "z": "f351885d.7dcd3",
+        "x": 4158.5,
+        "y": 1905,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "d2ad58a1.dbb57"
+                "abcd166d.ac4418"
             ]
         ]
     },
     {
-        "id": "dfbdc395.b4aa",
+        "id": "c898077c.fa069",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4175.5,
-        "y": 1982,
-        "z": "f351885d.7dcd3",
+        "x": 4163.5,
+        "y": 1970,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "43fba27a.3e8bd4"
+                "a337c775.425078"
             ]
         ]
     },
     {
-        "id": "d2ad58a1.dbb57",
+        "id": "abcd166d.ac4418",
         "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 Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4338.5,
-        "y": 1917,
-        "z": "f351885d.7dcd3",
+        "x": 4326.5,
+        "y": 1905,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "43fba27a.3e8bd4",
+        "id": "a337c775.425078",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4349,
-        "y": 1982,
-        "z": "f351885d.7dcd3",
+        "x": 4337,
+        "y": 1970,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]
     },
     {
-        "id": "a7e92939.08a52",
+        "id": "402d5da7.084ecc",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",
         "comments": "",
-        "x": 3751,
-        "y": 1678,
-        "z": "f351885d.7dcd3",
+        "x": 3739,
+        "y": 1666,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "25024bed.781cdc",
+        "id": "600572d7.37f4f4",
         "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.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3771,
-        "y": 1775,
-        "z": "f351885d.7dcd3",
+        "x": 3759,
+        "y": 1763,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "17a289eb.8378c6",
-                "4e86abed.341d6c",
-                "9944c222.7ecb4"
+                "a75ca9d.3439f58",
+                "399b40eb.8cb2c",
+                "c23ae6cb.c49a18"
             ]
         ]
     },
     {
-        "id": "17a289eb.8378c6",
+        "id": "a75ca9d.3439f58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3973.5001220703125,
-        "y": 1728,
-        "z": "f351885d.7dcd3",
+        "x": 3961.5001220703125,
+        "y": 1716,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "2250bf3f.3fcd88"
+                "7c251cdc.702f24"
             ]
         ]
     },
     {
-        "id": "4e86abed.341d6c",
+        "id": "399b40eb.8cb2c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3965.5001220703125,
-        "y": 1783,
-        "z": "f351885d.7dcd3",
+        "x": 3953.5001220703125,
+        "y": 1771,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "7fe7998e.7db16"
+                "9ad884c8.666098"
             ]
         ]
     },
     {
-        "id": "2250bf3f.3fcd88",
+        "id": "7c251cdc.702f24",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4117.8824462890625,
-        "y": 1725.6556701660156,
-        "z": "f351885d.7dcd3",
+        "x": 4105.8824462890625,
+        "y": 1713.6556701660156,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "19367b54.5d4395"
+                "cb9eeb5b.e8a49"
             ]
         ]
     },
     {
-        "id": "19367b54.5d4395",
+        "id": "cb9eeb5b.e8a49",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4302,
-        "y": 1740,
-        "z": "f351885d.7dcd3",
+        "x": 4290,
+        "y": 1728,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "e137d17b.53afd"
+                "3d062c6c.6ff5d4"
             ]
         ]
     },
     {
-        "id": "9944c222.7ecb4",
+        "id": "c23ae6cb.c49a18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3970.5001220703125,
-        "y": 1840,
-        "z": "f351885d.7dcd3",
+        "x": 3958.5001220703125,
+        "y": 1828,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "c7e8bb41.e69fc8"
+                "c325aab2.4755e"
             ]
         ]
     },
     {
-        "id": "c7e8bb41.e69fc8",
+        "id": "c325aab2.4755e",
         "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": 4122.5001220703125,
-        "y": 1841,
-        "z": "f351885d.7dcd3",
+        "x": 4110.5001220703125,
+        "y": 1829,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "7fe7998e.7db16",
+        "id": "9ad884c8.666098",
         "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": 4133.5001220703125,
-        "y": 1786,
-        "z": "f351885d.7dcd3",
+        "x": 4121.5001220703125,
+        "y": 1774,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "18a3ba34.8443fe",
+        "id": "34bca75e.e09988",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4700,
-        "y": 1744,
-        "z": "f351885d.7dcd3",
+        "x": 4688,
+        "y": 1732,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "cca686b1.a86b48"
+                "edc0cd69.586d38"
             ]
         ]
     },
     {
-        "id": "e137d17b.53afd",
+        "id": "3d062c6c.6ff5d4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4497,
-        "y": 1740,
-        "z": "f351885d.7dcd3",
+        "x": 4485,
+        "y": 1728,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "18a3ba34.8443fe"
+                "34bca75e.e09988"
             ]
         ]
     },
     {
-        "id": "ec259c93.12e46",
+        "id": "f5373d88.e0f4c",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5085,
-        "y": 1743,
-        "z": "f351885d.7dcd3",
+        "x": 5073,
+        "y": 1731,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "cf9d2f3.18e805",
-                "1901d45c.9387cc",
-                "86a361e1.5f9008"
+                "efe05c93.e4bd48",
+                "c004c915.8de7",
+                "8875f4b.bcb6f88"
             ]
         ]
     },
     {
-        "id": "cca686b1.a86b48",
+        "id": "edc0cd69.586d38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4877,
-        "y": 1736,
-        "z": "f351885d.7dcd3",
+        "x": 4865,
+        "y": 1724,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "2d219530.71913a",
-                "ec259c93.12e46"
+                "bd388c7d.2a51e",
+                "f5373d88.e0f4c"
             ]
         ]
     },
     {
-        "id": "2d219530.71913a",
+        "id": "bd388c7d.2a51e",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5115,
-        "y": 1691,
-        "z": "f351885d.7dcd3",
+        "x": 5103,
+        "y": 1679,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "bb17bcb1.afece8",
+        "id": "c54d67f1.3a38c8",
         "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": 5444,
-        "y": 1847,
-        "z": "f351885d.7dcd3",
+        "x": 5432,
+        "y": 1835,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "e71302c9.0e3fc8",
+        "id": "56448bab.caa82c",
         "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": 5455,
-        "y": 1792,
-        "z": "f351885d.7dcd3",
+        "x": 5443,
+        "y": 1780,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "c367d2df.137348",
+        "id": "97f3ba34.f2dc7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5439.38232421875,
-        "y": 1731.6556701660156,
-        "z": "f351885d.7dcd3",
+        "x": 5427.38232421875,
+        "y": 1719.6556701660156,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "bfc16252.e05aa"
+                "5b487de9.7c9484"
             ]
         ]
     },
     {
-        "id": "bfc16252.e05aa",
+        "id": "5b487de9.7c9484",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5654,
-        "y": 1728,
-        "z": "f351885d.7dcd3",
+        "x": 5642,
+        "y": 1716,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "cf9d2f3.18e805",
+        "id": "efe05c93.e4bd48",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5295,
-        "y": 1734,
-        "z": "f351885d.7dcd3",
+        "x": 5283,
+        "y": 1722,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "c367d2df.137348"
+                "97f3ba34.f2dc7"
             ]
         ]
     },
     {
-        "id": "1901d45c.9387cc",
+        "id": "c004c915.8de7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5287,
-        "y": 1789,
-        "z": "f351885d.7dcd3",
+        "x": 5275,
+        "y": 1777,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "e71302c9.0e3fc8"
+                "56448bab.caa82c"
             ]
         ]
     },
     {
-        "id": "86a361e1.5f9008",
+        "id": "8875f4b.bcb6f88",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5292,
-        "y": 1846,
-        "z": "f351885d.7dcd3",
+        "x": 5280,
+        "y": 1834,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "bb17bcb1.afece8"
+                "c54d67f1.3a38c8"
             ]
         ]
     },
     {
-        "id": "5afc15bc.b14b2c",
+        "id": "cf901b65.835fc8",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1824,
-        "y": 450,
-        "z": "f351885d.7dcd3",
+        "x": 1812,
+        "y": 438,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "c4ea2f12.0682f8",
-                "89ba984f.fbff08",
-                "4c31ddac.b140a4"
+                "a3e158df.aec638",
+                "28bc0271.0f9e9e",
+                "12a8a0b5.4084c7"
             ]
         ]
     },
     {
-        "id": "c4ea2f12.0682f8",
+        "id": "a3e158df.aec638",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2032,
-        "y": 414,
-        "z": "f351885d.7dcd3",
+        "x": 2020,
+        "y": 402,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "207f18a3.1780c8"
+                "8651df9.9efa52"
             ]
         ]
     },
     {
-        "id": "89ba984f.fbff08",
+        "id": "28bc0271.0f9e9e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2032.490966796875,
-        "y": 459.57403564453125,
-        "z": "f351885d.7dcd3",
+        "x": 2020.490966796875,
+        "y": 447.57403564453125,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "db0bb70b.5af75"
+                "b3859ee9.a63778"
             ]
         ]
     },
     {
-        "id": "4c31ddac.b140a4",
+        "id": "12a8a0b5.4084c7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2030,
-        "y": 503,
-        "z": "f351885d.7dcd3",
+        "x": 2018,
+        "y": 491,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "34efc961.392a36"
+                "b1a3023.979458"
             ]
         ]
     },
     {
-        "id": "db0bb70b.5af75",
+        "id": "b3859ee9.a63778",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2195.0623779296875,
-        "y": 459.8597717285156,
-        "z": "f351885d.7dcd3",
+        "x": 2183.0623779296875,
+        "y": 447.8597717285156,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "34efc961.392a36",
+        "id": "b1a3023.979458",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2199,
-        "y": 504,
-        "z": "f351885d.7dcd3",
+        "x": 2187,
+        "y": 492,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "da2f8124.076ab8",
+        "id": "e921a3d6.75f8b8",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2505,
-        "y": 503,
-        "z": "f351885d.7dcd3",
+        "x": 2493,
+        "y": 491,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "28f88824.b7c4b8",
-                "d6ad8583.7ca128",
-                "c9e967f5.e899f8"
+                "19de242e.79b56c",
+                "e1533c2.9fadc4",
+                "da41548.4c59da8"
             ]
         ]
     },
     {
-        "id": "f459c148.932bf8",
+        "id": "108df7f5.f0405",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2885,
-        "y": 591,
-        "z": "f351885d.7dcd3",
+        "x": 2873,
+        "y": 579,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "1c6e3351.8ccb0d"
+                "19520422.b45d4c"
             ]
         ]
     },
     {
-        "id": "28f88824.b7c4b8",
+        "id": "19de242e.79b56c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2716,
-        "y": 592,
-        "z": "f351885d.7dcd3",
+        "x": 2704,
+        "y": 580,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "f459c148.932bf8"
+                "108df7f5.f0405"
             ]
         ]
     },
     {
-        "id": "d6ad8583.7ca128",
+        "id": "e1533c2.9fadc4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2718.490966796875,
-        "y": 487.57403564453125,
-        "z": "f351885d.7dcd3",
+        "x": 2706.490966796875,
+        "y": 475.57403564453125,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "ef5820a6.09d9d"
+                "efbdd7a3.5958d8"
             ]
         ]
     },
     {
-        "id": "c9e967f5.e899f8",
+        "id": "da41548.4c59da8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2714,
-        "y": 532,
-        "z": "f351885d.7dcd3",
+        "x": 2702,
+        "y": 520,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "bd9d5fad.2d262"
+                "e03f3a11.4be118"
             ]
         ]
     },
     {
-        "id": "bd9d5fad.2d262",
+        "id": "e03f3a11.4be118",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2882,
-        "y": 532,
-        "z": "f351885d.7dcd3",
+        "x": 2870,
+        "y": 520,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "ef5820a6.09d9d",
+        "id": "efbdd7a3.5958d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2881.0625,
-        "y": 486.8597412109375,
-        "z": "f351885d.7dcd3",
+        "x": 2869.0625,
+        "y": 474.8597412109375,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "207f18a3.1780c8",
+        "id": "8651df9.9efa52",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2233,
-        "y": 409,
-        "z": "f351885d.7dcd3",
+        "x": 2221,
+        "y": 397,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "208bed02.1187fa"
+                "6856373e.df8d5"
             ]
         ]
     },
     {
-        "id": "208bed02.1187fa",
+        "id": "6856373e.df8d5",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2438,
-        "y": 409,
-        "z": "f351885d.7dcd3",
+        "x": 2426,
+        "y": 397,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "f005e0a8.cc7dc8"
+                "61b4f44b.e9282c"
             ]
         ]
     },
     {
-        "id": "f005e0a8.cc7dc8",
+        "id": "61b4f44b.e9282c",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2604,
-        "y": 409,
-        "z": "f351885d.7dcd3",
+        "x": 2592,
+        "y": 397,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "51d187ad.ad3078"
+                "9aa1bdef.a85148"
             ]
         ]
     },
     {
-        "id": "51d187ad.ad3078",
+        "id": "9aa1bdef.a85148",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2767,
-        "y": 409,
-        "z": "f351885d.7dcd3",
+        "x": 2755,
+        "y": 397,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "da2f8124.076ab8",
-                "1e447cc1.915cb3"
+                "e921a3d6.75f8b8",
+                "8b7a547c.5a78f8"
             ]
         ]
     },
     {
-        "id": "aecb0c53.70b3e8",
+        "id": "61cd75bc.541bfc",
         "type": "switchNode",
         "name": "switch vpn-binding has dst-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3326,
-        "y": 692,
-        "z": "f351885d.7dcd3",
+        "x": 3314,
+        "y": 680,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "45f40514.0a111c",
-                "e5457af4.842818"
+                "ce7e100e.65e8d8",
+                "978d0324.53a218"
             ]
         ]
     },
     {
-        "id": "45f40514.0a111c",
+        "id": "ce7e100e.65e8d8",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3540,
-        "y": 729,
-        "z": "f351885d.7dcd3",
+        "x": 3528,
+        "y": 717,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "4c5d5e83.4b55d8"
+                "d3a9cf8b.6d8898"
             ]
         ]
     },
     {
-        "id": "e5457af4.842818",
+        "id": "978d0324.53a218",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3542,
-        "y": 667,
-        "z": "f351885d.7dcd3",
+        "x": 3530,
+        "y": 655,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "d204a9f5.cb1f"
+                "eacef09.695731"
             ]
         ]
     },
     {
-        "id": "4c5d5e83.4b55d8",
+        "id": "d3a9cf8b.6d8898",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3120,
-        "y": 1972,
-        "z": "f351885d.7dcd3",
+        "x": 3108,
+        "y": 1960,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "e25a0aae.dc3b6",
-                "5811aab2.c9cdb4"
+                "a298a9c0.8f44e8",
+                "ca55eca6.1cb808"
             ]
         ]
     },
     {
-        "id": "e25a0aae.dc3b6",
+        "id": "a298a9c0.8f44e8",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3373,
-        "y": 2006,
-        "z": "f351885d.7dcd3",
+        "x": 3361,
+        "y": 1994,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "e2283676.c05cf8"
+                "c785caf0.121d"
             ]
         ]
     },
     {
-        "id": "5811aab2.c9cdb4",
+        "id": "ca55eca6.1cb808",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3373,
-        "y": 1950,
-        "z": "f351885d.7dcd3",
+        "x": 3361,
+        "y": 1938,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "5f1f11a6.4b622"
+                "6d0b6c95.2359f4"
             ]
         ]
     },
     {
-        "id": "e2283676.c05cf8",
+        "id": "c785caf0.121d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3524,
-        "y": 2006,
-        "z": "f351885d.7dcd3",
+        "x": 3512,
+        "y": 1994,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "ef6002a3.a9265",
+        "id": "2abfc3f7.2295e4",
         "type": "set",
         "name": "set vpn-bindingA and connectivityA",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4400,
-        "y": 104,
-        "z": "f351885d.7dcd3",
+        "x": 4388,
+        "y": 92,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "d11d0786.01d8c8",
+        "id": "ebb770b7.bb1a4",
         "type": "set",
         "name": "set vpn-bindingB and connectivityB",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",
         "comments": "",
-        "x": 3808,
-        "y": 1563,
-        "z": "f351885d.7dcd3",
+        "x": 3796,
+        "y": 1551,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "4923e79.d3d2a98",
+        "id": "bcb6d938.081b58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4091,
-        "y": 361,
-        "z": "f351885d.7dcd3",
+        "x": 4079,
+        "y": 349,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "ef6002a3.a9265",
-                "73d91f0d.979448",
-                "cdb19fe7.3fcc18",
-                "83225463.070fc",
-                "b72def38.869578",
-                "61d206ce.c84cc",
-                "53d5aef.e4ebbd"
+                "2abfc3f7.2295e4",
+                "72376cd1.cdcaec",
+                "9b9c3cba.716c78",
+                "5f8cf8c6.3002c8",
+                "de94f6d4.eda0e",
+                "342bfbf3.ee642c",
+                "2a89aa53.8890b6"
             ]
         ]
     },
     {
-        "id": "5f1f11a6.4b622",
+        "id": "6d0b6c95.2359f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3524,
-        "y": 1949,
-        "z": "f351885d.7dcd3",
+        "x": 3512,
+        "y": 1937,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "d11d0786.01d8c8",
-                "fec1365a.907b4",
-                "a7e92939.08a52",
-                "25024bed.781cdc",
-                "eb21cc8f.003df8",
-                "1be8ac25.0620fc",
-                "6fb79d87.420834"
+                "ebb770b7.bb1a4",
+                "48e88b1.fd2c9f4",
+                "402d5da7.084ecc",
+                "600572d7.37f4f4",
+                "46863424.f49acc",
+                "4aa8bc15.43053c",
+                "295ad948.4ab50e"
             ]
         ]
     },
     {
-        "id": "1be8ac25.0620fc",
+        "id": "4aa8bc15.43053c",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
         "comments": "",
-        "x": 3753,
-        "y": 2092,
-        "z": "f351885d.7dcd3",
+        "x": 3741,
+        "y": 2080,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "6fb79d87.420834",
+        "id": "295ad948.4ab50e",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3907,
-        "y": 2140,
-        "z": "f351885d.7dcd3",
+        "x": 3895,
+        "y": 2128,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "6175c964.8889d",
-                "add709ae.0740f"
+                "ec9bb97a.fa7b4",
+                "d7a86063.21272"
             ]
         ]
     },
     {
-        "id": "6175c964.8889d",
+        "id": "ec9bb97a.fa7b4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4252.5,
-        "y": 2121,
-        "z": "f351885d.7dcd3",
+        "x": 4240.5,
+        "y": 2109,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "7caa2ba7.6bf4dc"
+                "23e4ab97.fe6f5c"
             ]
         ]
     },
     {
-        "id": "add709ae.0740f",
+        "id": "d7a86063.21272",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4256.5,
-        "y": 2161,
-        "z": "f351885d.7dcd3",
+        "x": 4244.5,
+        "y": 2149,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "43eb2ee.41b33d"
+                "3d3a171d.cfa4"
             ]
         ]
     },
     {
-        "id": "7caa2ba7.6bf4dc",
+        "id": "23e4ab97.fe6f5c",
         "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 Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4410.5,
-        "y": 2121,
-        "z": "f351885d.7dcd3",
+        "x": 4398.5,
+        "y": 2109,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "43eb2ee.41b33d",
+        "id": "3d3a171d.cfa4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4414,
-        "y": 2161,
-        "z": "f351885d.7dcd3",
+        "x": 4402,
+        "y": 2149,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "30f33337.055d14",
-                "948532eb.e6c7c"
+                "5d084d8a.b2f23c",
+                "44dbf2a2.960644"
             ]
         ]
     },
     {
-        "id": "bc6f9b2b.7321f",
+        "id": "ce171a50.073f6",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 3750.5,
-        "y": 2048,
-        "z": "f351885d.7dcd3",
+        "x": 3738.5,
+        "y": 2036,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "30f33337.055d14",
+        "id": "5d084d8a.b2f23c",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4754,
-        "y": 2160,
-        "z": "f351885d.7dcd3",
+        "x": 4742,
+        "y": 2148,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]
     },
     {
-        "id": "227afae6.b4c94e",
+        "id": "e7b454fe.3b5cb",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 4612,
-        "y": 2118,
-        "z": "f351885d.7dcd3",
+        "x": 4600,
+        "y": 2106,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "948532eb.e6c7c",
+        "id": "44dbf2a2.960644",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4683,
-        "y": 2209,
-        "z": "f351885d.7dcd3",
+        "x": 4671,
+        "y": 2197,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]
     },
     {
-        "id": "55624da8.df976c",
+        "id": "dcf1d309.aad128",
         "type": "set",
         "name": "set attachment_param (gfp-n) for OTN",
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
         "comments": "",
-        "x": 3317,
-        "y": 632,
-        "z": "f351885d.7dcd3",
+        "x": 3305,
+        "y": 620,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "1e447cc1.915cb3",
+        "id": "8b7a547c.5a78f8",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 2951,
-        "y": 280,
-        "z": "f351885d.7dcd3",
+        "x": 2939,
+        "y": 268,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "f396e52b.35559",
+        "id": "29539dcf.178a92",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3912,
-        "y": 318,
-        "z": "f351885d.7dcd3",
+        "x": 3900,
+        "y": 306,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "72b06eec.578eb8",
+        "id": "5f3074d9.b389cc",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3469,
-        "y": 1896,
-        "z": "f351885d.7dcd3",
+        "x": 3457,
+        "y": 1884,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "d204a9f5.cb1f",
+        "id": "eacef09.695731",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3648,
-        "y": 480,
-        "z": "f351885d.7dcd3",
+        "x": 3636,
+        "y": 468,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "7da55af.10937a4",
-                "d30ba4e8.997a68"
+                "f62c1164.a0b8",
+                "81b54f08.97d86"
             ]
         ]
     },
     {
-        "id": "d30ba4e8.997a68",
+        "id": "81b54f08.97d86",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3890,
-        "y": 1069,
-        "z": "f351885d.7dcd3",
+        "x": 3878,
+        "y": 1057,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "b0909b7a.d37638"
+                "efc62266.57c198"
             ]
         ]
     },
     {
-        "id": "7da55af.10937a4",
+        "id": "f62c1164.a0b8",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3884,
-        "y": 360,
-        "z": "f351885d.7dcd3",
+        "x": 3872,
+        "y": 348,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "4923e79.d3d2a98"
+                "bcb6d938.081b58"
             ]
         ]
     },
     {
-        "id": "b0909b7a.d37638",
+        "id": "efc62266.57c198",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4048,
-        "y": 1068,
-        "z": "f351885d.7dcd3",
+        "x": 4036,
+        "y": 1056,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "aadf2b5c.a1838",
-                "8fb5b52a.4e2ae",
-                "a006da1c.c23038",
-                "7e67d000.77abb",
-                "23d1e7d8.976258"
+                "cb6a953c.fa71e8",
+                "263d4572.ce34fa",
+                "2e78dd82.d5612a",
+                "c61e9a44.c762a8",
+                "8ae64ab7.a00a7"
             ]
         ]
     },
     {
-        "id": "8fb5b52a.4e2ae",
+        "id": "263d4572.ce34fa",
         "type": "set",
         "name": "set attachment_param for OTN G",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",
         "comments": "",
-        "x": 4312,
-        "y": 951,
-        "z": "f351885d.7dcd3",
+        "x": 4300,
+        "y": 939,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "23d1e7d8.976258",
+        "id": "8ae64ab7.a00a7",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\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": 4393,
-        "y": 1266,
-        "z": "f351885d.7dcd3",
+        "x": 4381,
+        "y": 1254,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "c8d598bd.cbc8e",
-                "c93ae11e.1c54c8"
+                "bd008f9d.f02308",
+                "91d1e4e0.3cbb38"
             ]
         ]
     },
     {
-        "id": "c8d598bd.cbc8e",
+        "id": "bd008f9d.f02308",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4702.5,
-        "y": 1235,
-        "z": "f351885d.7dcd3",
+        "x": 4690.5,
+        "y": 1223,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "a086276f.4222f8"
+                "270fab9f.26c71c"
             ]
         ]
     },
     {
-        "id": "c93ae11e.1c54c8",
+        "id": "91d1e4e0.3cbb38",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4707.5,
-        "y": 1300,
-        "z": "f351885d.7dcd3",
+        "x": 4695.5,
+        "y": 1288,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "51323b7.caecec4"
+                "49e9447.128b63c"
             ]
         ]
     },
     {
-        "id": "a086276f.4222f8",
+        "id": "270fab9f.26c71c",
         "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 Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4878.5,
-        "y": 1235,
-        "z": "f351885d.7dcd3",
+        "x": 4866.5,
+        "y": 1223,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "51323b7.caecec4",
+        "id": "49e9447.128b63c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4874,
-        "y": 1300,
-        "z": "f351885d.7dcd3",
+        "x": 4862,
+        "y": 1288,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]
     },
     {
-        "id": "a006da1c.c23038",
+        "id": "2e78dd82.d5612a",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4250,
-        "y": 999,
-        "z": "f351885d.7dcd3",
+        "x": 4238,
+        "y": 987,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "7e67d000.77abb",
+        "id": "c61e9a44.c762a8",
         "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.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4276,
-        "y": 1116,
-        "z": "f351885d.7dcd3",
+        "x": 4264,
+        "y": 1104,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "ec2bb2c1.50dad",
-                "6fe2c398.ccd7b4",
-                "2cf209f9.a94e2e"
+                "58640478.1eeefc",
+                "b15b9e00.631398",
+                "c5141964.109468"
             ]
         ]
     },
     {
-        "id": "ec2bb2c1.50dad",
+        "id": "58640478.1eeefc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4471.5001220703125,
-        "y": 1068,
-        "z": "f351885d.7dcd3",
+        "x": 4459.5001220703125,
+        "y": 1056,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "e5c84b9e.98975"
+                "9ec63af5.4a1a88"
             ]
         ]
     },
     {
-        "id": "6fe2c398.ccd7b4",
+        "id": "b15b9e00.631398",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4463.5001220703125,
-        "y": 1123,
-        "z": "f351885d.7dcd3",
+        "x": 4451.5001220703125,
+        "y": 1111,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "be59a3.0881066"
+                "a4b9d6d5.39a2c8"
             ]
         ]
     },
     {
-        "id": "e5c84b9e.98975",
+        "id": "9ec63af5.4a1a88",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4615.8824462890625,
-        "y": 1067.6556701660156,
-        "z": "f351885d.7dcd3",
+        "x": 4603.8824462890625,
+        "y": 1055.6556701660156,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "40635ccb.0881a4"
+                "f086ebfd.c8405"
             ]
         ]
     },
     {
-        "id": "40635ccb.0881a4",
+        "id": "f086ebfd.c8405",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4800,
-        "y": 1066,
-        "z": "f351885d.7dcd3",
+        "x": 4788,
+        "y": 1054,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "ff02a9b.ff8ffd8"
+                "b709cf8e.43e148"
             ]
         ]
     },
     {
-        "id": "ff02a9b.ff8ffd8",
+        "id": "b709cf8e.43e148",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4995,
-        "y": 1066,
-        "z": "f351885d.7dcd3",
+        "x": 4983,
+        "y": 1054,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "d3d180f4.36fa68"
+                "ad439d36.0ced9"
             ]
         ]
     },
     {
-        "id": "2cf209f9.a94e2e",
+        "id": "c5141964.109468",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4468.5001220703125,
-        "y": 1180,
-        "z": "f351885d.7dcd3",
+        "x": 4456.5001220703125,
+        "y": 1168,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "2b5a1252.216fe6"
+                "56d134ff.8e34ec"
             ]
         ]
     },
     {
-        "id": "2b5a1252.216fe6",
+        "id": "56d134ff.8e34ec",
         "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": 4620.5001220703125,
-        "y": 1181,
-        "z": "f351885d.7dcd3",
+        "x": 4608.5001220703125,
+        "y": 1169,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "be59a3.0881066",
+        "id": "a4b9d6d5.39a2c8",
         "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": 4631.5001220703125,
-        "y": 1124,
-        "z": "f351885d.7dcd3",
+        "x": 4619.5001220703125,
+        "y": 1112,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "aadf2b5c.a1838",
+        "id": "cb6a953c.fa71e8",
         "type": "set",
         "name": "set vpn-bindingG and connectivityG",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4307,
-        "y": 891,
-        "z": "f351885d.7dcd3",
+        "x": 4295,
+        "y": 879,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "d3d180f4.36fa68",
+        "id": "ad439d36.0ced9",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5198,
-        "y": 1070,
-        "z": "f351885d.7dcd3",
+        "x": 5186,
+        "y": 1058,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "8355bb98.2142e8"
+                "cb537ad7.8928d8"
             ]
         ]
     },
     {
-        "id": "d998285a.8338c",
+        "id": "e839cea.58e4f3",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5583,
-        "y": 1083,
-        "z": "f351885d.7dcd3",
+        "x": 5571,
+        "y": 1071,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "38daac86.dbf464",
-                "21dc6947.7d9bae",
-                "a47aca30.5160e"
+                "9673ee8e.826088",
+                "87202e49.7cf198",
+                "ad5371c2.88c47"
             ]
         ]
     },
     {
-        "id": "8355bb98.2142e8",
+        "id": "cb537ad7.8928d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5377,
-        "y": 1070,
-        "z": "f351885d.7dcd3",
+        "x": 5365,
+        "y": 1058,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "583e9682.750428",
-                "d998285a.8338c"
+                "2fa33243.987c8e",
+                "e839cea.58e4f3"
             ]
         ]
     },
     {
-        "id": "583e9682.750428",
+        "id": "2fa33243.987c8e",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5613,
-        "y": 1031,
-        "z": "f351885d.7dcd3",
+        "x": 5601,
+        "y": 1019,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "38daac86.dbf464",
+        "id": "9673ee8e.826088",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5793,
-        "y": 1074,
-        "z": "f351885d.7dcd3",
+        "x": 5781,
+        "y": 1062,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "10b34ad5.e58d9d"
+                "3788c181.11c43e"
             ]
         ]
     },
     {
-        "id": "21dc6947.7d9bae",
+        "id": "87202e49.7cf198",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5785,
-        "y": 1129,
-        "z": "f351885d.7dcd3",
+        "x": 5773,
+        "y": 1117,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "6ce9bc65.05009c"
+                "3691dbb8.1b2bf4"
             ]
         ]
     },
     {
-        "id": "a47aca30.5160e",
+        "id": "ad5371c2.88c47",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5790,
-        "y": 1186,
-        "z": "f351885d.7dcd3",
+        "x": 5778,
+        "y": 1174,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "18239e9b.852729"
+                "c7f3058f.182658"
             ]
         ]
     },
     {
-        "id": "18239e9b.852729",
+        "id": "c7f3058f.182658",
         "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": 5942,
-        "y": 1187,
-        "z": "f351885d.7dcd3",
+        "x": 5930,
+        "y": 1175,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "6ce9bc65.05009c",
+        "id": "3691dbb8.1b2bf4",
         "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": 5953,
-        "y": 1132,
-        "z": "f351885d.7dcd3",
+        "x": 5941,
+        "y": 1120,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "10b34ad5.e58d9d",
+        "id": "3788c181.11c43e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5937.38232421875,
-        "y": 1071.6556701660156,
-        "z": "f351885d.7dcd3",
+        "x": 5925.38232421875,
+        "y": 1059.6556701660156,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "d4058b68.bd8818"
+                "a3c8eb2b.95af8"
             ]
         ]
     },
     {
-        "id": "d4058b68.bd8818",
+        "id": "a3c8eb2b.95af8",
         "type": "set",
         "name": "set controller domainG data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 6152,
-        "y": 1068,
-        "z": "f351885d.7dcd3",
+        "x": 6140,
+        "y": 1056,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "3a09f359.556f04",
+        "id": "2ac9f039.bfa9a8",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3926,
-        "y": 1009,
-        "z": "f351885d.7dcd3",
+        "x": 3914,
+        "y": 997,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "1c6e3351.8ccb0d",
+        "id": "19520422.b45d4c",
         "type": "switchNode",
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2488,
-        "y": 736,
-        "z": "f351885d.7dcd3",
+        "x": 2476,
+        "y": 724,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "91c41639.2357b",
-                "5aa31f25.4b2718"
+                "fc6dfa43.dee44",
+                "90381d7.56caa6"
             ]
         ]
     },
     {
-        "id": "5aa31f25.4b2718",
+        "id": "90381d7.56caa6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2895,
-        "y": 754,
-        "z": "f351885d.7dcd3",
+        "x": 2883,
+        "y": 742,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "49ef7599.6e682c"
+                "d486bdc8.981f98"
             ]
         ]
     },
     {
-        "id": "91c41639.2357b",
+        "id": "fc6dfa43.dee44",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2895,
-        "y": 699,
-        "z": "f351885d.7dcd3",
+        "x": 2883,
+        "y": 687,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "c7ffb45b.775578"
+                "7563c99.56d39b8"
             ]
         ]
     },
     {
-        "id": "c7ffb45b.775578",
+        "id": "7563c99.56d39b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3051,
-        "y": 697,
-        "z": "f351885d.7dcd3",
+        "x": 3039,
+        "y": 685,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "55624da8.df976c",
-                "aecb0c53.70b3e8"
+                "dcf1d309.aad128",
+                "61cd75bc.541bfc"
             ]
         ]
     },
     {
-        "id": "49ef7599.6e682c",
+        "id": "d486bdc8.981f98",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3028,
-        "y": 755,
-        "z": "f351885d.7dcd3",
+        "x": 3016,
+        "y": 743,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
index 6585de84..47e80d28 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "df3491bc.625428",
+        "id": "b3b9455c.251fb8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 128,
-        "y": 113,
-        "z": "b31344e1.6b9228",
+        "x": 107,
+        "y": 110,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f93a4fe6.087538"
+                "5661f4c7.6e8104"
             ]
         ]
     },
     {
-        "id": "f93a4fe6.087538",
+        "id": "5661f4c7.6e8104",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,4818 +22,4939 @@
         "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": 412.2856903076172,
-        "y": 174.23810863494873,
-        "z": "b31344e1.6b9228",
+        "x": 391.2856903076172,
+        "y": 171.23810863494873,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3a78d95d.5e3c5e"
+                "47f23ec8.713ca"
             ]
         ]
     },
     {
-        "id": "3a78d95d.5e3c5e",
+        "id": "47f23ec8.713ca",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-allocate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-allocate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 418.42860412597656,
-        "y": 259.0000305175781,
-        "z": "b31344e1.6b9228",
+        "x": 397.42860412597656,
+        "y": 256.0000305175781,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "35ecb5b7.3f1b02"
+                "909d5d01.2efc9"
             ]
         ]
     },
     {
-        "id": "35ecb5b7.3f1b02",
+        "id": "909d5d01.2efc9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 788.238037109375,
-        "y": 283.66668701171875,
-        "z": "b31344e1.6b9228",
+        "x": 767.238037109375,
+        "y": 280.66668701171875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a99ea7b2.f5e618",
-                "183025fe.418fa2",
-                "d352d101.d008a8"
+                "c5df95a2.6c697",
+                "a851f151.681188",
+                "4430b278.87d9ac"
             ]
         ]
     },
     {
-        "id": "a99ea7b2.f5e618",
+        "id": "c5df95a2.6c697",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 1089.571533203125,
-        "y": 554.5969848632812,
-        "z": "b31344e1.6b9228",
+        "x": 1068.571533203125,
+        "y": 551.5969848632812,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "183025fe.418fa2",
+        "id": "a851f151.681188",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
         "comments": "",
         "outputs": 1,
-        "x": 1111,
-        "y": 257,
-        "z": "b31344e1.6b9228",
+        "x": 1090,
+        "y": 254,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "47f816cc.c0286",
-                "318d2442.efdd34",
-                "4265fd48.9eb024"
+                "bee2d1fb.fc819",
+                "706fc8bb.926d88",
+                "b5dbfca1.6b8958"
             ]
         ]
     },
     {
-        "id": "47f816cc.c0286",
+        "id": "bee2d1fb.fc819",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1336,
-        "y": 115,
-        "z": "b31344e1.6b9228",
+        "x": 1315,
+        "y": 112,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "6fd78e9c.961b2"
+                "e14cb882.1a5158"
             ]
         ]
     },
     {
-        "id": "318d2442.efdd34",
+        "id": "706fc8bb.926d88",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1331.490966796875,
-        "y": 184.57403564453125,
-        "z": "b31344e1.6b9228",
+        "x": 1310.490966796875,
+        "y": 181.57403564453125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "aa8b68cf.4936c"
+                "5cbb540f.81c364"
             ]
         ]
     },
     {
-        "id": "4265fd48.9eb024",
+        "id": "b5dbfca1.6b8958",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1320,
-        "y": 231,
-        "z": "b31344e1.6b9228",
+        "x": 1299,
+        "y": 228,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "ea9381a6.8a9938"
+                "bd99daf8.5c5508"
             ]
         ]
     },
     {
-        "id": "6fd78e9c.961b2",
+        "id": "e14cb882.1a5158",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1575,
-        "y": 112,
-        "z": "b31344e1.6b9228",
+        "x": 1554,
+        "y": 109,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a9515923.c68db8",
-                "3b6a0136.f8dee6"
+                "6386b942.401658",
+                "736cbc7f.84dcc4"
             ]
         ]
     },
     {
-        "id": "aa8b68cf.4936c",
+        "id": "5cbb540f.81c364",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1485.0623779296875,
-        "y": 187.85977172851562,
-        "z": "b31344e1.6b9228",
+        "x": 1464.0623779296875,
+        "y": 184.85977172851562,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "ea9381a6.8a9938",
+        "id": "bd99daf8.5c5508",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1489,
-        "y": 232,
-        "z": "b31344e1.6b9228",
+        "x": 1468,
+        "y": 229,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "a9515923.c68db8",
+        "id": "6386b942.401658",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1788,
-        "y": 136,
-        "z": "b31344e1.6b9228",
+        "x": 1767,
+        "y": 133,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8d77a4c9.47348"
+                "bdbad755.d12dc8"
             ]
         ]
     },
     {
-        "id": "3b6a0136.f8dee6",
+        "id": "736cbc7f.84dcc4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1790,
-        "y": 76,
-        "z": "b31344e1.6b9228",
+        "x": 1769,
+        "y": 73,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b9472b2.e91dbe",
+        "id": "73516434.8b694c",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1090,
-        "y": 145,
-        "z": "b31344e1.6b9228",
+        "x": 1069,
+        "y": 142,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "8d77a4c9.47348",
+        "id": "bdbad755.d12dc8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1773,
-        "y": 224,
-        "z": "b31344e1.6b9228",
+        "x": 1752,
+        "y": 221,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2dfd81e1.a251ae",
-                "d0adb7e4.435f98",
-                "bf30e0be.23b998",
-                "bc1d9c19.8a817"
+                "3b75dc28.79bec4",
+                "5d2f9da2.d38694",
+                "48979781.1681f8",
+                "93c183ce.0a9ed8",
+                "5d8a5506.b8ac8c",
+                "a26db7da.175a4"
             ]
         ]
     },
     {
-        "id": "4b515bec.7b07fc",
+        "id": "31cf85b5.906fca",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />\n<!--<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-id`\" />-->\n\n\n",
         "comments": "",
-        "x": 2636,
-        "y": 824,
-        "z": "b31344e1.6b9228",
+        "x": 2615,
+        "y": 821,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "1fb3da4d.f9823e",
+        "id": "db907b5a.2ae538",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='network-route-B' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
         "comments": "",
-        "x": 2637,
-        "y": 879,
-        "z": "b31344e1.6b9228",
+        "x": 2616,
+        "y": 876,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "1fed210d.6adb97",
+        "id": "fea2a65.c94cf58",
         "type": "save",
         "name": "get allotted-resource from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2259,
-        "y": 275,
-        "z": "b31344e1.6b9228",
+        "x": 2238,
+        "y": 272,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "1d390c60.f37264",
-                "828d1344.2eeb18",
-                "35c0fff4.63034"
+                "87df4589.584858",
+                "635af784.3cb32",
+                "22a4a39b.dd73ec"
             ]
         ]
     },
     {
-        "id": "1d390c60.f37264",
+        "id": "87df4589.584858",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2475,
-        "y": 342,
-        "z": "b31344e1.6b9228",
+        "x": 2454,
+        "y": 339,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "1dfc0585.305702"
+                "8e0be879.699538"
             ]
         ]
     },
     {
-        "id": "828d1344.2eeb18",
+        "id": "635af784.3cb32",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2475.490966796875,
-        "y": 241.573974609375,
-        "z": "b31344e1.6b9228",
+        "x": 2454.490966796875,
+        "y": 238.573974609375,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "899f4256.fc61"
+                "84ac682e.b78a08"
             ]
         ]
     },
     {
-        "id": "35c0fff4.63034",
+        "id": "22a4a39b.dd73ec",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2471,
-        "y": 291,
-        "z": "b31344e1.6b9228",
+        "x": 2450,
+        "y": 288,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "5b10d117.cfe6d8"
+                "b2061dbc.0548c8"
             ]
         ]
     },
     {
-        "id": "899f4256.fc61",
+        "id": "84ac682e.b78a08",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2653.0625,
-        "y": 241.8597412109375,
-        "z": "b31344e1.6b9228",
+        "x": 2632.0625,
+        "y": 238.8597412109375,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "5b10d117.cfe6d8",
+        "id": "b2061dbc.0548c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2653,
-        "y": 291,
-        "z": "b31344e1.6b9228",
+        "x": 2632,
+        "y": 288,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "e459bf6d.9da9d8",
+        "id": "358e179e.99b9f",
         "type": "save",
         "name": "get logical-link from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
         "comments": "",
         "outputs": 1,
-        "x": 1994,
-        "y": 764,
-        "z": "b31344e1.6b9228",
+        "x": 1973,
+        "y": 761,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f5d3816e.ab2828",
-                "4956f23f.0bb47c",
-                "fe0f59f6.d97868"
+                "e260aa07.d4c01",
+                "9ec9d813.5ed0f",
+                "46b462c7.130bb4"
             ]
         ]
     },
     {
-        "id": "f5d3816e.ab2828",
+        "id": "e260aa07.d4c01",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2285.490966796875,
-        "y": 742.573974609375,
-        "z": "b31344e1.6b9228",
+        "x": 2264.490966796875,
+        "y": 739.573974609375,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "9822556a.f611a"
+                "c2b6bbd8.3d5eb8"
             ]
         ]
     },
     {
-        "id": "4956f23f.0bb47c",
+        "id": "9ec9d813.5ed0f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2274,
-        "y": 787,
-        "z": "b31344e1.6b9228",
+        "x": 2253,
+        "y": 784,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "6c100a4d.9d821c"
+                "1e57c51f.2af7db"
             ]
         ]
     },
     {
-        "id": "9822556a.f611a",
+        "id": "c2b6bbd8.3d5eb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2434.0625,
-        "y": 742.8597412109375,
-        "z": "b31344e1.6b9228",
+        "x": 2413.0625,
+        "y": 739.8597412109375,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "6c100a4d.9d821c",
+        "id": "1e57c51f.2af7db",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2433,
-        "y": 787,
-        "z": "b31344e1.6b9228",
+        "x": 2412,
+        "y": 784,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "fe0f59f6.d97868",
+        "id": "46b462c7.130bb4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2281,
-        "y": 866,
-        "z": "b31344e1.6b9228",
+        "x": 2260,
+        "y": 863,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "6d1afb47.ab3814"
+                "9b6c334b.ffcfb8"
             ]
         ]
     },
     {
-        "id": "6d1afb47.ab3814",
+        "id": "9b6c334b.ffcfb8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2420,
-        "y": 866,
-        "z": "b31344e1.6b9228",
+        "x": 2399,
+        "y": 863,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4b515bec.7b07fc",
-                "1fb3da4d.f9823e",
-                "97eccb48.84f6c",
-                "c57ab47a.d333d8",
-                "10cbf4f3.49fe3b",
-                "49d3005f.62282",
-                "1f03402a.5db7",
-                "56710693.e24068",
-                "84b0870f.4db1e",
-                "3323f682.f60c3a",
-                "13ac3dbd.1f366a"
+                "31cf85b5.906fca",
+                "db907b5a.2ae538",
+                "b99c062f.cc8e2",
+                "f8919e28.817698",
+                "63c0978f.6d4218",
+                "256b3f1a.6b05f8",
+                "72dba682.c63c9",
+                "1b6d1c66.bc0bb4",
+                "d6aa9ec.33fa46",
+                "6c32ab13.072304",
+                "35f98555.2ceed2",
+                "63cf541.20dacac"
             ]
         ]
     },
     {
-        "id": "97eccb48.84f6c",
+        "id": "b99c062f.cc8e2",
         "type": "save",
         "name": "get network-route-A from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-A'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-A\">",
         "comments": "",
         "outputs": 1,
-        "x": 2649,
-        "y": 947,
-        "z": "b31344e1.6b9228",
+        "x": 2628,
+        "y": 944,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8c8a4891.ac867",
-                "8506ad3d.b7e4c",
-                "a3b6635c.c539f8"
+                "177d33ef.653acc",
+                "b808d106.b2a7e8",
+                "99bf3e88.29ecb8"
             ]
         ]
     },
     {
-        "id": "c57ab47a.d333d8",
+        "id": "f8919e28.817698",
         "type": "save",
         "name": "get network-route-B from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-B'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-B\">",
         "comments": "",
         "outputs": 1,
-        "x": 2628,
-        "y": 1548.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 2607,
+        "y": 1545.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "506562cd.b8f74c",
-                "8d73f82f.8988f8",
-                "24728d1d.df92ba"
+                "e551771e.c49a78",
+                "c096bcbd.1a977",
+                "cd719142.8f5fd8"
             ]
         ]
     },
     {
-        "id": "8c8a4891.ac867",
+        "id": "177d33ef.653acc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2850,
-        "y": 831,
-        "z": "b31344e1.6b9228",
+        "x": 2829,
+        "y": 828,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "40f9d3c1.86e1ec"
+                "60c8d868.cb0f38"
             ]
         ]
     },
     {
-        "id": "8506ad3d.b7e4c",
+        "id": "b808d106.b2a7e8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2845.509033203125,
-        "y": 880.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 2824.509033203125,
+        "y": 877.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "6f975963.47cb7"
+                "8912eaa6.91a52"
             ]
         ]
     },
     {
-        "id": "a3b6635c.c539f8",
+        "id": "99bf3e88.29ecb8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2849.509033203125,
-        "y": 931.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 2828.509033203125,
+        "y": 928.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "61bb235e.2775f4"
+                "f8cee9a2.f0a618"
             ]
         ]
     },
     {
-        "id": "40f9d3c1.86e1ec",
+        "id": "60c8d868.cb0f38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2998.571533203125,
-        "y": 830.2857666015625,
-        "z": "b31344e1.6b9228",
+        "x": 2977.571533203125,
+        "y": 827.2857666015625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "6f975963.47cb7",
+        "id": "8912eaa6.91a52",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2988.509033203125,
-        "y": 880.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 2967.509033203125,
+        "y": 877.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "506562cd.b8f74c",
+        "id": "e551771e.c49a78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2851,
-        "y": 1518.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 2830,
+        "y": 1515.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7f769faa.864248"
+                "ae022a7b.5f0fc"
             ]
         ]
     },
     {
-        "id": "8d73f82f.8988f8",
+        "id": "c096bcbd.1a977",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2846.509033203125,
-        "y": 1568.4259033203125,
-        "z": "b31344e1.6b9228",
+        "x": 2825.509033203125,
+        "y": 1565.4259033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "cc9ee8f2.77fda8"
+                "2c76b27.1b72ace"
             ]
         ]
     },
     {
-        "id": "24728d1d.df92ba",
+        "id": "cd719142.8f5fd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2850.509033203125,
-        "y": 1619.4259033203125,
-        "z": "b31344e1.6b9228",
+        "x": 2829.509033203125,
+        "y": 1616.4259033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8a29f509.d58fe8"
+                "e3f74bb4.409b5"
             ]
         ]
     },
     {
-        "id": "7f769faa.864248",
+        "id": "ae022a7b.5f0fc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2999.571533203125,
-        "y": 1518.28564453125,
-        "z": "b31344e1.6b9228",
+        "x": 2978.571533203125,
+        "y": 1515.28564453125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "cc9ee8f2.77fda8",
+        "id": "2c76b27.1b72ace",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2989.509033203125,
-        "y": 1568.4259033203125,
-        "z": "b31344e1.6b9228",
+        "x": 2968.509033203125,
+        "y": 1565.4259033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "b720785b.7c7",
+        "id": "194cc348.04e4bd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3663.66650390625,
-        "y": 975,
-        "z": "b31344e1.6b9228",
+        "x": 3642.66650390625,
+        "y": 972,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f3775fbc.163688",
-                "77e2870c.e28a38",
-                "ac8bf04e.ff247",
-                "7c2c78d5.f4945",
-                "bb95643a.1dafd8"
+                "e0f54a30.b97458",
+                "6e8fe0e8.771d7",
+                "2d7aee5e.4b3492",
+                "d2697672.e5142",
+                "c6965465.aeb14"
             ]
         ]
     },
     {
-        "id": "669f51ab.4dcf7",
+        "id": "c1db8d6e.967fa8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3491,
-        "y": 976,
-        "z": "b31344e1.6b9228",
+        "x": 3470,
+        "y": 973,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b720785b.7c7"
+                "194cc348.04e4bd"
             ]
         ]
     },
     {
-        "id": "bfa60b88.954ac8",
+        "id": "ea169f9.1e78f6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3500.490966796875,
-        "y": 1018.5740356445312,
-        "z": "b31344e1.6b9228",
+        "x": 3479.490966796875,
+        "y": 1015.5740356445312,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f78f70ff.0f2c38"
+                "9dbcf7c3.d03228"
             ]
         ]
     },
     {
-        "id": "83a912b8.5c33b",
+        "id": "b37256ee.6a59a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3489,
-        "y": 1065,
-        "z": "b31344e1.6b9228",
+        "x": 3468,
+        "y": 1062,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d7142401.9476c"
+                "78909f5b.c256b8"
             ]
         ]
     },
     {
-        "id": "f78f70ff.0f2c38",
+        "id": "9dbcf7c3.d03228",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3654.0623779296875,
-        "y": 1021.8597717285156,
-        "z": "b31344e1.6b9228",
+        "x": 3633.0623779296875,
+        "y": 1018.8597717285156,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "d7142401.9476c",
+        "id": "78909f5b.c256b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3658,
-        "y": 1066,
-        "z": "b31344e1.6b9228",
+        "x": 3637,
+        "y": 1063,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "61bb235e.2775f4",
+        "id": "f8cee9a2.f0a618",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3011,
-        "y": 933,
-        "z": "b31344e1.6b9228",
+        "x": 2990,
+        "y": 930,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4914fb6.031ad84",
-                "4835023e.e8e8cc"
+                "bd63f21f.6d97a",
+                "bcdc8dc3.72d61"
             ]
         ]
     },
     {
-        "id": "8a29f509.d58fe8",
+        "id": "e3f74bb4.409b5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3001,
-        "y": 1620.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 2980,
+        "y": 1617.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "33a198b5.ec1ae",
-                "684cf1ab.a79f48"
+                "d9529ce2.4ca64",
+                "68b3ff1a.0849f"
             ]
         ]
     },
     {
-        "id": "d9ace0a0.b4a76",
+        "id": "1bc4a1b0.e8f4e6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3631.66650390625,
-        "y": 1811,
-        "z": "b31344e1.6b9228",
+        "x": 3610.66650390625,
+        "y": 1808,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a2003991.03fd4",
-                "52dfb8b2.652278",
-                "22f952b9.882086",
-                "eb4dde28.2b2138",
-                "60f3b421.08732c"
+                "6b02eeb7.bc53e8",
+                "aa3dffa0.a80a58",
+                "ce63ac06.8bd44",
+                "c950727d.3e1368",
+                "83539382.7676b8"
             ]
         ]
     },
     {
-        "id": "cc45c64e.73066",
+        "id": "206889a2.ad62d6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3459,
-        "y": 1812,
-        "z": "b31344e1.6b9228",
+        "x": 3438,
+        "y": 1809,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d9ace0a0.b4a76"
+                "1bc4a1b0.e8f4e6"
             ]
         ]
     },
     {
-        "id": "33759aa.996c566",
+        "id": "eceddf53.8343c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3468.490966796875,
-        "y": 1854.5740356445312,
-        "z": "b31344e1.6b9228",
+        "x": 3447.490966796875,
+        "y": 1851.5740356445312,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "28b2902a.f0c46"
+                "89316d2b.d76a7"
             ]
         ]
     },
     {
-        "id": "fff61c46.59cf58",
+        "id": "9f6e2dae.f13bd8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3457,
-        "y": 1901,
-        "z": "b31344e1.6b9228",
+        "x": 3436,
+        "y": 1898,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c4e6ae73.bdead"
+                "ff7b6926.fc1f5"
             ]
         ]
     },
     {
-        "id": "28b2902a.f0c46",
+        "id": "89316d2b.d76a7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3622.0623779296875,
-        "y": 1857.8597717285156,
-        "z": "b31344e1.6b9228",
+        "x": 3601.0623779296875,
+        "y": 1854.8597717285156,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "c4e6ae73.bdead",
+        "id": "ff7b6926.fc1f5",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3626,
-        "y": 1902,
-        "z": "b31344e1.6b9228",
+        "x": 3605,
+        "y": 1899,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "f3775fbc.163688",
+        "id": "e0f54a30.b97458",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3928,
-        "y": 959,
-        "z": "b31344e1.6b9228",
+        "x": 3907,
+        "y": 956,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "17df8b10.734cad",
-                "e9e72181.7c2d78"
+                "8a48ffc4.99708",
+                "9768c48e.e91b5"
             ]
         ]
     },
     {
-        "id": "e9e72181.7c2d78",
+        "id": "9768c48e.e91b5",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4151,
-        "y": 914,
-        "z": "b31344e1.6b9228",
+        "x": 4130,
+        "y": 911,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c8b8d5f9.b22ca8"
+                "704965d2.1b9644"
             ]
         ]
     },
     {
-        "id": "17df8b10.734cad",
+        "id": "8a48ffc4.99708",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4153,
-        "y": 978,
-        "z": "b31344e1.6b9228",
+        "x": 4132,
+        "y": 975,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "59177303.95ce1c"
+                "5140e6b9.7a9158"
             ]
         ]
     },
     {
-        "id": "e95ea736.29045",
+        "id": "b8a9d793.4e0ca",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
-        "x": 4486,
-        "y": 869,
-        "z": "b31344e1.6b9228",
+        "x": 4465,
+        "y": 866,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "59177303.95ce1c",
+        "id": "5140e6b9.7a9158",
         "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": 4315,
-        "y": 974,
-        "z": "b31344e1.6b9228",
+        "x": 4294,
+        "y": 971,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "c8b8d5f9.b22ca8",
+        "id": "704965d2.1b9644",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4316,
-        "y": 911,
-        "z": "b31344e1.6b9228",
+        "x": 4295,
+        "y": 908,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f09148e0.5a878",
-                "e95ea736.29045"
+                "c30e1911.559b98",
+                "b8a9d793.4e0ca"
             ]
         ]
     },
     {
-        "id": "f09148e0.5a878",
+        "id": "c30e1911.559b98",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
         "comments": "",
-        "x": 4487,
-        "y": 977,
-        "z": "b31344e1.6b9228",
+        "x": 4466,
+        "y": 974,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "2c408fec.1a81a",
+        "id": "6b71df66.ebc0e",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4488,
-        "y": 926,
-        "z": "b31344e1.6b9228",
+        "x": 4467,
+        "y": 923,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "ac8bf04e.ff247",
+        "id": "2d7aee5e.4b3492",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3930,
-        "y": 1118,
-        "z": "b31344e1.6b9228",
+        "x": 3909,
+        "y": 1115,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "77e2870c.e28a38",
+        "id": "6e8fe0e8.771d7",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainA",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3975,
-        "y": 1028,
-        "z": "b31344e1.6b9228",
+        "x": 3954,
+        "y": 1025,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "936488c4.d6b8e",
+        "id": "703a6ba5.55da1c",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 3864,
-        "y": 1069,
-        "z": "b31344e1.6b9228",
+        "x": 3843,
+        "y": 1066,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "a2003991.03fd4",
+        "id": "6b02eeb7.bc53e8",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3918,
-        "y": 1815.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3897,
+        "y": 1812.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f2d8cb03.1eed48",
-                "6e32cf18.31944"
+                "866b6a8.23d5e98",
+                "cb5f1ada.6b67f"
             ]
         ]
     },
     {
-        "id": "6e32cf18.31944",
+        "id": "cb5f1ada.6b67f",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4141,
-        "y": 1770.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4120,
+        "y": 1767.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "201ffc86.8db20c"
+                "e1a14a86.388a08"
             ]
         ]
     },
     {
-        "id": "f2d8cb03.1eed48",
+        "id": "866b6a8.23d5e98",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4143,
-        "y": 1834.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4122,
+        "y": 1831.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b29b2d4c.c3046"
+                "e3367ed2.f52b78"
             ]
         ]
     },
     {
-        "id": "2386e717.060b18",
+        "id": "c05c0482.6a0aa8",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 4476,
-        "y": 1728.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4455,
+        "y": 1725.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "b29b2d4c.c3046",
+        "id": "e3367ed2.f52b78",
         "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": 4302,
-        "y": 1853.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4281,
+        "y": 1850.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "201ffc86.8db20c",
+        "id": "e1a14a86.388a08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4306,
-        "y": 1767.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4285,
+        "y": 1764.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2386e717.060b18",
-                "c71df80d.cfbb08"
+                "c05c0482.6a0aa8",
+                "6625860d.59cf58"
             ]
         ]
     },
     {
-        "id": "c71df80d.cfbb08",
+        "id": "6625860d.59cf58",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
         "comments": "",
-        "x": 4477,
-        "y": 1833.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4456,
+        "y": 1830.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "e385afea.eec45",
+        "id": "3d78f64a.35443a",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4472,
-        "y": 1782.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4451,
+        "y": 1779.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "22f952b9.882086",
+        "id": "ce63ac06.8bd44",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3920,
-        "y": 1974.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3899,
+        "y": 1971.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "52dfb8b2.652278",
+        "id": "aa3dffa0.a80a58",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3965,
-        "y": 1884.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3944,
+        "y": 1881.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "4961c905.9d4bb",
+        "id": "de57e045.5d324",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 3854,
-        "y": 1922.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3833,
+        "y": 1919.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "10cbf4f3.49fe3b",
+        "id": "63c0978f.6d4218",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2846,
-        "y": 2389,
-        "z": "b31344e1.6b9228",
+        "x": 2825,
+        "y": 2386,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "49d3005f.62282",
+        "id": "256b3f1a.6b05f8",
         "type": "set",
         "name": "set attachment_param",
         "xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n\n<!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->\n",
         "comments": "",
-        "x": 2644,
-        "y": 2268,
-        "z": "b31344e1.6b9228",
+        "x": 2623,
+        "y": 2265,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "9f05df83.0d8378",
+        "id": "8870d8f4.24b26",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "put proper values for src topology-id, node-id, ltp-id, etc (in domain A)\nand dst topology-id, node-id, ltp-id, etc (in domain B)",
         "comments": "",
-        "x": 2610,
-        "y": 2202,
-        "z": "b31344e1.6b9228",
+        "x": 2589,
+        "y": 2199,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "7c2c78d5.f4945",
+        "id": "d2697672.e5142",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 4058,
-        "y": 1166,
-        "z": "b31344e1.6b9228",
+        "x": 4037,
+        "y": 1163,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "eb4dde28.2b2138",
+        "id": "c950727d.3e1368",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 4047,
-        "y": 2039.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4026,
+        "y": 2036.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d08c6.2cc1e73a",
+        "id": "2cb22463.a9a10c",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5102,
-        "y": 686,
-        "z": "b31344e1.6b9228",
+        "x": 5081,
+        "y": 683,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "fe7f5526.b757d",
-                "ace94fc7.113e6",
-                "42739782.dc6168"
+                "4afa0297.0e92ec",
+                "f0a2c2cf.76f7c",
+                "78f72703.090dd8"
             ]
         ]
     },
     {
-        "id": "1dfc0585.305702",
+        "id": "8e0be879.699538",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2655,
-        "y": 342,
-        "z": "b31344e1.6b9228",
+        "x": 2634,
+        "y": 339,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8622621b.5191"
+                "c6b29f32.96c43"
             ]
         ]
     },
     {
-        "id": "7de95d04.4c5e84",
+        "id": "926dbaa7.515a7",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1585.0001220703125,
-        "y": 759.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 1564.0001220703125,
+        "y": 756.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "38efe599.5c2462"
+                "aa0dd611.39e8d8"
             ]
         ]
     },
     {
-        "id": "a0ff94f7.a05cd8",
+        "id": "3fd9bf5c.04e708",
         "type": "switchNode",
         "name": "switch allotted-resource.relationship-list not empty",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2323,
-        "y": 465,
-        "z": "b31344e1.6b9228",
+        "x": 2302,
+        "y": 462,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8055d128.93cf8",
-                "a4e55956.340f1"
+                "2b043a11.143596",
+                "d91f0f1e.b29778"
             ]
         ]
     },
     {
-        "id": "a4e55956.340f1",
+        "id": "d91f0f1e.b29778",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2633,
-        "y": 472,
-        "z": "b31344e1.6b9228",
+        "x": 2612,
+        "y": 469,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "8055d128.93cf8",
+        "id": "2b043a11.143596",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2632,
-        "y": 526,
-        "z": "b31344e1.6b9228",
+        "x": 2611,
+        "y": 523,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "33bd7ebe.34c502"
+                "53404fc0.a38be"
             ]
         ]
     },
     {
-        "id": "2ecd1033.1e79d8",
+        "id": "dd4dd108.7ed66",
         "type": "set",
         "name": "set the current logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 2005,
-        "y": 709,
-        "z": "b31344e1.6b9228",
+        "x": 1984,
+        "y": 706,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "38efe599.5c2462",
+        "id": "aa0dd611.39e8d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1762,
-        "y": 752,
-        "z": "b31344e1.6b9228",
+        "x": 1741,
+        "y": 749,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2ecd1033.1e79d8",
-                "e459bf6d.9da9d8"
+                "dd4dd108.7ed66",
+                "358e179e.99b9f"
             ]
         ]
     },
     {
-        "id": "f61b9c.2378ec68",
+        "id": "50481ed8.b97c38",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3191,
-        "y": 938,
-        "z": "b31344e1.6b9228",
+        "x": 3170,
+        "y": 935,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "4914fb6.031ad84",
+        "id": "bd63f21f.6d97a",
         "type": "save",
         "name": "get p-interface-src from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3234,
-        "y": 1003,
-        "z": "b31344e1.6b9228",
+        "x": 3213,
+        "y": 1000,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "669f51ab.4dcf7",
-                "bfa60b88.954ac8",
-                "83a912b8.5c33b"
+                "c1db8d6e.967fa8",
+                "ea169f9.1e78f6",
+                "b37256ee.6a59a"
             ]
         ]
     },
     {
-        "id": "33a198b5.ec1ae",
+        "id": "d9529ce2.4ca64",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3231,
-        "y": 1847,
-        "z": "b31344e1.6b9228",
+        "x": 3210,
+        "y": 1844,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "cc45c64e.73066",
-                "33759aa.996c566",
-                "fff61c46.59cf58"
+                "206889a2.ad62d6",
+                "eceddf53.8343c8",
+                "9f6e2dae.f13bd8"
             ]
         ]
     },
     {
-        "id": "13eb2671.9e12f2",
+        "id": "2cacaea3.bdcdca",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3192,
-        "y": 1791,
-        "z": "b31344e1.6b9228",
+        "x": 3171,
+        "y": 1788,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "8622621b.5191",
+        "id": "c6b29f32.96c43",
         "type": "save",
         "name": "get allotted-resource relationship from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2948,
-        "y": 289,
-        "z": "b31344e1.6b9228",
+        "x": 2927,
+        "y": 286,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "774c27b3.d5b958",
-                "314f18ee.d0e28",
-                "177a6858.e45f48"
+                "9de6915b.b19d38",
+                "e8ebc1b6.d4d34",
+                "e6a28fa6.880708"
             ]
         ]
     },
     {
-        "id": "314f18ee.d0e28",
+        "id": "e8ebc1b6.d4d34",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3221.490966796875,
-        "y": 181.573974609375,
-        "z": "b31344e1.6b9228",
+        "x": 3200.490966796875,
+        "y": 178.573974609375,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "bf0d979c.0d6a2"
+                "b49d6ada.3dcaf8"
             ]
         ]
     },
     {
-        "id": "bf0d979c.0d6a2",
+        "id": "b49d6ada.3dcaf8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3399.0625,
-        "y": 181.8597412109375,
-        "z": "b31344e1.6b9228",
+        "x": 3378.0625,
+        "y": 178.8597412109375,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "177a6858.e45f48",
+        "id": "e6a28fa6.880708",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3217,
-        "y": 231,
-        "z": "b31344e1.6b9228",
+        "x": 3196,
+        "y": 228,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "69e0c103.73f7e"
+                "d8c17b5e.5b6d48"
             ]
         ]
     },
     {
-        "id": "69e0c103.73f7e",
+        "id": "d8c17b5e.5b6d48",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3399,
-        "y": 231,
-        "z": "b31344e1.6b9228",
+        "x": 3378,
+        "y": 228,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "774c27b3.d5b958",
+        "id": "9de6915b.b19d38",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3221,
-        "y": 282,
-        "z": "b31344e1.6b9228",
+        "x": 3200,
+        "y": 279,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8d4f11e6.7da04"
+                "54518182.0b0878"
             ]
         ]
     },
     {
-        "id": "8d4f11e6.7da04",
+        "id": "54518182.0b0878",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3401,
-        "y": 282,
-        "z": "b31344e1.6b9228",
+        "x": 3380,
+        "y": 279,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a0ff94f7.a05cd8"
+                "3fd9bf5c.04e708"
             ]
         ]
     },
     {
-        "id": "fe8ff063.6863b8",
+        "id": "62e6aba8.2c101c",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2892,
-        "y": 506,
-        "z": "b31344e1.6b9228",
+        "x": 2871,
+        "y": 503,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7f3884a8.055b2c"
+                "ce3eb436.d43a6"
             ]
         ]
     },
     {
-        "id": "7f3884a8.055b2c",
+        "id": "ce3eb436.d43a6",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3172,
-        "y": 506,
-        "z": "b31344e1.6b9228",
+        "x": 3151,
+        "y": 503,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7de95d04.4c5e84"
+                "926dbaa7.515a7"
             ]
         ]
     },
     {
-        "id": "5050eb58.e00ed4",
+        "id": "7737916f.9448f",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3377,
-        "y": 480,
-        "z": "b31344e1.6b9228",
+        "x": 3356,
+        "y": 477,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "9ce29b77.ad6fe8"
+                "9c3216ab.adc2a8"
             ]
         ]
     },
     {
-        "id": "9ce29b77.ad6fe8",
+        "id": "9c3216ab.adc2a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3553.9998779296875,
-        "y": 472.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3532.9998779296875,
+        "y": 469.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e7ee0b09.87c5d8",
-                "7fe89152.e612e8"
+                "6ca4307d.28f77",
+                "15dd1089.866707"
             ]
         ]
     },
     {
-        "id": "e7ee0b09.87c5d8",
+        "id": "6ca4307d.28f77",
         "type": "set",
         "name": "set the 1st network-policy-id",
         "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 3796.9998779296875,
-        "y": 429.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3775.9998779296875,
+        "y": 426.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "7fe89152.e612e8",
+        "id": "15dd1089.866707",
         "type": "save",
         "name": "get network-policy from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
         "comments": "",
         "outputs": 1,
-        "x": 3785.9998779296875,
-        "y": 484.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3764.9998779296875,
+        "y": 481.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "64fb2208.a0a974",
-                "c3b9f4d3.aab1b8",
-                "f6aa84f.18621f8"
+                "af36166d.ada238",
+                "d07a4cd5.ac3678",
+                "65922e69.a77b18"
             ]
         ]
     },
     {
-        "id": "f6aa84f.18621f8",
+        "id": "65922e69.a77b18",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4039,
-        "y": 371,
-        "z": "b31344e1.6b9228",
+        "x": 4018,
+        "y": 368,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c20366f5.78311"
+                "1424d407.3a5b34"
             ]
         ]
     },
     {
-        "id": "c20366f5.78311",
+        "id": "1424d407.3a5b34",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4187.571533203125,
-        "y": 371.2857666015625,
-        "z": "b31344e1.6b9228",
+        "x": 4166.571533203125,
+        "y": 368.2857666015625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "a9aadb9.f22de28",
+        "id": "e640c3b9.1f16d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4186.509033203125,
-        "y": 415.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 4165.509033203125,
+        "y": 412.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "c3b9f4d3.aab1b8",
+        "id": "d07a4cd5.ac3678",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4027.509033203125,
-        "y": 415.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 4006.509033203125,
+        "y": 412.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a9aadb9.f22de28"
+                "e640c3b9.1f16d"
             ]
         ]
     },
     {
-        "id": "64fb2208.a0a974",
+        "id": "af36166d.ada238",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4034.509033203125,
-        "y": 494.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 4013.509033203125,
+        "y": 491.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7a83723d.cc96f4"
+                "3b605de0.ec3a52"
             ]
         ]
     },
     {
-        "id": "7a83723d.cc96f4",
+        "id": "3b605de0.ec3a52",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4173.509033203125,
-        "y": 494.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 4152.509033203125,
+        "y": 491.426025390625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "1f8d33e3.a771dc",
-                "420f3616.2f701"
+                "e719047d.96b1f",
+                "36ea936c.0d2d9c"
             ]
         ]
     },
     {
-        "id": "1f8d33e3.a771dc",
+        "id": "e719047d.96b1f",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4379,
-        "y": 492,
-        "z": "b31344e1.6b9228",
+        "x": 4358,
+        "y": 489,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "4835023e.e8e8cc",
+        "id": "bcdc8dc3.72d61",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3235,
-        "y": 673,
-        "z": "b31344e1.6b9228",
+        "x": 3214,
+        "y": 670,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "eafc912d.cb0fe",
-                "14b2df73.02d4e1"
+                "88359d7a.204d2",
+                "184f5811.e1748"
             ]
         ]
     },
     {
-        "id": "14b2df73.02d4e1",
+        "id": "184f5811.e1748",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3458,
-        "y": 659,
-        "z": "b31344e1.6b9228",
+        "x": 3437,
+        "y": 656,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "bb352d17.34137"
+                "65b8cca9.2ac444"
             ]
         ]
     },
     {
-        "id": "eafc912d.cb0fe",
+        "id": "88359d7a.204d2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3460,
-        "y": 692,
-        "z": "b31344e1.6b9228",
+        "x": 3439,
+        "y": 689,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4040c9e2.8e3008"
+                "776eb0a5.2fd87"
             ]
         ]
     },
     {
-        "id": "4040c9e2.8e3008",
+        "id": "776eb0a5.2fd87",
         "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": 3603,
-        "y": 689,
-        "z": "b31344e1.6b9228",
+        "x": 3582,
+        "y": 686,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "bb352d17.34137",
+        "id": "65b8cca9.2ac444",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3606,
-        "y": 652,
-        "z": "b31344e1.6b9228",
+        "x": 3585,
+        "y": 649,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8f0d5ee9.6635d",
-                "300f312a.b253d6"
+                "2397aa3a.45e876",
+                "c5b3bcfd.d10508"
             ]
         ]
     },
     {
-        "id": "8f0d5ee9.6635d",
+        "id": "2397aa3a.45e876",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3768,
-        "y": 647,
-        "z": "b31344e1.6b9228",
+        "x": 3747,
+        "y": 644,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "684cf1ab.a79f48",
+        "id": "68b3ff1a.0849f",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3249,
-        "y": 1509.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3228,
+        "y": 1506.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "10ff0da4.16d4ea",
-                "55c5195b.3875c8"
+                "6fc92ae0.49bd04",
+                "59f072e2.0b71ec"
             ]
         ]
     },
     {
-        "id": "55c5195b.3875c8",
+        "id": "59f072e2.0b71ec",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3472,
-        "y": 1495.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3451,
+        "y": 1492.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7202d26b.6dffec"
+                "a6cfeb0c.ecbd1"
             ]
         ]
     },
     {
-        "id": "10ff0da4.16d4ea",
+        "id": "6fc92ae0.49bd04",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3474,
-        "y": 1528.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3453,
+        "y": 1525.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "30474e74.e5639a"
+                "862c14a1.8553d8"
             ]
         ]
     },
     {
-        "id": "30474e74.e5639a",
+        "id": "862c14a1.8553d8",
         "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": 3617,
-        "y": 1525.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3596,
+        "y": 1522.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "7202d26b.6dffec",
+        "id": "a6cfeb0c.ecbd1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3620,
-        "y": 1488.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3599,
+        "y": 1485.9998779296875,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "885f2609.7cba58",
-                "e1d06713.adb0c8"
+                "9265a5e9.075d5",
+                "3387bb2a.b4fa7c"
             ]
         ]
     },
     {
-        "id": "885f2609.7cba58",
+        "id": "9265a5e9.075d5",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3814,
-        "y": 1492,
-        "z": "b31344e1.6b9228",
+        "x": 3793,
+        "y": 1489,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "d352d101.d008a8",
+        "id": "4430b278.87d9ac",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1078,
-        "y": 197,
-        "z": "b31344e1.6b9228",
+        "x": 1057,
+        "y": 194,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "bb95643a.1dafd8",
+        "id": "c6965465.aeb14",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3882,
-        "y": 1243,
-        "z": "b31344e1.6b9228",
+        "x": 3861,
+        "y": 1240,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "232e8f32.739b48"
+                "d7da00cb.9e6198"
             ]
         ]
     },
     {
-        "id": "232e8f32.739b48",
+        "id": "d7da00cb.9e6198",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4088,
-        "y": 1243,
-        "z": "b31344e1.6b9228",
+        "x": 4067,
+        "y": 1240,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8bbe738e.7fafb"
+                "3e41f9e9.7f65b6"
             ]
         ]
     },
     {
-        "id": "8bbe738e.7fafb",
+        "id": "3e41f9e9.7f65b6",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4303.28564453125,
-        "y": 1242.82177734375,
-        "z": "b31344e1.6b9228",
+        "x": 4282.28564453125,
+        "y": 1239.82177734375,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c3ad3464.e3237"
+                "8a860c24.fed68"
             ]
         ]
     },
     {
-        "id": "c3ad3464.e3237",
+        "id": "8a860c24.fed68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4510.1171875,
-        "y": 1243.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4489.1171875,
+        "y": 1240.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f0158859.e44c4",
-                "1be7b379.0a0a35",
-                "bee0e07a.660808"
+                "377e7af0.ac592e",
+                "9af75c5e.34aa1",
+                "ad2bdd99.5817d"
             ]
         ]
     },
     {
-        "id": "f0158859.e44c4",
+        "id": "377e7af0.ac592e",
         "type": "set",
         "name": "set source ttp-id",
         "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4725.1171875,
-        "y": 1205.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4704.1171875,
+        "y": 1202.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "1be7b379.0a0a35",
+        "id": "9af75c5e.34aa1",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4722.1171875,
-        "y": 1244.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4701.1171875,
+        "y": 1241.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "5d7ec3ca.e9fe2c"
+                "817cb438.99e4a8"
             ]
         ]
     },
     {
-        "id": "bee0e07a.660808",
+        "id": "ad2bdd99.5817d",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4677.6171875,
-        "y": 1286.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4656.6171875,
+        "y": 1283.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "5d7ec3ca.e9fe2c",
+        "id": "817cb438.99e4a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4902.6171875,
-        "y": 1243.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4881.6171875,
+        "y": 1240.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "5c631dd4.8f5fbc"
+                "4eac437.160bcbc"
             ]
         ]
     },
     {
-        "id": "5c631dd4.8f5fbc",
+        "id": "4eac437.160bcbc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5060.6171875,
-        "y": 1243.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 5039.6171875,
+        "y": 1240.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d5d5e908.7a8eb8"
+                "602a09ac.ab98b8"
             ]
         ]
     },
     {
-        "id": "d5d5e908.7a8eb8",
+        "id": "602a09ac.ab98b8",
         "type": "set",
         "name": "set source tunnel tp ip",
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5267.6171875,
-        "y": 1243.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 5246.6171875,
+        "y": 1240.34033203125,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "60f3b421.08732c",
+        "id": "83539382.7676b8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3879,
-        "y": 2112.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3858,
+        "y": 2109.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "715a89d.cfea178"
+                "5579dfc7.be27d"
             ]
         ]
     },
     {
-        "id": "715a89d.cfea178",
+        "id": "5579dfc7.be27d",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4085,
-        "y": 2112.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4064,
+        "y": 2109.0001220703125,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "977e3712.429b18"
+                "901fbdc2.3ee4d"
             ]
         ]
     },
     {
-        "id": "977e3712.429b18",
+        "id": "901fbdc2.3ee4d",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4300.28564453125,
-        "y": 2111.8218994140625,
-        "z": "b31344e1.6b9228",
+        "x": 4279.28564453125,
+        "y": 2108.8218994140625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2113d9ff.cdd31e"
+                "2e4b86b2.9caae2"
             ]
         ]
     },
     {
-        "id": "2113d9ff.cdd31e",
+        "id": "2e4b86b2.9caae2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4507.1171875,
-        "y": 2112.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4486.1171875,
+        "y": 2109.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3c92c59b.613ca2",
-                "193b4238.409d8e",
-                "b71c718.f135e1"
+                "bc60382f.b0361",
+                "b3a5cd52.d83f2",
+                "ee9aa3b3.89ca4"
             ]
         ]
     },
     {
-        "id": "3c92c59b.613ca2",
+        "id": "bc60382f.b0361",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4722.1171875,
-        "y": 2074.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4701.1171875,
+        "y": 2071.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "193b4238.409d8e",
+        "id": "b3a5cd52.d83f2",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4719.1171875,
-        "y": 2113.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4698.1171875,
+        "y": 2110.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "df85928.81de67"
+                "93e41626.124d78"
             ]
         ]
     },
     {
-        "id": "b71c718.f135e1",
+        "id": "ee9aa3b3.89ca4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4674.6171875,
-        "y": 2155.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4653.6171875,
+        "y": 2152.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "df85928.81de67",
+        "id": "93e41626.124d78",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4899.6171875,
-        "y": 2112.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4878.6171875,
+        "y": 2109.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8b1f9fde.337d98"
+                "6ea99290.2aa4d4"
             ]
         ]
     },
     {
-        "id": "8b1f9fde.337d98",
+        "id": "6ea99290.2aa4d4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5057.6171875,
-        "y": 2112.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 5036.6171875,
+        "y": 2109.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "20d9b129.b72206"
+                "a95428e7.14cad"
             ]
         ]
     },
     {
-        "id": "20d9b129.b72206",
+        "id": "a95428e7.14cad",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5264.6171875,
-        "y": 2112.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 5243.6171875,
+        "y": 2109.3404541015625,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "300f312a.b253d6",
+        "id": "c5b3bcfd.d10508",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3795,
-        "y": 719,
-        "z": "b31344e1.6b9228",
+        "x": 3774,
+        "y": 716,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "1c354309.a76ffd",
-                "950deba8.cc3e4",
-                "c2c16051.a906d8"
+                "8e60f4cf.82fba",
+                "2cad2896.c9df4",
+                "335dceb2.9bab72"
             ]
         ]
     },
     {
-        "id": "1c354309.a76ffd",
+        "id": "8e60f4cf.82fba",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3990.5001220703125,
-        "y": 671,
-        "z": "b31344e1.6b9228",
+        "x": 3969.5001220703125,
+        "y": 668,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d41af0c3.594838"
+                "7a06334d.9731e4"
             ]
         ]
     },
     {
-        "id": "950deba8.cc3e4",
+        "id": "2cad2896.c9df4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3982.5001220703125,
-        "y": 726,
-        "z": "b31344e1.6b9228",
+        "x": 3961.5001220703125,
+        "y": 723,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3d15fff1.053cf"
+                "17051d0f.c52e53"
             ]
         ]
     },
     {
-        "id": "c2c16051.a906d8",
+        "id": "335dceb2.9bab72",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3987.5001220703125,
-        "y": 783,
-        "z": "b31344e1.6b9228",
+        "x": 3966.5001220703125,
+        "y": 780,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d7ef8f23.d036"
+                "328eeb2e.ff715c"
             ]
         ]
     },
     {
-        "id": "d7ef8f23.d036",
+        "id": "328eeb2e.ff715c",
         "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": 4139.5001220703125,
-        "y": 784,
-        "z": "b31344e1.6b9228",
+        "x": 4118.5001220703125,
+        "y": 781,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "3d15fff1.053cf",
+        "id": "17051d0f.c52e53",
         "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": 4150.5001220703125,
-        "y": 729,
-        "z": "b31344e1.6b9228",
+        "x": 4129.5001220703125,
+        "y": 726,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "d41af0c3.594838",
+        "id": "7a06334d.9731e4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4134.8824462890625,
-        "y": 668.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 4113.8824462890625,
+        "y": 665.6556701660156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b45d0128.680c8"
+                "89e57d02.e9996"
             ]
         ]
     },
     {
-        "id": "7cb8afd4.8d20b8",
+        "id": "c9d4f321.66364",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4717,
-        "y": 687,
-        "z": "b31344e1.6b9228",
+        "x": 4696,
+        "y": 684,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "47edc84c.808f88"
+                "f8e16adc.55ac68"
             ]
         ]
     },
     {
-        "id": "47edc84c.808f88",
+        "id": "f8e16adc.55ac68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4894,
-        "y": 679,
-        "z": "b31344e1.6b9228",
+        "x": 4873,
+        "y": 676,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "266ac25a.ea33a6",
-                "2d08c6.2cc1e73a"
+                "f8c4bbbd.612dc",
+                "2cb22463.a9a10c"
             ]
         ]
     },
     {
-        "id": "b45d0128.680c8",
+        "id": "89e57d02.e9996",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4319,
-        "y": 683,
-        "z": "b31344e1.6b9228",
+        "x": 4298,
+        "y": 680,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4f9ef890.59c338"
+                "ffc907a3.634c3"
             ]
         ]
     },
     {
-        "id": "4f9ef890.59c338",
+        "id": "ffc907a3.634c3",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4514,
-        "y": 683,
-        "z": "b31344e1.6b9228",
+        "x": 4493,
+        "y": 680,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7cb8afd4.8d20b8",
-                "212f425.c6d5fbe"
+                "c9d4f321.66364",
+                "d8e84e3d.259878"
             ]
         ]
     },
     {
-        "id": "266ac25a.ea33a6",
+        "id": "f8c4bbbd.612dc",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5132,
-        "y": 634,
-        "z": "b31344e1.6b9228",
+        "x": 5111,
+        "y": 631,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "fe7f5526.b757d",
+        "id": "4afa0297.0e92ec",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5312,
-        "y": 677,
-        "z": "b31344e1.6b9228",
+        "x": 5291,
+        "y": 674,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c4631195.e5511"
+                "ba53a591.c08868"
             ]
         ]
     },
     {
-        "id": "ace94fc7.113e6",
+        "id": "f0a2c2cf.76f7c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5304,
-        "y": 732,
-        "z": "b31344e1.6b9228",
+        "x": 5283,
+        "y": 729,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "af8bf071.82c85"
+                "3a442fd2.17b8b8"
             ]
         ]
     },
     {
-        "id": "42739782.dc6168",
+        "id": "78f72703.090dd8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5309,
-        "y": 789,
-        "z": "b31344e1.6b9228",
+        "x": 5288,
+        "y": 786,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b1e33e76.6db9b"
+                "3131a765.52f598"
             ]
         ]
     },
     {
-        "id": "b1e33e76.6db9b",
+        "id": "3131a765.52f598",
         "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": 5461,
-        "y": 790,
-        "z": "b31344e1.6b9228",
+        "x": 5440,
+        "y": 787,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "af8bf071.82c85",
+        "id": "3a442fd2.17b8b8",
         "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": 5472,
-        "y": 735,
-        "z": "b31344e1.6b9228",
+        "x": 5451,
+        "y": 732,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "c4631195.e5511",
+        "id": "ba53a591.c08868",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5456.38232421875,
-        "y": 674.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 5435.38232421875,
+        "y": 671.6556701660156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4dcc9c46.887914"
+                "280c0a87.0e105e"
             ]
         ]
     },
     {
-        "id": "4dcc9c46.887914",
+        "id": "280c0a87.0e105e",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5671,
-        "y": 671,
-        "z": "b31344e1.6b9228",
+        "x": 5650,
+        "y": 668,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "e1d06713.adb0c8",
+        "id": "3387bb2a.b4fa7c",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3836,
-        "y": 1560,
-        "z": "b31344e1.6b9228",
+        "x": 3815,
+        "y": 1557,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "34f7d7e6.e7fa8",
-                "cb710953.72942",
-                "4c788e8d.e93588"
+                "4d61cd16.0abdfc",
+                "83252466.aa101",
+                "a13a024e.f66fb"
             ]
         ]
     },
     {
-        "id": "34f7d7e6.e7fa8",
+        "id": "4d61cd16.0abdfc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4031.5001220703125,
-        "y": 1512,
-        "z": "b31344e1.6b9228",
+        "x": 4010.5001220703125,
+        "y": 1509,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "fd0d1ee5.65b0f"
+                "45754d39.0b500c"
             ]
         ]
     },
     {
-        "id": "cb710953.72942",
+        "id": "83252466.aa101",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4023.5001220703125,
-        "y": 1567,
-        "z": "b31344e1.6b9228",
+        "x": 4002.5001220703125,
+        "y": 1564,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "68639fde.fb4de8"
+                "7042d1e3.edb1d"
             ]
         ]
     },
     {
-        "id": "4c788e8d.e93588",
+        "id": "a13a024e.f66fb",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4028.5001220703125,
-        "y": 1624,
-        "z": "b31344e1.6b9228",
+        "x": 4007.5001220703125,
+        "y": 1621,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "ed57c904.1da5b"
+                "67ddb18b.39ea7"
             ]
         ]
     },
     {
-        "id": "ed57c904.1da5b",
+        "id": "67ddb18b.39ea7",
         "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": 4180.5001220703125,
-        "y": 1625,
-        "z": "b31344e1.6b9228",
+        "x": 4159.5001220703125,
+        "y": 1622,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "68639fde.fb4de8",
+        "id": "7042d1e3.edb1d",
         "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": 4191.5001220703125,
-        "y": 1570,
-        "z": "b31344e1.6b9228",
+        "x": 4170.5001220703125,
+        "y": 1567,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "fd0d1ee5.65b0f",
+        "id": "45754d39.0b500c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4175.8824462890625,
-        "y": 1509.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 4154.8824462890625,
+        "y": 1506.6556701660156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2c890085.25e4f8"
+                "f1a969ab.50fa7"
             ]
         ]
     },
     {
-        "id": "b16b2c11.a7e9e",
+        "id": "e2a984cd.aa357",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4758,
-        "y": 1528,
-        "z": "b31344e1.6b9228",
+        "x": 4737,
+        "y": 1525,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e2c7b2a2.534808"
+                "3a9f2f8b.e28ed"
             ]
         ]
     },
     {
-        "id": "e2c7b2a2.534808",
+        "id": "3a9f2f8b.e28ed",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4935,
-        "y": 1520,
-        "z": "b31344e1.6b9228",
+        "x": 4914,
+        "y": 1517,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8256d13e.acb508",
-                "e33af2d.2ed629"
+                "53b7b7ea.79ccb8",
+                "abc0256.22d4b58"
             ]
         ]
     },
     {
-        "id": "2c890085.25e4f8",
+        "id": "f1a969ab.50fa7",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4360,
-        "y": 1524,
-        "z": "b31344e1.6b9228",
+        "x": 4339,
+        "y": 1521,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7ad873b6.5b0624"
+                "f0d37653.530e5"
             ]
         ]
     },
     {
-        "id": "7ad873b6.5b0624",
+        "id": "f0d37653.530e5",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4555,
-        "y": 1524,
-        "z": "b31344e1.6b9228",
+        "x": 4534,
+        "y": 1521,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b16b2c11.a7e9e",
-                "ba30acec.499f9"
+                "e2a984cd.aa357",
+                "19b04051.d11648"
             ]
         ]
     },
     {
-        "id": "e33af2d.2ed629",
+        "id": "abc0256.22d4b58",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5143,
-        "y": 1527,
-        "z": "b31344e1.6b9228",
+        "x": 5122,
+        "y": 1524,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "dd2f9c6b.57f548",
-                "3b879379.c9bf84",
-                "13b1398c.3c465e"
+                "ee461c39.fc6a98",
+                "85f503dc.f3ae58",
+                "2cdb4338.f53074"
             ]
         ]
     },
     {
-        "id": "8256d13e.acb508",
+        "id": "53b7b7ea.79ccb8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5173,
-        "y": 1475,
-        "z": "b31344e1.6b9228",
+        "x": 5152,
+        "y": 1472,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "dd2f9c6b.57f548",
+        "id": "ee461c39.fc6a98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5353,
-        "y": 1518,
-        "z": "b31344e1.6b9228",
+        "x": 5332,
+        "y": 1515,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "56d2c260.edc91c"
+                "bc865963.b711a"
             ]
         ]
     },
     {
-        "id": "3b879379.c9bf84",
+        "id": "85f503dc.f3ae58",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5345,
-        "y": 1573,
-        "z": "b31344e1.6b9228",
+        "x": 5324,
+        "y": 1570,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7449bea.eaa7fc"
+                "f79338ab.92167"
             ]
         ]
     },
     {
-        "id": "13b1398c.3c465e",
+        "id": "2cdb4338.f53074",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5350,
-        "y": 1630,
-        "z": "b31344e1.6b9228",
+        "x": 5329,
+        "y": 1627,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "232c7315.841b1c"
+                "bfc5b714.cbe288"
             ]
         ]
     },
     {
-        "id": "232c7315.841b1c",
+        "id": "bfc5b714.cbe288",
         "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": 5502,
-        "y": 1631,
-        "z": "b31344e1.6b9228",
+        "x": 5481,
+        "y": 1628,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "7449bea.eaa7fc",
+        "id": "f79338ab.92167",
         "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": 5513,
-        "y": 1576,
-        "z": "b31344e1.6b9228",
+        "x": 5492,
+        "y": 1573,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "56d2c260.edc91c",
+        "id": "bc865963.b711a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5497.38232421875,
-        "y": 1515.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 5476.38232421875,
+        "y": 1512.6556701660156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "49d0cb53.31a39c"
+                "6cd4d323.819c7c"
             ]
         ]
     },
     {
-        "id": "49d0cb53.31a39c",
+        "id": "6cd4d323.819c7c",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5712,
-        "y": 1512,
-        "z": "b31344e1.6b9228",
+        "x": 5691,
+        "y": 1509,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "33bd7ebe.34c502",
+        "id": "53404fc0.a38be",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2796,
-        "y": 452,
-        "z": "b31344e1.6b9228",
+        "x": 2775,
+        "y": 449,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "fe8ff063.6863b8",
-                "4e85bccf.c8cf0c"
+                "62e6aba8.2c101c",
+                "9754a6dd.67f03"
             ]
         ]
     },
     {
-        "id": "4e85bccf.c8cf0c",
+        "id": "9754a6dd.67f03",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3077,
-        "y": 408,
-        "z": "b31344e1.6b9228",
+        "x": 3056,
+        "y": 405,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "badd7dbd.ce16"
+                "a377e213.201cf8"
             ]
         ]
     },
     {
-        "id": "badd7dbd.ce16",
+        "id": "a377e213.201cf8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3339,
-        "y": 408,
-        "z": "b31344e1.6b9228",
+        "x": 3318,
+        "y": 405,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "5050eb58.e00ed4"
+                "7737916f.9448f"
             ]
         ]
     },
     {
-        "id": "212f425.c6d5fbe",
+        "id": "d8e84e3d.259878",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4720,
-        "y": 761,
-        "z": "b31344e1.6b9228",
+        "x": 4699,
+        "y": 758,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "656d86d7.e1bb3"
+                "3db61f55.c940b"
             ]
         ]
     },
     {
-        "id": "656d86d7.e1bb3",
+        "id": "3db61f55.c940b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4897,
-        "y": 753,
-        "z": "b31344e1.6b9228",
+        "x": 4876,
+        "y": 750,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4f5b4545.d432fc"
+                "c68e6afb.37cad8"
             ]
         ]
     },
     {
-        "id": "4f5b4545.d432fc",
+        "id": "c68e6afb.37cad8",
         "type": "set",
         "name": "set domainA ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5132,
-        "y": 877,
-        "z": "b31344e1.6b9228",
+        "x": 5111,
+        "y": 874,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "5e5727f6.ce94f",
+        "id": "70ffeb00.3c6c1c",
         "type": "set",
         "name": "set domainB ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5172,
-        "y": 1717,
-        "z": "b31344e1.6b9228",
+        "x": 5151,
+        "y": 1714,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "33761656.d7dc5a",
+        "id": "ce30230.018a56",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4937,
-        "y": 1593,
-        "z": "b31344e1.6b9228",
+        "x": 4916,
+        "y": 1590,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "5e5727f6.ce94f"
+                "70ffeb00.3c6c1c"
             ]
         ]
     },
     {
-        "id": "ba30acec.499f9",
+        "id": "19b04051.d11648",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4760,
-        "y": 1601,
-        "z": "b31344e1.6b9228",
+        "x": 4739,
+        "y": 1598,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "33761656.d7dc5a"
+                "ce30230.018a56"
             ]
         ]
     },
     {
-        "id": "420f3616.2f701",
+        "id": "36ea936c.0d2d9c",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4378,
-        "y": 538,
-        "z": "b31344e1.6b9228",
+        "x": 4357,
+        "y": 535,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "b1349530.c53cc",
+        "id": "39c2d67.9f1a22a",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2734,
-        "y": 672,
-        "z": "b31344e1.6b9228",
+        "x": 2713,
+        "y": 669,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "84b0870f.4db1e",
+        "id": "d6aa9ec.33fa46",
         "type": "execute",
         "name": "execute UUID generator for otn-tunnel-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2715,
-        "y": 722,
-        "z": "b31344e1.6b9228",
+        "x": 2694,
+        "y": 719,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2dfd81e1.a251ae",
+        "id": "3b75dc28.79bec4",
         "type": "for",
         "name": "for each allotted-resource",
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1972,
-        "y": 224,
-        "z": "b31344e1.6b9228",
+        "x": 1955,
+        "y": 253,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3ffb610e.7895d6",
-                "1fed210d.6adb97"
+                "42ce53ea.f9d9f4",
+                "fea2a65.c94cf58"
             ]
         ]
     },
     {
-        "id": "3ffb610e.7895d6",
+        "id": "42ce53ea.f9d9f4",
         "type": "set",
         "name": "set the current allotted-resource-id",
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
         "comments": "",
-        "x": 2256,
-        "y": 194,
-        "z": "b31344e1.6b9228",
+        "x": 2235,
+        "y": 191,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "1f03402a.5db7",
+        "id": "72dba682.c63c9",
         "type": "set",
         "name": "set query_param",
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
         "comments": "",
-        "x": 2625,
-        "y": 2321,
-        "z": "b31344e1.6b9228",
+        "x": 2604,
+        "y": 2318,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "56710693.e24068",
+        "id": "1b6d1c66.bc0bb4",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value='' />\n<parameter name='domain-A.node-id' value='' />\n<parameter name='domain-A.network-id' value=\"\" />\n<parameter name='domain-A.provider-id' value=\"\" />\n<parameter name='domain-A.client-id' value=\"\" />\n<parameter name='domain-A.te-topo-id' value=\"\" />\n<parameter name='domain-A.network-type' value=\"\" />\n<parameter name='domain-A.ltpId' value=\"\" />\n<parameter name='tmp.domain-A.network-id' value=\"\" />\n<parameter name='tmp.domain-A.ttp-id' value=\"\" />\n<parameter name='network-route-A' value=\"\" />\n<!--<parameter name='domain-A.' value=\"\" />-->\n\n<parameter name='request-id' value='' />\n<parameter name='otn-source-node' value='' />\n<parameter name='otn-dest-node' value='' />\n<parameter name='bw-odu' value=\"\" />\n<parameter name='src-ttp-id' value='' />\n<parameter name='dst-ttp-id' value='' />\n\n<parameter name='domain-B.tunnel-tp-id' value='' />\n<parameter name='domain-B.node-id' value='' />\n<parameter name='domain-B.network-id' value=\"\" />\n<parameter name='domain-B.provider-id' value=\"\" />\n<parameter name='domain-B.client-id' value=\"\" />\n<parameter name='domain-B.te-topo-id' value=\"\" />\n<parameter name='domain-B.network-type' value=\"\" />\n<parameter name='domain-B.ltpId' value=\"\" />\n<parameter name='tmp.domain-B.network-id' value=\"\" />\n<parameter name='tmp.domain-B.ttp-id' value=\"\" />\n<parameter name='network-route-B' value=\"\" />\n<!--<parameter name='domain-B.' value=\"\" />-->\n\n\n\n\n\n",
         "comments": "",
-        "x": 2615,
-        "y": 3930,
-        "z": "b31344e1.6b9228",
+        "x": 2594,
+        "y": 3927,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "3323f682.f60c3a",
+        "id": "6c32ab13.072304",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
-        "x": 2672,
-        "y": 767,
-        "z": "b31344e1.6b9228",
+        "x": 2651,
+        "y": 764,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "13ac3dbd.1f366a",
+        "id": "35f98555.2ceed2",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 2663,
-        "y": 2459,
-        "z": "b31344e1.6b9228",
+        "x": 2639,
+        "y": 2494,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f2924301.397558"
+                "5f7bc0b4.b38de8"
             ]
         ]
     },
     {
-        "id": "647d2436.140504",
+        "id": "3340e53d.b2b492",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3789,
-        "y": 2919,
-        "z": "b31344e1.6b9228",
+        "x": 3768,
+        "y": 2916,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "810630b1.0e1b6"
+                "b711db38.ba184"
             ]
         ]
     },
     {
-        "id": "fdfa6fb7.1a35f",
+        "id": "4bdc0f0f.14fc9",
         "type": "save",
         "name": "save connectivity-A relationship to vpn-binding-A, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4361.5,
-        "y": 3023,
-        "z": "b31344e1.6b9228",
+        "x": 4340.5,
+        "y": 3020,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "810630b1.0e1b6",
+        "id": "b711db38.ba184",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4095,
-        "y": 2918,
-        "z": "b31344e1.6b9228",
+        "x": 4074,
+        "y": 2915,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a594830d.53acd8"
+                "b22521de.818118"
             ]
         ]
     },
     {
-        "id": "a594830d.53acd8",
+        "id": "b22521de.818118",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4304.5,
-        "y": 2918.25390625,
-        "z": "b31344e1.6b9228",
+        "x": 4283.5,
+        "y": 2915.25390625,
+        "z": "cd8c161.e76ffe8",
         "wires": [
-            [
-                "b41cf773.b97ef"
-            ]
+            []
         ]
     },
     {
-        "id": "4c295920.4b5da",
+        "id": "585cd143.7d2b8",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding $otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3822,
-        "y": 2398,
-        "z": "b31344e1.6b9228",
+        "x": 3801,
+        "y": 2395,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "19452741.32e4c1",
+        "id": "f49c0fd7.2e7c08",
         "type": "switchNode",
         "name": "switch otnidx == 0",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3698,
-        "y": 3036,
-        "z": "b31344e1.6b9228",
+        "x": 3677,
+        "y": 3033,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "9c40fb98.e1f61",
-                "20acba8d.85a5f6"
+                "fed6bc26.f071a8",
+                "1d37d7ca.3763f"
             ]
         ]
     },
     {
-        "id": "9c40fb98.e1f61",
+        "id": "fed6bc26.f071a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3881,
-        "y": 3036,
-        "z": "b31344e1.6b9228",
+        "x": 3860,
+        "y": 3033,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a42fc89d.d0c4a"
+                "73494a81.45e24c"
             ]
         ]
     },
     {
-        "id": "20acba8d.85a5f6",
+        "id": "1d37d7ca.3763f",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3706,
-        "y": 3183,
-        "z": "b31344e1.6b9228",
+        "x": 3685,
+        "y": 3180,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "332942c6.7f663e"
+                "d3242d0f.9401e"
             ]
         ]
     },
     {
-        "id": "f5749296.6a691",
+        "id": "e99682a.c4f64",
         "type": "switchNode",
         "name": "switch otnidx == last",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4047,
-        "y": 3264,
-        "z": "b31344e1.6b9228",
+        "x": 4026,
+        "y": 3261,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2103be8f.1fc842",
-                "1554c822.b8c828"
+                "eb362179.9d3068",
+                "72ad90f5.140788"
             ]
         ]
     },
     {
-        "id": "2103be8f.1fc842",
+        "id": "eb362179.9d3068",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4232,
-        "y": 3265,
-        "z": "b31344e1.6b9228",
+        "x": 4211,
+        "y": 3262,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a1250da6.1c6"
+                "9791b470.15bff8"
             ]
         ]
     },
     {
-        "id": "1554c822.b8c828",
+        "id": "72ad90f5.140788",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4251,
-        "y": 3531,
-        "z": "b31344e1.6b9228",
+        "x": 4230,
+        "y": 3528,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "99adbaff.3e741"
+                "aff1f53d.8faa"
             ]
         ]
     },
     {
-        "id": "f416ea28.cb6ab",
+        "id": "c78f87c4.9bed48",
         "type": "save",
         "name": "save connectivity-B relationship to vpn-binding-B, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4662,
-        "y": 3266,
-        "z": "b31344e1.6b9228",
+        "x": 4641,
+        "y": 3263,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e6548b2c.2addd8",
+        "id": "d7d2c7f0.8e25f8",
         "type": "execute",
         "name": "execute UUID generator for connectivity domain otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4736,
-        "y": 3564,
-        "z": "b31344e1.6b9228",
+        "x": 4715,
+        "y": 3561,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ddd52155.f542e8",
+        "id": "1d6b059f.4c3bfa",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4672,
-        "y": 3615,
-        "z": "b31344e1.6b9228",
+        "x": 4651,
+        "y": 3612,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a14f6e93.1adaf8",
+        "id": "3d6ca865.871a5",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 4801,
-        "y": 3665,
-        "z": "b31344e1.6b9228",
+        "x": 4780,
+        "y": 3662,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "16a831c0.877516",
+        "id": "cd227f8a.a8638",
         "type": "comment",
         "name": "connectivity has not been created for middle domains, so we have to create one",
         "info": "",
         "comments": "",
-        "x": 4811,
-        "y": 3508,
-        "z": "b31344e1.6b9228",
+        "x": 4790,
+        "y": 3505,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "2e301756.38a228",
+        "id": "bfa230df.6f6f98",
         "type": "save",
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4769,
-        "y": 3724,
-        "z": "b31344e1.6b9228",
+        "x": 4748,
+        "y": 3721,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "99adbaff.3e741",
+        "id": "aff1f53d.8faa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4408,
-        "y": 3532,
-        "z": "b31344e1.6b9228",
+        "x": 4387,
+        "y": 3529,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e6548b2c.2addd8",
-                "ddd52155.f542e8",
-                "a14f6e93.1adaf8",
-                "2e301756.38a228",
-                "ebae712b.9f6bf8"
+                "d7d2c7f0.8e25f8",
+                "1d6b059f.4c3bfa",
+                "3d6ca865.871a5",
+                "bfa230df.6f6f98",
+                "12522f2b.6fc8b1"
             ]
         ]
     },
     {
-        "id": "f2924301.397558",
+        "id": "5f7bc0b4.b38de8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2925,
-        "y": 2465,
-        "z": "b31344e1.6b9228",
+        "x": 2908,
+        "y": 2494,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "4c295920.4b5da",
-                "647d2436.140504",
-                "19452741.32e4c1",
-                "1d59f70d.1ee6c9",
-                "b15a67ed.f1cb18",
-                "e4fb52b5.f04798",
-                "f5263d8c.0dd66"
+                "585cd143.7d2b8",
+                "3340e53d.b2b492",
+                "f49c0fd7.2e7c08",
+                "f42a2589.31a0b",
+                "cc8174a8.50b7f",
+                "90db4521.56089",
+                "7bd1d477.e03354"
             ]
         ]
     },
     {
-        "id": "2e1edee2.ee8112",
+        "id": "4e1b8da0.7824b4",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n\n",
         "comments": "",
-        "x": 4286,
-        "y": 3080,
-        "z": "b31344e1.6b9228",
+        "x": 4265,
+        "y": 3077,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "ba046748.bfe1b",
+        "id": "5449eb52.31f6ec",
         "type": "execute",
         "name": "execute RestApiCallNode domainA UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\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": 4339,
-        "y": 3124,
-        "z": "b31344e1.6b9228",
+        "x": 4318,
+        "y": 3121,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b63ee960.cee2c",
-                "1b1f60e5.7a7c9f"
+                "1830f22c.565b16",
+                "d371e563.9b53a"
             ]
         ]
     },
     {
-        "id": "1b1f60e5.7a7c9f",
+        "id": "d371e563.9b53a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4610,
-        "y": 3109,
-        "z": "b31344e1.6b9228",
+        "x": 4589,
+        "y": 3106,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e9f5d50.e9a0928"
+                "e029f2f6.ad875"
             ]
         ]
     },
     {
-        "id": "b63ee960.cee2c",
+        "id": "1830f22c.565b16",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4608.000213623047,
-        "y": 3166.99990940094,
-        "z": "b31344e1.6b9228",
+        "x": 4587.000213623047,
+        "y": 3163.99990940094,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c9e53751.966bb8"
+                "adfa6667.8c9cb"
             ]
         ]
     },
     {
-        "id": "e9f5d50.e9a0928",
+        "id": "e029f2f6.ad875",
         "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 UNI Coloring for domain A\" />\n",
         "comments": "",
-        "x": 4750.000247955322,
-        "y": 3109.0000009536743,
-        "z": "b31344e1.6b9228",
+        "x": 4729.000247955322,
+        "y": 3106.0000009536743,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "c9e53751.966bb8",
+        "id": "adfa6667.8c9cb",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4756.02725982666,
-        "y": 3157.745394706726,
-        "z": "b31344e1.6b9228",
+        "x": 4735.02725982666,
+        "y": 3154.745394706726,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a42fc89d.d0c4a",
+        "id": "73494a81.45e24c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4022,
-        "y": 3026,
-        "z": "b31344e1.6b9228",
+        "x": 4001,
+        "y": 3023,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "fdfa6fb7.1a35f",
-                "ba046748.bfe1b",
-                "2e1edee2.ee8112"
+                "4bdc0f0f.14fc9",
+                "5449eb52.31f6ec",
+                "4e1b8da0.7824b4"
             ]
         ]
     },
     {
-        "id": "a1250da6.1c6",
+        "id": "9791b470.15bff8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4366,
-        "y": 3266,
-        "z": "b31344e1.6b9228",
+        "x": 4345,
+        "y": 3263,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f416ea28.cb6ab",
-                "6f1cb48c.6026e4",
-                "1cf9708b.795d07"
+                "c78f87c4.9bed48",
+                "96e361f0.0cb568",
+                "e43c5196.95971"
             ]
         ]
     },
     {
-        "id": "1cf9708b.795d07",
+        "id": "e43c5196.95971",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",
         "comments": "",
-        "x": 4586,
-        "y": 3310,
-        "z": "b31344e1.6b9228",
+        "x": 4565,
+        "y": 3307,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "6f1cb48c.6026e4",
+        "id": "96e361f0.0cb568",
         "type": "execute",
         "name": "execute RestApiCallNode domainB UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\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": 4637,
-        "y": 3354,
-        "z": "b31344e1.6b9228",
+        "x": 4616,
+        "y": 3351,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "6e1323b5.c04ce4",
-                "1555b51f.0ca46b"
+                "d02e29cf.263e8",
+                "ecba049c.afd758"
             ]
         ]
     },
     {
-        "id": "1555b51f.0ca46b",
+        "id": "ecba049c.afd758",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4900,
-        "y": 3334,
-        "z": "b31344e1.6b9228",
+        "x": 4879,
+        "y": 3331,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7a3f18c.e7bf268"
+                "335f23f9.119f0c"
             ]
         ]
     },
     {
-        "id": "6e1323b5.c04ce4",
+        "id": "d02e29cf.263e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4901.000213623047,
-        "y": 3384.99990940094,
-        "z": "b31344e1.6b9228",
+        "x": 4880.000213623047,
+        "y": 3381.99990940094,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "c1d2c5de.5e2688"
+                "49ab66fd.a6d9f8"
             ]
         ]
     },
     {
-        "id": "7a3f18c.e7bf268",
+        "id": "335f23f9.119f0c",
         "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 UNI coloring for domain B\" />\n",
         "comments": "",
-        "x": 5040.000247955322,
-        "y": 3334.0000009536743,
-        "z": "b31344e1.6b9228",
+        "x": 5019.000247955322,
+        "y": 3331.0000009536743,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "c1d2c5de.5e2688",
+        "id": "49ab66fd.a6d9f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5046.02725982666,
-        "y": 3382.745394706726,
-        "z": "b31344e1.6b9228",
+        "x": 5025.02725982666,
+        "y": 3379.745394706726,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ebae712b.9f6bf8",
+        "id": "12522f2b.6fc8b1",
         "type": "set",
         "name": "set attachment_param domain otnidx",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 4683,
-        "y": 3784,
-        "z": "b31344e1.6b9228",
+        "x": 4662,
+        "y": 3781,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "bc1d9c19.8a817",
+        "id": "48979781.1681f8",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2002,
-        "y": 4131,
-        "z": "b31344e1.6b9228",
+        "x": 1981,
+        "y": 4128,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3b12d36f.6d8234",
-                "89a53740.4d3c98",
-                "a61d86b5.6c70f"
+                "c2f0d7a5.dddd68",
+                "39032723.2690f8",
+                "52e0bd76.c6817c"
             ]
         ]
     },
     {
-        "id": "3b12d36f.6d8234",
+        "id": "c2f0d7a5.dddd68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2190,
-        "y": 4144,
-        "z": "b31344e1.6b9228",
+        "x": 2169,
+        "y": 4141,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3ced61cb.b2d7fe"
+                "ab5cddb1.22da4"
             ]
         ]
     },
     {
-        "id": "89a53740.4d3c98",
+        "id": "39032723.2690f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2190.490966796875,
-        "y": 4189.574035644531,
-        "z": "b31344e1.6b9228",
+        "x": 2169.490966796875,
+        "y": 4186.574035644531,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3eafcbaf.f2f56c"
+                "14fe4895.b40197"
             ]
         ]
     },
     {
-        "id": "a61d86b5.6c70f",
+        "id": "52e0bd76.c6817c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2188,
-        "y": 4233,
-        "z": "b31344e1.6b9228",
+        "x": 2167,
+        "y": 4230,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "170e04a2.1b39fb"
+                "b5248481.e522a"
             ]
         ]
     },
     {
-        "id": "3ced61cb.b2d7fe",
+        "id": "ab5cddb1.22da4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2363,
-        "y": 4142,
-        "z": "b31344e1.6b9228",
+        "x": 2342,
+        "y": 4139,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "ef9d0591.fefb08"
+                "4470cae1.fbd614"
             ]
         ]
     },
     {
-        "id": "3eafcbaf.f2f56c",
+        "id": "14fe4895.b40197",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2353.0623779296875,
-        "y": 4189.859771728516,
-        "z": "b31344e1.6b9228",
+        "x": 2332.0623779296875,
+        "y": 4186.859771728516,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "170e04a2.1b39fb",
+        "id": "b5248481.e522a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2355,
-        "y": 4232,
-        "z": "b31344e1.6b9228",
+        "x": 2334,
+        "y": 4229,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "bf30e0be.23b998",
+        "id": "5d2f9da2.d38694",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1991,
-        "y": 4322,
-        "z": "b31344e1.6b9228",
+        "x": 1970,
+        "y": 4319,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "557999e1.77dcb"
+                "8dfa636a.7429d"
             ]
         ]
     },
     {
-        "id": "d613988a.0c40c",
+        "id": "e79af240.ca6e5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2801,
-        "y": 4322,
-        "z": "b31344e1.6b9228",
+        "x": 2780,
+        "y": 4319,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e4afc290.74f038"
+                "6c6212ef.f90554"
             ]
         ]
     },
     {
-        "id": "f7f46916.4f1ee",
+        "id": "da3d1785.252e3",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2573,
-        "y": 4322,
-        "z": "b31344e1.6b9228",
+        "x": 2552,
+        "y": 4319,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d613988a.0c40c"
+                "e79af240.ca6e5"
             ]
         ]
     },
     {
-        "id": "ce29a297.cf1cb8",
+        "id": "14ccf193.a7ba36",
         "type": "set",
         "name": "set providerValue",
         "xml": "<set>\n<parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\n<parameter name='found' value='false' />\n\n\n",
         "comments": "",
-        "x": 3693,
-        "y": 4089,
-        "z": "b31344e1.6b9228",
+        "x": 3672,
+        "y": 4086,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "90828ea.8f9357",
+        "id": "3ba4980a.a7808",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",
         "comments": "",
-        "x": 3995,
-        "y": 3215,
-        "z": "b31344e1.6b9228",
+        "x": 3974,
+        "y": 3212,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "332942c6.7f663e",
+        "id": "d3242d0f.9401e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3830,
-        "y": 3190,
-        "z": "b31344e1.6b9228",
+        "x": 3809,
+        "y": 3187,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "90828ea.8f9357",
-                "f5749296.6a691"
+                "3ba4980a.a7808",
+                "e99682a.c4f64"
             ]
         ]
     },
     {
-        "id": "d0adb7e4.435f98",
+        "id": "a26db7da.175a4",
         "type": "set",
         "name": "set tmp.arr",
-        "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<parameter name='tmp.slicevpns' value='' />\n<parameter name='tmp.slicevpns_length' value='0' />\n\n<parameter name='tmp.slicevpnuuids' value='' />\n<parameter name='tmp.slicevpnuuids.' value='' />\n\n\n",
+        "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
         "comments": "",
-        "x": 1954,
-        "y": 170,
-        "z": "b31344e1.6b9228",
+        "x": 1929,
+        "y": 203,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "ef9d0591.fefb08",
+        "id": "4470cae1.fbd614",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2592,
-        "y": 4143,
-        "z": "b31344e1.6b9228",
+        "x": 2571,
+        "y": 4140,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2fbee9b.ff76316"
+                "af51805a.3f6e48"
             ]
         ]
     },
     {
-        "id": "2fbee9b.ff76316",
+        "id": "af51805a.3f6e48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2807,
-        "y": 4144,
-        "z": "b31344e1.6b9228",
+        "x": 2786,
+        "y": 4141,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "9baaaca4.d54a4"
+                "b29ba493.8896c8"
             ]
         ]
     },
     {
-        "id": "49f4d5cd.eba3ac",
+        "id": "de53bb83.199eb",
         "type": "for",
         "name": "for arridx in tmp.arr",
         "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4260,
-        "y": 4064,
-        "z": "b31344e1.6b9228",
+        "x": 4239,
+        "y": 4061,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a296aaec.6a9f7"
+                "204c9a7d.7d28b6"
             ]
         ]
     },
     {
-        "id": "72392f69.a40338",
+        "id": "4aa9ee27.313a08",
         "type": "switchNode",
         "name": "switch $tmp.arr_length != 0",
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3726,
-        "y": 4144,
-        "z": "b31344e1.6b9228",
+        "x": 3705,
+        "y": 4141,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "1e30cbc6.5b29c4",
-                "73a572c0.fcdcfc"
+                "2d961aee.1b3a76",
+                "3325a435.f57dbc"
             ]
         ]
     },
     {
-        "id": "1e30cbc6.5b29c4",
+        "id": "2d961aee.1b3a76",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3922,
-        "y": 4114,
-        "z": "b31344e1.6b9228",
+        "x": 3901,
+        "y": 4111,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "79192fda.22a8a8"
+                "78c69440.64f1a4"
             ]
         ]
     },
     {
-        "id": "73a572c0.fcdcfc",
+        "id": "3325a435.f57dbc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3923,
-        "y": 4185,
-        "z": "b31344e1.6b9228",
+        "x": 3902,
+        "y": 4182,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e5b5d449.e95738"
+                "fefe3e36.023678"
             ]
         ]
     },
     {
-        "id": "79192fda.22a8a8",
+        "id": "78c69440.64f1a4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4073,
-        "y": 4112,
-        "z": "b31344e1.6b9228",
+        "x": 4052,
+        "y": 4109,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "49f4d5cd.eba3ac",
-                "ee34549a.68661"
+                "de53bb83.199eb",
+                "8df94468.3b3aa8"
             ]
         ]
     },
     {
-        "id": "a296aaec.6a9f7",
+        "id": "204c9a7d.7d28b6",
         "type": "switchNode",
         "name": "switch tmp.arr[$arridx] == $providerValue",
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4551,
-        "y": 4064,
-        "z": "b31344e1.6b9228",
+        "x": 4530,
+        "y": 4061,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f6a570fa.8c3e18",
-                "f096fdfa.51af18"
+                "c41481ab.88bea8",
+                "e1b07d6e.872148"
             ]
         ]
     },
     {
-        "id": "f6a570fa.8c3e18",
+        "id": "c41481ab.88bea8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4826,
-        "y": 4033,
-        "z": "b31344e1.6b9228",
+        "x": 4805,
+        "y": 4030,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7e64bb9a.5c5954"
+                "f1ff9d18.303e98"
             ]
         ]
     },
     {
-        "id": "f096fdfa.51af18",
+        "id": "e1b07d6e.872148",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4827,
-        "y": 4104,
-        "z": "b31344e1.6b9228",
+        "x": 4806,
+        "y": 4101,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2ae9b410.b8e274"
+                "14131c89.49f9f3"
             ]
         ]
     },
     {
-        "id": "7e64bb9a.5c5954",
+        "id": "f1ff9d18.303e98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4977,
-        "y": 4031,
-        "z": "b31344e1.6b9228",
+        "x": 4956,
+        "y": 4028,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "883ad39b.46747",
-                "3d5cad7b.78211a",
-                "ac8bc417.7b82a",
-                "6ea95490.220544",
-                "6a39b9a6.2592"
+                "40d1e81e.6cc88",
+                "dbbf7f90.5aa4c8",
+                "83374978.c1c35",
+                "d7033d3e.83e278",
+                "8b158b61.9a9f58"
             ]
         ]
     },
     {
-        "id": "883ad39b.46747",
+        "id": "40d1e81e.6cc88",
         "type": "set",
         "name": "set found to true",
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
         "comments": "",
-        "x": 5165,
-        "y": 3991,
-        "z": "b31344e1.6b9228",
+        "x": 5144,
+        "y": 3988,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "3d5cad7b.78211a",
+        "id": "dbbf7f90.5aa4c8",
         "type": "save",
         "name": "store $arridx somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5237,
-        "y": 4036,
-        "z": "b31344e1.6b9228",
+        "x": 5216,
+        "y": 4033,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6a39b9a6.2592",
+        "id": "8b158b61.9a9f58",
         "type": "set",
         "name": "set twoD arr",
         "xml": "<set>\n\n<!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\n<!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\n<parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\n\n",
         "comments": "",
-        "x": 5152,
-        "y": 4163,
-        "z": "b31344e1.6b9228",
+        "x": 5131,
+        "y": 4160,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "6ea95490.220544",
+        "id": "d7033d3e.83e278",
         "type": "set",
         "name": "set sizeOfSliceList",
         "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",
         "comments": "",
-        "x": 5173,
-        "y": 4099,
-        "z": "b31344e1.6b9228",
+        "x": 5152,
+        "y": 4096,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "e5b5d449.e95738",
+        "id": "fefe3e36.023678",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4075,
-        "y": 4185,
-        "z": "b31344e1.6b9228",
+        "x": 4054,
+        "y": 4182,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b867d047.fac",
-                "3788e630.590d72"
+                "8b5a5937.7b14e8",
+                "738e0247.d8b784"
             ]
         ]
     },
     {
-        "id": "b867d047.fac",
+        "id": "8b5a5937.7b14e8",
         "type": "save",
         "name": "store $arridx somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='0' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4330,
-        "y": 4178,
-        "z": "b31344e1.6b9228",
+        "x": 4309,
+        "y": 4175,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "3788e630.590d72",
+        "id": "738e0247.d8b784",
         "type": "set",
         "name": "set twoD array",
         "xml": "<set>\n<parameter name='tmp.arr[0]' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='1' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[0].list_length' value='1' />\n\n",
         "comments": "",
-        "x": 4258,
-        "y": 4225,
-        "z": "b31344e1.6b9228",
+        "x": 4237,
+        "y": 4222,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "ee34549a.68661",
+        "id": "8df94468.3b3aa8",
         "type": "switchNode",
         "name": "switch found?",
         "xml": "<switch test='`$found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4251,
-        "y": 4109,
-        "z": "b31344e1.6b9228",
+        "x": 4230,
+        "y": 4106,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "d1f76975.e11b9",
-                "3421ae07.ec9d62"
+                "df11cc3e.1263f",
+                "1fe91094.d80647"
             ]
         ]
     },
     {
-        "id": "d1f76975.e11b9",
+        "id": "df11cc3e.1263f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4411,
-        "y": 4101,
-        "z": "b31344e1.6b9228",
+        "x": 4390,
+        "y": 4098,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2d9d0080.4d96d"
+                "6014caa7.dd1974"
             ]
         ]
     },
     {
-        "id": "3421ae07.ec9d62",
+        "id": "1fe91094.d80647",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4409,
-        "y": 4138,
-        "z": "b31344e1.6b9228",
+        "x": 4388,
+        "y": 4135,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "91314308.ab84d"
+                "4b7b9538.9e1144"
             ]
         ]
     },
     {
-        "id": "2d9d0080.4d96d",
+        "id": "6014caa7.dd1974",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4536,
-        "y": 4101,
-        "z": "b31344e1.6b9228",
+        "x": 4515,
+        "y": 4098,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd3f24a6.bbbfb8",
+        "id": "f4cf80fc.6110b8",
         "type": "save",
         "name": "store $arridx+1 somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx + 1`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4843,
-        "y": 4159,
-        "z": "b31344e1.6b9228",
+        "x": 4822,
+        "y": 4156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "91314308.ab84d",
+        "id": "4b7b9538.9e1144",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4569,
-        "y": 4146,
-        "z": "b31344e1.6b9228",
+        "x": 4548,
+        "y": 4143,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "fd3f24a6.bbbfb8",
-                "3fbaf181.1ff88e"
+                "f4cf80fc.6110b8",
+                "cb01b96d.902da8"
             ]
         ]
     },
     {
-        "id": "3fbaf181.1ff88e",
+        "id": "cb01b96d.902da8",
         "type": "set",
         "name": "set twoD array",
         "xml": "<set>\n<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\n\n",
         "comments": "",
-        "x": 4760,
-        "y": 4205,
-        "z": "b31344e1.6b9228",
+        "x": 4739,
+        "y": 4202,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "2ae9b410.b8e274",
+        "id": "14131c89.49f9f3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4960,
-        "y": 4103,
-        "z": "b31344e1.6b9228",
+        "x": 4939,
+        "y": 4100,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ac8bc417.7b82a",
+        "id": "83374978.c1c35",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5131,
-        "y": 4230,
-        "z": "b31344e1.6b9228",
+        "x": 5110,
+        "y": 4227,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "1d59f70d.1ee6c9",
+        "id": "f42a2589.31a0b",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3536,
-        "y": 2488,
-        "z": "b31344e1.6b9228",
+        "x": 3515,
+        "y": 2485,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "13d01e4b.11cf72",
-                "f41dda2a.86b79"
+                "ac6a7600.1391a8",
+                "6c99c1a3.b2c848"
             ]
         ]
     },
     {
-        "id": "13d01e4b.11cf72",
+        "id": "ac6a7600.1391a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3902,
-        "y": 2449,
-        "z": "b31344e1.6b9228",
+        "x": 3881,
+        "y": 2446,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "a63400f9.70b798"
+                "c094d1a4.3a348"
             ]
         ]
     },
     {
-        "id": "f41dda2a.86b79",
+        "id": "6c99c1a3.b2c848",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3903,
-        "y": 2495,
-        "z": "b31344e1.6b9228",
+        "x": 3882,
+        "y": 2492,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "201cd4b0.391f6c"
+                "11e69cf.d047563"
             ]
         ]
     },
     {
-        "id": "a63400f9.70b798",
+        "id": "c094d1a4.3a348",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",
         "comments": "",
-        "x": 4116,
-        "y": 2448,
-        "z": "b31344e1.6b9228",
+        "x": 4095,
+        "y": 2445,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "201cd4b0.391f6c",
+        "id": "11e69cf.d047563",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",
         "comments": "",
-        "x": 4114,
-        "y": 2493,
-        "z": "b31344e1.6b9228",
+        "x": 4093,
+        "y": 2490,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "e4afc290.74f038",
+        "id": "6c6212ef.f90554",
         "type": "set",
         "name": "set attachment_param sliceG",
         "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`\" />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\n\n\n<parameter name=\"tmp.domainG.restapiUrl\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`\" />\n<parameter name=\"tmp.domainG.restapiUser\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`\" />\n<parameter name=\"tmp.domainG.restapiPassword\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`\" />",
         "comments": "",
-        "x": 3054,
-        "y": 4320,
-        "z": "b31344e1.6b9228",
+        "x": 3033,
+        "y": 4317,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "5a129ea2.020ec",
+        "id": "a54ce659.29b108",
         "type": "execute",
         "name": "execute RestApiCallNode sliceG creation domainG",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.domainG.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`tmp.domainG.restapiPassword`\" />\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`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2639,
-        "y": 4428,
-        "z": "b31344e1.6b9228",
+        "x": 2618,
+        "y": 4425,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "235df5b8.967b5a",
-                "2fcb7bfa.e794ec"
+                "3fa26ce7.7e0224",
+                "b2b0e72c.a11478"
             ]
         ]
     },
     {
-        "id": "2fcb7bfa.e794ec",
+        "id": "b2b0e72c.a11478",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2922,
-        "y": 4408,
-        "z": "b31344e1.6b9228",
+        "x": 2901,
+        "y": 4405,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "ec27b172.f3b03"
+                "fa1f56ce.f832c8"
             ]
         ]
     },
     {
-        "id": "235df5b8.967b5a",
+        "id": "3fa26ce7.7e0224",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2923.000213623047,
-        "y": 4458.99990940094,
-        "z": "b31344e1.6b9228",
+        "x": 2902.000213623047,
+        "y": 4455.99990940094,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "afac7d54.5ea3c8"
+                "50896aad.7e40ec"
             ]
         ]
     },
     {
-        "id": "ec27b172.f3b03",
+        "id": "fa1f56ce.f832c8",
         "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 slice creation api for domain A\" />\n",
         "comments": "",
-        "x": 3062.0002479553223,
-        "y": 4408.000000953674,
-        "z": "b31344e1.6b9228",
+        "x": 3041.0002479553223,
+        "y": 4405.000000953674,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "afac7d54.5ea3c8",
+        "id": "50896aad.7e40ec",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3068.02725982666,
-        "y": 4456.745394706726,
-        "z": "b31344e1.6b9228",
+        "x": 3047.02725982666,
+        "y": 4453.745394706726,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b15a67ed.f1cb18",
+        "id": "cc8174a8.50b7f",
         "type": "set",
         "name": "set srcdstpnf-name",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
         "comments": "",
-        "x": 3712,
-        "y": 2562,
-        "z": "b31344e1.6b9228",
+        "x": 3691,
+        "y": 2559,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "e4fb52b5.f04798",
+        "id": "90db4521.56089",
         "type": "get-resource",
         "name": "get-resource tmp.srcdstpnf-name",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3756,
-        "y": 2610,
-        "z": "b31344e1.6b9228",
+        "x": 3735,
+        "y": 2607,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "38280842.8f481",
-                "762394a6.8c9edc",
-                "bf6967d.9863518"
+                "3240cb0e.b7a8d4",
+                "f04379f7.8df68",
+                "3ab1dbdc.5ba7f4"
             ]
         ]
     },
     {
-        "id": "38280842.8f481",
+        "id": "3240cb0e.b7a8d4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3968.5,
-        "y": 2557,
-        "z": "b31344e1.6b9228",
+        "x": 3947.5,
+        "y": 2554,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7c3bab6c.40727c"
+                "e8a8f72b.6c9a08"
             ]
         ]
     },
     {
-        "id": "762394a6.8c9edc",
+        "id": "f04379f7.8df68",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3980.5,
-        "y": 2607,
-        "z": "b31344e1.6b9228",
+        "x": 3959.5,
+        "y": 2604,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "9fa14d44.80429"
+                "b12e923.fc82e7"
             ]
         ]
     },
     {
-        "id": "bf6967d.9863518",
+        "id": "3ab1dbdc.5ba7f4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3971.5,
-        "y": 2662,
-        "z": "b31344e1.6b9228",
+        "x": 3950.5,
+        "y": 2659,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "e6f16a7e.5e034"
+                "582f59ae.92f2a8"
             ]
         ]
     },
     {
-        "id": "e6f16a7e.5e034",
+        "id": "582f59ae.92f2a8",
         "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": 4116.5,
-        "y": 2661,
-        "z": "b31344e1.6b9228",
+        "x": 4095.5,
+        "y": 2658,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "9fa14d44.80429",
+        "id": "b12e923.fc82e7",
         "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": 4127.5,
-        "y": 2604,
-        "z": "b31344e1.6b9228",
+        "x": 4106.5,
+        "y": 2601,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "7c3bab6c.40727c",
+        "id": "e8a8f72b.6c9a08",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4093.8824462890625,
-        "y": 2550.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 4072.8824462890625,
+        "y": 2547.6556701660156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "3ada39cb.077d7e"
+                "212a31bf.dceac6"
             ]
         ]
     },
     {
-        "id": "79f49c03.b31834",
+        "id": "935dfeb6.9be7f8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4653,
-        "y": 2569,
-        "z": "b31344e1.6b9228",
+        "x": 4632,
+        "y": 2566,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b38ec96c.50bcb"
+                "1328892f.88f617"
             ]
         ]
     },
     {
-        "id": "b38ec96c.50bcb",
+        "id": "1328892f.88f617",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4830,
-        "y": 2561,
-        "z": "b31344e1.6b9228",
+        "x": 4809,
+        "y": 2558,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b25407c2.fe4e9",
-                "76abd2d6.8cf2bc"
+                "6a8226d0.94ebf",
+                "3a8b4f5e.be2aa8"
             ]
         ]
     },
     {
-        "id": "3ada39cb.077d7e",
+        "id": "212a31bf.dceac6",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4255,
-        "y": 2565,
-        "z": "b31344e1.6b9228",
+        "x": 4234,
+        "y": 2562,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "631c6ac2.9b4684"
+                "384efd0c.a6d9aa"
             ]
         ]
     },
     {
-        "id": "631c6ac2.9b4684",
+        "id": "384efd0c.a6d9aa",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4450,
-        "y": 2565,
-        "z": "b31344e1.6b9228",
+        "x": 4429,
+        "y": 2562,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "79f49c03.b31834"
+                "935dfeb6.9be7f8"
             ]
         ]
     },
     {
-        "id": "76abd2d6.8cf2bc",
+        "id": "3a8b4f5e.be2aa8",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5038,
-        "y": 2568,
-        "z": "b31344e1.6b9228",
+        "x": 5017,
+        "y": 2565,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b500a3b6.711188",
-                "e4ff3e60.96d148",
-                "ef9c5a3.20232a8"
+                "a2f18412.fa34",
+                "938b13a9.db22e",
+                "e46fd8a5.7a34e8"
             ]
         ]
     },
     {
-        "id": "b25407c2.fe4e9",
+        "id": "6a8226d0.94ebf",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5068,
-        "y": 2516,
-        "z": "b31344e1.6b9228",
+        "x": 5047,
+        "y": 2513,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "b500a3b6.711188",
+        "id": "a2f18412.fa34",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5248,
-        "y": 2559,
-        "z": "b31344e1.6b9228",
+        "x": 5227,
+        "y": 2556,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "8c9a0f1.a2e9b7"
+                "dfc55645.4078e"
             ]
         ]
     },
     {
-        "id": "e4ff3e60.96d148",
+        "id": "938b13a9.db22e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5240,
-        "y": 2614,
-        "z": "b31344e1.6b9228",
+        "x": 5219,
+        "y": 2611,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "7d5ba752.0bac28"
+                "ad8534e.8f07fc8"
             ]
         ]
     },
     {
-        "id": "ef9c5a3.20232a8",
+        "id": "e46fd8a5.7a34e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5245,
-        "y": 2671,
-        "z": "b31344e1.6b9228",
+        "x": 5224,
+        "y": 2668,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "5979580a.e6b1f8"
+                "292bb9fe.d0f886"
             ]
         ]
     },
     {
-        "id": "5979580a.e6b1f8",
+        "id": "292bb9fe.d0f886",
         "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": 5397,
-        "y": 2672,
-        "z": "b31344e1.6b9228",
+        "x": 5376,
+        "y": 2669,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "7d5ba752.0bac28",
+        "id": "ad8534e.8f07fc8",
         "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": 5408,
-        "y": 2617,
-        "z": "b31344e1.6b9228",
+        "x": 5387,
+        "y": 2614,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "8c9a0f1.a2e9b7",
+        "id": "dfc55645.4078e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5392.38232421875,
-        "y": 2556.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 5371.38232421875,
+        "y": 2553.6556701660156,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "b4fe40f1.fee308"
+                "295d998d.b4f986"
             ]
         ]
     },
     {
-        "id": "b4fe40f1.fee308",
+        "id": "295d998d.b4f986",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5607,
-        "y": 2553,
-        "z": "b31344e1.6b9228",
+        "x": 5586,
+        "y": 2550,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "557999e1.77dcb",
+        "id": "8dfa636a.7429d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2223,
-        "y": 4320,
-        "z": "b31344e1.6b9228",
+        "x": 2202,
+        "y": 4317,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f7f46916.4f1ee",
-                "5a129ea2.020ec"
+                "da3d1785.252e3",
+                "a54ce659.29b108"
             ]
         ]
     },
     {
-        "id": "f5263d8c.0dd66",
+        "id": "7bd1d477.e03354",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3726,
-        "y": 2779,
-        "z": "b31344e1.6b9228",
+        "x": 3705,
+        "y": 2776,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "cb45f40e.c4e9f",
-                "686c2e71.b364f8"
+                "3ed7d0cf.bd363",
+                "60e3c11b.60b2b8"
             ]
         ]
     },
     {
-        "id": "cb45f40e.c4e9f",
+        "id": "3ed7d0cf.bd363",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3927,
-        "y": 2777,
-        "z": "b31344e1.6b9228",
+        "x": 3906,
+        "y": 2774,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "906b7761.ec3cf"
+                "c5282b2e.c25f08"
             ]
         ]
     },
     {
-        "id": "906b7761.ec3cf",
+        "id": "7fc9a02.f9a08e",
         "type": "set",
-        "name": "set attachment_param domain A",
-        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
+        "name": "set pce-src-node",
+        "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 4141,
-        "y": 2779,
-        "z": "b31344e1.6b9228",
+        "x": 4187,
+        "y": 2724,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "bb50949c.2c4e68",
+        "id": "6fcb3e30.7095c8",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4144,
-        "y": 2828,
-        "z": "b31344e1.6b9228",
+        "x": 4123,
+        "y": 2825,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "f9f184f6.8f0c58",
-                "b1eb5cf.84b33a"
+                "65a08e4c.a1dc",
+                "640adf38.eff8b"
             ]
         ]
     },
     {
-        "id": "f9f184f6.8f0c58",
+        "id": "65a08e4c.a1dc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4374,
-        "y": 2824,
-        "z": "b31344e1.6b9228",
+        "x": 4353,
+        "y": 2821,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "ea46128e.0ba028"
+                "4413ca18.7ca70c"
             ]
         ]
     },
     {
-        "id": "ea46128e.0ba028",
+        "id": "8da31065.a87e4",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
         "comments": "",
-        "x": 4588,
-        "y": 2827,
-        "z": "b31344e1.6b9228",
+        "x": 4690,
+        "y": 2765,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "686c2e71.b364f8",
+        "id": "60e3c11b.60b2b8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3927,
-        "y": 2826,
-        "z": "b31344e1.6b9228",
+        "x": 3906,
+        "y": 2823,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "bb50949c.2c4e68"
+                "6fcb3e30.7095c8"
             ]
         ]
     },
     {
-        "id": "b1eb5cf.84b33a",
+        "id": "640adf38.eff8b",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4375,
-        "y": 2870,
-        "z": "b31344e1.6b9228",
+        "x": 4354,
+        "y": 2867,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "591dd2d5.72937c"
+                "7faf9acd.559b34"
             ]
         ]
     },
     {
-        "id": "591dd2d5.72937c",
+        "id": "7faf9acd.559b34",
         "type": "set",
         "name": "set attachment_param domain G",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 4589,
-        "y": 2870,
-        "z": "b31344e1.6b9228",
+        "x": 4568,
+        "y": 2867,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "b41cf773.b97ef",
+        "id": "9723f206.45f868",
         "type": "set",
         "name": "set tmp.slicevpns",
         "xml": "<set>\n<parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n<parameter name='tmp.slicevpns_length' value=\"`$tmp.slicevpns_length + 1`\" />\n\n<parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n\n",
         "comments": "",
-        "x": 4487,
-        "y": 2919,
-        "z": "b31344e1.6b9228",
+        "x": 4466,
+        "y": 2916,
+        "z": "cd8c161.e76ffe8",
         "wires": []
     },
     {
-        "id": "9baaaca4.d54a4",
+        "id": "b29ba493.8896c8",
         "type": "switchNode",
         "name": "switch vpnuuid is for this slice",
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.aai.service-instance.service-instance-id `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3051,
-        "y": 4143,
-        "z": "b31344e1.6b9228",
+        "x": 3030,
+        "y": 4140,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "cb64ffb8.43ead",
-                "d4b6930e.5ef778"
+                "174edd69.713c5b",
+                "af581154.4e753"
             ]
         ]
     },
     {
-        "id": "cb64ffb8.43ead",
+        "id": "174edd69.713c5b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3268,
-        "y": 4122,
-        "z": "b31344e1.6b9228",
+        "x": 3247,
+        "y": 4119,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "2504214d.099dbe"
+                "53925b1.87893a4"
             ]
         ]
     },
     {
-        "id": "d4b6930e.5ef778",
+        "id": "af581154.4e753",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3268,
-        "y": 4171,
-        "z": "b31344e1.6b9228",
+        "x": 3247,
+        "y": 4168,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2504214d.099dbe",
+        "id": "53925b1.87893a4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3436,
-        "y": 4122,
-        "z": "b31344e1.6b9228",
+        "x": 3415,
+        "y": 4119,
+        "z": "cd8c161.e76ffe8",
+        "wires": [
+            [
+                "14ccf193.a7ba36",
+                "4aa9ee27.313a08"
+            ]
+        ]
+    },
+    {
+        "id": "2f0ddb5a.e806c4",
+        "type": "set",
+        "name": "set attachment_param domain A",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
+        "comments": "",
+        "x": 4242,
+        "y": 2771,
+        "z": "cd8c161.e76ffe8",
+        "wires": []
+    },
+    {
+        "id": "c5282b2e.c25f08",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4030,
+        "y": 2765,
+        "z": "cd8c161.e76ffe8",
+        "wires": [
+            [
+                "2f0ddb5a.e806c4"
+            ]
+        ]
+    },
+    {
+        "id": "60f94c1c.9e2504",
+        "type": "set",
+        "name": "set pce-src-node",
+        "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",
+        "comments": "",
+        "x": 4642,
+        "y": 2813,
+        "z": "cd8c161.e76ffe8",
+        "wires": []
+    },
+    {
+        "id": "4413ca18.7ca70c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4486,
+        "y": 2797,
+        "z": "cd8c161.e76ffe8",
         "wires": [
             [
-                "ce29a297.cf1cb8",
-                "72392f69.a40338"
+                "8da31065.a87e4"
             ]
         ]
+    },
+    {
+        "id": "93c183ce.0a9ed8",
+        "type": "get-resource",
+        "name": "get-resource pnfs-list",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1972,
+        "y": 62,
+        "z": "cd8c161.e76ffe8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5d8a5506.b8ac8c",
+        "type": "get-resource",
+        "name": "get-resource logical-links",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1984,
+        "y": 103,
+        "z": "cd8c161.e76ffe8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "307d8c13.43fe3c",
+        "type": "comment",
+        "name": "The following two nodes are for PCE",
+        "info": "",
+        "comments": "",
+        "x": 2008,
+        "y": 25,
+        "z": "cd8c161.e76ffe8",
+        "wires": []
+    },
+    {
+        "id": "86333e24.199f7",
+        "type": "set",
+        "name": "set tmp.arr",
+        "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
+        "comments": "",
+        "x": 1929,
+        "y": 149,
+        "z": "cd8c161.e76ffe8",
+        "wires": []
+    },
+    {
+        "id": "63cf541.20dacac",
+        "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": 2615,
+        "y": 2432,
+        "z": "cd8c161.e76ffe8",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
index 594c3815..a03f1578 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "35adbdc5.188712",
+        "id": "aff24c57.82823",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 151,
-        "y": 71,
-        "z": "429f9ba7.310ba4",
+        "x": 137,
+        "y": 87,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "4297efa6.c41f88"
+                "cead96fb.e8dbd8"
             ]
         ]
     },
     {
-        "id": "4297efa6.c41f88",
+        "id": "cead96fb.e8dbd8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1024 +22,1024 @@
         "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": 282.2856903076172,
-        "y": 120.23810863494873,
-        "z": "429f9ba7.310ba4",
+        "x": 268.2856903076172,
+        "y": 136.23810863494873,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "2ad96203.21cf3e"
+                "f33f007a.ddfeb"
             ]
         ]
     },
     {
-        "id": "2ad96203.21cf3e",
+        "id": "f33f007a.ddfeb",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-deactivate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 285.4286193847656,
-        "y": 205.00003242492676,
-        "z": "429f9ba7.310ba4",
+        "x": 271.4286193847656,
+        "y": 221.00003242492676,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "c5e49e9b.1b684"
+                "c2692281.2e03c"
             ]
         ]
     },
     {
-        "id": "c5e49e9b.1b684",
+        "id": "c2692281.2e03c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 435.238037109375,
-        "y": 334.6666564941406,
-        "z": "429f9ba7.310ba4",
+        "x": 421.238037109375,
+        "y": 350.6666564941406,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "10e90581.65923a",
-                "8d427e09.40c998",
-                "2dc96b18.12e1c4"
+                "114b6c5d.64d20c",
+                "f27e6da1.6477",
+                "5bf17e9d.d43418"
             ]
         ]
     },
     {
-        "id": "10e90581.65923a",
+        "id": "114b6c5d.64d20c",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 709.5716552734375,
-        "y": 601.59716796875,
-        "z": "429f9ba7.310ba4",
+        "x": 695.5716552734375,
+        "y": 617.59716796875,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "dce41eb4.903f08",
+        "id": "f470d27.b1be9b",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 741,
-        "y": 276,
-        "z": "429f9ba7.310ba4",
+        "x": 727,
+        "y": 292,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "8d427e09.40c998",
+        "id": "f27e6da1.6477",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 761,
-        "y": 372,
-        "z": "429f9ba7.310ba4",
+        "x": 747,
+        "y": 388,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "97ab3694.d0f87",
-                "60789fd.ed86ae",
-                "353d8e4b.1a199a"
+                "7269ea10.8ecaa4",
+                "518c2c34.9a6a14",
+                "d42c62ff.6bda7"
             ]
         ]
     },
     {
-        "id": "97ab3694.d0f87",
+        "id": "7269ea10.8ecaa4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 980,
-        "y": 310,
-        "z": "429f9ba7.310ba4",
+        "x": 966,
+        "y": 326,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "8832c029.be5808"
+                "8e953b49.9b6fc"
             ]
         ]
     },
     {
-        "id": "60789fd.ed86ae",
+        "id": "518c2c34.9a6a14",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 989.490966796875,
-        "y": 352.57403564453125,
-        "z": "429f9ba7.310ba4",
+        "x": 975.490966796875,
+        "y": 368.57403564453125,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "2dd666f1.60f502"
+                "bbd8fc13.968688"
             ]
         ]
     },
     {
-        "id": "353d8e4b.1a199a",
+        "id": "d42c62ff.6bda7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 978,
-        "y": 399,
-        "z": "429f9ba7.310ba4",
+        "x": 964,
+        "y": 415,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "2d743c83.0345fc"
+                "67ddbb99.6b0b84"
             ]
         ]
     },
     {
-        "id": "2dd666f1.60f502",
+        "id": "bbd8fc13.968688",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1143.0623779296875,
-        "y": 355.8597717285156,
-        "z": "429f9ba7.310ba4",
+        "x": 1129.0623779296875,
+        "y": 371.8597717285156,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "2d743c83.0345fc",
+        "id": "67ddbb99.6b0b84",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1147,
-        "y": 400,
-        "z": "429f9ba7.310ba4",
+        "x": 1133,
+        "y": 416,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "8832c029.be5808",
+        "id": "8e953b49.9b6fc",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1177,
-        "y": 306,
-        "z": "429f9ba7.310ba4",
+        "x": 1163,
+        "y": 322,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "16acb367.7a1ddd"
+                "7bc604b0.a688bc"
             ]
         ]
     },
     {
-        "id": "16acb367.7a1ddd",
+        "id": "7bc604b0.a688bc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1400.33349609375,
-        "y": 305.99993896484375,
-        "z": "429f9ba7.310ba4",
+        "x": 1386.33349609375,
+        "y": 321.99993896484375,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "a7a6102a.ba70f"
+                "5063b203.704cc4"
             ]
         ]
     },
     {
-        "id": "a7a6102a.ba70f",
+        "id": "5063b203.704cc4",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1601.0001335144043,
-        "y": 307.00002098083496,
-        "z": "429f9ba7.310ba4",
+        "x": 1587.0001335144043,
+        "y": 323.00002098083496,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "792a8c98.1e353c"
+                "a9f2d74.cd545a8"
             ]
         ]
     },
     {
-        "id": "2dc96b18.12e1c4",
+        "id": "5bf17e9d.d43418",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 727,
-        "y": 320,
-        "z": "429f9ba7.310ba4",
+        "x": 713,
+        "y": 336,
+        "z": "973adb8c.e1e518",
         "wires": [
             []
         ]
     },
     {
-        "id": "792a8c98.1e353c",
+        "id": "a9f2d74.cd545a8",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1839,
-        "y": 309,
-        "z": "429f9ba7.310ba4",
+        "x": 1825,
+        "y": 325,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "e0088aed.90cab8",
-                "1c511732.20d971",
-                "948f74b1.a9b47"
+                "7c83a2e6.7b4dd4",
+                "a7cc478b.7d146",
+                "a8bc27c3.c77fc8"
             ]
         ]
     },
     {
-        "id": "e0088aed.90cab8",
+        "id": "7c83a2e6.7b4dd4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2047,
-        "y": 273,
-        "z": "429f9ba7.310ba4",
+        "x": 2033,
+        "y": 289,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "a90c3215.92b4f8"
+                "9d15862c.acb858"
             ]
         ]
     },
     {
-        "id": "1c511732.20d971",
+        "id": "a7cc478b.7d146",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2047.490966796875,
-        "y": 318.57403564453125,
-        "z": "429f9ba7.310ba4",
+        "x": 2033.490966796875,
+        "y": 334.57403564453125,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "4591cc1.5281eb4"
+                "c922168b.4d46c"
             ]
         ]
     },
     {
-        "id": "948f74b1.a9b47",
+        "id": "a8bc27c3.c77fc8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2045,
-        "y": 362,
-        "z": "429f9ba7.310ba4",
+        "x": 2031,
+        "y": 378,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "1ba65af4.0c86f5"
+                "b9e1cde3.aaa95"
             ]
         ]
     },
     {
-        "id": "4591cc1.5281eb4",
+        "id": "c922168b.4d46c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2210.0623779296875,
-        "y": 318.8597717285156,
-        "z": "429f9ba7.310ba4",
+        "x": 2196.0623779296875,
+        "y": 334.8597717285156,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "1ba65af4.0c86f5",
+        "id": "b9e1cde3.aaa95",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2214,
-        "y": 363,
-        "z": "429f9ba7.310ba4",
+        "x": 2200,
+        "y": 379,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "782d486c.7b38a",
+        "id": "2b1e22a1.17a9f6",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2520,
-        "y": 362,
-        "z": "429f9ba7.310ba4",
+        "x": 2506,
+        "y": 378,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "15707889.fb5fe7",
-                "3ccb184b.88e97",
-                "5e6c2e34.e2f08"
+                "18102e44.c2508a",
+                "21816052.be64e8",
+                "241de628.b25112"
             ]
         ]
     },
     {
-        "id": "d4d2edf0.a9661",
+        "id": "93757346.0f3e2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2904,
-        "y": 362,
-        "z": "429f9ba7.310ba4",
+        "x": 2890,
+        "y": 378,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "c5e1a2b5.98a7e",
-                "2ecd6ddc.b6312a",
-                "ac181d39.64071",
-                "31912d21.99f9da"
+                "77e4f011.15fc4",
+                "2c86ef39.d526a",
+                "76429f4b.07b2a8",
+                "6cc7e2bb.560604"
             ]
         ]
     },
     {
-        "id": "15707889.fb5fe7",
+        "id": "18102e44.c2508a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2731,
-        "y": 364,
-        "z": "429f9ba7.310ba4",
+        "x": 2717,
+        "y": 380,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "d4d2edf0.a9661"
+                "93757346.0f3e2"
             ]
         ]
     },
     {
-        "id": "3ccb184b.88e97",
+        "id": "21816052.be64e8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2731.490966796875,
-        "y": 409.57403564453125,
-        "z": "429f9ba7.310ba4",
+        "x": 2717.490966796875,
+        "y": 425.57403564453125,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "3858d983.a7895e"
+                "f6b9e29.dd4472"
             ]
         ]
     },
     {
-        "id": "5e6c2e34.e2f08",
+        "id": "241de628.b25112",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2729,
-        "y": 453,
-        "z": "429f9ba7.310ba4",
+        "x": 2715,
+        "y": 469,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "399a5685.b9c2da"
+                "d2d6733.abb0d9"
             ]
         ]
     },
     {
-        "id": "399a5685.b9c2da",
+        "id": "d2d6733.abb0d9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2896,
-        "y": 452,
-        "z": "429f9ba7.310ba4",
+        "x": 2882,
+        "y": 468,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "3858d983.a7895e",
+        "id": "f6b9e29.dd4472",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2894.0623779296875,
-        "y": 409.8597717285156,
-        "z": "429f9ba7.310ba4",
+        "x": 2880.0623779296875,
+        "y": 425.8597717285156,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "a90c3215.92b4f8",
+        "id": "9d15862c.acb858",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2248,
-        "y": 268,
-        "z": "429f9ba7.310ba4",
+        "x": 2234,
+        "y": 284,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "3cc76d7e.6842ea"
+                "732b4cc0.91b37c"
             ]
         ]
     },
     {
-        "id": "3cc76d7e.6842ea",
+        "id": "732b4cc0.91b37c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2453,
-        "y": 268,
-        "z": "429f9ba7.310ba4",
+        "x": 2439,
+        "y": 284,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "ff010487.c79c18"
+                "cb7e44a7.8a59"
             ]
         ]
     },
     {
-        "id": "ff010487.c79c18",
+        "id": "cb7e44a7.8a59",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2619,
-        "y": 268,
-        "z": "429f9ba7.310ba4",
+        "x": 2605,
+        "y": 284,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "157282a.839557d"
+                "3789a9eb.0ef24e"
             ]
         ]
     },
     {
-        "id": "157282a.839557d",
+        "id": "3789a9eb.0ef24e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2782,
-        "y": 268,
-        "z": "429f9ba7.310ba4",
+        "x": 2768,
+        "y": 284,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "782d486c.7b38a"
+                "2b1e22a1.17a9f6"
             ]
         ]
     },
     {
-        "id": "c5e1a2b5.98a7e",
+        "id": "77e4f011.15fc4",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 3119,
-        "y": 72,
-        "z": "429f9ba7.310ba4",
+        "x": 3105,
+        "y": 88,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "2ecd6ddc.b6312a",
+        "id": "2c86ef39.d526a",
         "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.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3145,
-        "y": 189,
-        "z": "429f9ba7.310ba4",
+        "x": 3131,
+        "y": 205,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "ca0e4afa.297db8",
-                "cbb19a06.cce2d",
-                "10037902.a01617"
+                "dca54f5.5973b3",
+                "fc504d63.ef84",
+                "13ebc65.3fdb33a"
             ]
         ]
     },
     {
-        "id": "ca0e4afa.297db8",
+        "id": "dca54f5.5973b3",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3340.5001220703125,
-        "y": 141,
-        "z": "429f9ba7.310ba4",
+        "x": 3326.5001220703125,
+        "y": 157,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "82598cca.05691"
+                "77882641.430388"
             ]
         ]
     },
     {
-        "id": "cbb19a06.cce2d",
+        "id": "fc504d63.ef84",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3332.5001220703125,
-        "y": 196,
-        "z": "429f9ba7.310ba4",
+        "x": 3318.5001220703125,
+        "y": 212,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "3a772cbc.39a31c"
+                "a8ee2b92.3df2"
             ]
         ]
     },
     {
-        "id": "82598cca.05691",
+        "id": "77882641.430388",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3484.8824462890625,
-        "y": 140.65567016601562,
-        "z": "429f9ba7.310ba4",
+        "x": 3470.8824462890625,
+        "y": 156.65567016601562,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "b1b02bec.6d78a8"
+                "cc921f58.3bd8b8"
             ]
         ]
     },
     {
-        "id": "b1b02bec.6d78a8",
+        "id": "cc921f58.3bd8b8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3669,
-        "y": 139,
-        "z": "429f9ba7.310ba4",
+        "x": 3655,
+        "y": 155,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "cda97533.ab0b4"
+                "72a85062.4c34f8"
             ]
         ]
     },
     {
-        "id": "cda97533.ab0b4",
+        "id": "72a85062.4c34f8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3864,
-        "y": 139,
-        "z": "429f9ba7.310ba4",
+        "x": 3850,
+        "y": 155,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "60c8c7.3864ef38"
+                "2455d1ba.682ede"
             ]
         ]
     },
     {
-        "id": "10037902.a01617",
+        "id": "13ebc65.3fdb33a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3337.5001220703125,
-        "y": 253,
-        "z": "429f9ba7.310ba4",
+        "x": 3323.5001220703125,
+        "y": 269,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "cae2235d.64e0e8"
+                "5ec35efc.fc0da8"
             ]
         ]
     },
     {
-        "id": "cae2235d.64e0e8",
+        "id": "5ec35efc.fc0da8",
         "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": 3489.5001220703125,
-        "y": 254,
-        "z": "429f9ba7.310ba4",
+        "x": 3475.5001220703125,
+        "y": 270,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "3a772cbc.39a31c",
+        "id": "a8ee2b92.3df2",
         "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": 3500.5001220703125,
-        "y": 197,
-        "z": "429f9ba7.310ba4",
+        "x": 3486.5001220703125,
+        "y": 213,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "3932cb1e.2bf12c",
+        "id": "c867d9b4.e35b28",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4452,
-        "y": 156,
-        "z": "429f9ba7.310ba4",
+        "x": 4438,
+        "y": 172,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "df685905.e165b",
-                "98483c83.1f67f",
-                "34f5861b.c6c222"
+                "d6e555b3.ae89f8",
+                "ff096fed.6932c",
+                "507b0c57.90eac4"
             ]
         ]
     },
     {
-        "id": "9b3be3e2.33ea88",
+        "id": "e8e1d1d2.3bd27",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4246,
-        "y": 143,
-        "z": "429f9ba7.310ba4",
+        "x": 4232,
+        "y": 159,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "8f73936e.04261",
-                "3932cb1e.2bf12c",
-                "dea89443.748068"
+                "984b6b80.85eb28",
+                "c867d9b4.e35b28",
+                "ad75bc9f.423928"
             ]
         ]
     },
     {
-        "id": "8f73936e.04261",
+        "id": "984b6b80.85eb28",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4482,
-        "y": 104,
-        "z": "429f9ba7.310ba4",
+        "x": 4468,
+        "y": 120,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "df685905.e165b",
+        "id": "d6e555b3.ae89f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4662,
-        "y": 147,
-        "z": "429f9ba7.310ba4",
+        "x": 4648,
+        "y": 163,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "6f3db9ae.c9f3c"
+                "c77140eb.28cae"
             ]
         ]
     },
     {
-        "id": "98483c83.1f67f",
+        "id": "ff096fed.6932c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4654,
-        "y": 202,
-        "z": "429f9ba7.310ba4",
+        "x": 4640,
+        "y": 218,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "deb93f9d.19a93"
+                "398208f1.a535d"
             ]
         ]
     },
     {
-        "id": "34f5861b.c6c222",
+        "id": "507b0c57.90eac4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4659,
-        "y": 259,
-        "z": "429f9ba7.310ba4",
+        "x": 4645,
+        "y": 275,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "e2596edd.60dea"
+                "5db92f44.b3b368"
             ]
         ]
     },
     {
-        "id": "e2596edd.60dea",
+        "id": "5db92f44.b3b368",
         "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": 4811,
-        "y": 260,
-        "z": "429f9ba7.310ba4",
+        "x": 4797,
+        "y": 276,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "deb93f9d.19a93",
+        "id": "398208f1.a535d",
         "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": 4822,
-        "y": 205,
-        "z": "429f9ba7.310ba4",
+        "x": 4808,
+        "y": 221,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "6f3db9ae.c9f3c",
+        "id": "c77140eb.28cae",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4806.38232421875,
-        "y": 144.65567016601562,
-        "z": "429f9ba7.310ba4",
+        "x": 4792.38232421875,
+        "y": 160.65567016601562,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "ba0d3a6b.6f8058"
+                "a91b7f99.6e2d28"
             ]
         ]
     },
     {
-        "id": "60c8c7.3864ef38",
+        "id": "2455d1ba.682ede",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4067,
-        "y": 143,
-        "z": "429f9ba7.310ba4",
+        "x": 4053,
+        "y": 159,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "9b3be3e2.33ea88"
+                "e8e1d1d2.3bd27"
             ]
         ]
     },
     {
-        "id": "ba0d3a6b.6f8058",
+        "id": "a91b7f99.6e2d28",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5021,
-        "y": 141,
-        "z": "429f9ba7.310ba4",
+        "x": 5007,
+        "y": 157,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "dea89443.748068",
+        "id": "ad75bc9f.423928",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4402,
-        "y": 220,
-        "z": "429f9ba7.310ba4",
+        "x": 4388,
+        "y": 236,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "ebf8dd2b.b4f9e8",
+        "id": "166b8d0a.b5831b",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3780,
-        "y": 569,
-        "z": "429f9ba7.310ba4",
+        "x": 3766,
+        "y": 585,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "aec92995.7e9f5",
-                "4c597ddc.e2cc64"
+                "b8398bf9.b49e9",
+                "27d2dbd5.61793c"
             ]
         ]
     },
     {
-        "id": "aec92995.7e9f5",
+        "id": "b8398bf9.b49e9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4126.5,
-        "y": 562,
-        "z": "429f9ba7.310ba4",
+        "x": 4112.5,
+        "y": 578,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "1a195df1.8c796a"
+                "3e628567.b7364a"
             ]
         ]
     },
     {
-        "id": "4c597ddc.e2cc64",
+        "id": "27d2dbd5.61793c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4130.5,
-        "y": 602,
-        "z": "429f9ba7.310ba4",
+        "x": 4116.5,
+        "y": 618,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "5902bc86.ae718c"
+                "7168ea95.0ebd84"
             ]
         ]
     },
     {
-        "id": "5902bc86.ae718c",
+        "id": "7168ea95.0ebd84",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4288,
-        "y": 602,
-        "z": "429f9ba7.310ba4",
+        "x": 4274,
+        "y": 618,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "a5eabc9d.2ead",
-                "845fd62d.b8a278"
+                "f83800f1.842c8",
+                "f7f5fb91.6043d8"
             ]
         ]
     },
     {
-        "id": "1a195df1.8c796a",
+        "id": "3e628567.b7364a",
         "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 delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4284.5,
-        "y": 562,
-        "z": "429f9ba7.310ba4",
+        "x": 4270.5,
+        "y": 578,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "a5eabc9d.2ead",
+        "id": "f83800f1.842c8",
         "type": "save",
         "name": "update vpn-binding resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4616.5,
-        "y": 602,
-        "z": "429f9ba7.310ba4",
+        "x": 4602.5,
+        "y": 618,
+        "z": "973adb8c.e1e518",
         "wires": [
             []
         ]
     },
     {
-        "id": "845fd62d.b8a278",
+        "id": "f7f5fb91.6043d8",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Deactivated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4543.5,
-        "y": 648,
-        "z": "429f9ba7.310ba4",
+        "x": 4529.5,
+        "y": 664,
+        "z": "973adb8c.e1e518",
         "wires": [
             []
         ]
     },
     {
-        "id": "ac181d39.64071",
+        "id": "76429f4b.07b2a8",
         "type": "execute",
         "name": "execute RestApiCallNode Delete OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\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": 3248,
-        "y": 456,
-        "z": "429f9ba7.310ba4",
+        "x": 3234,
+        "y": 472,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "2d9a43b7.aafd44",
-                "70183a3.2a6c244"
+                "a5d8b39e.03bbe",
+                "dd9b666a.742b78"
             ]
         ]
     },
     {
-        "id": "2d9a43b7.aafd44",
+        "id": "a5d8b39e.03bbe",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3580.5,
-        "y": 426,
-        "z": "429f9ba7.310ba4",
+        "x": 3566.5,
+        "y": 442,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "2ca3b71b.283058"
+                "2667a800.f5f9"
             ]
         ]
     },
     {
-        "id": "70183a3.2a6c244",
+        "id": "dd9b666a.742b78",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3585.5,
-        "y": 491,
-        "z": "429f9ba7.310ba4",
+        "x": 3571.5,
+        "y": 507,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "7560af7d.2c0028"
+                "91bc4eb8.d42b1"
             ]
         ]
     },
     {
-        "id": "2ca3b71b.283058",
+        "id": "2667a800.f5f9",
         "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 delete OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 3756.5,
-        "y": 426,
-        "z": "429f9ba7.310ba4",
+        "x": 3742.5,
+        "y": 442,
+        "z": "973adb8c.e1e518",
         "wires": []
     },
     {
-        "id": "7560af7d.2c0028",
+        "id": "91bc4eb8.d42b1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3752,
-        "y": 491,
-        "z": "429f9ba7.310ba4",
+        "x": 3738,
+        "y": 507,
+        "z": "973adb8c.e1e518",
         "wires": [
             []
         ]
     },
     {
-        "id": "31912d21.99f9da",
+        "id": "6cc7e2bb.560604",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3186,
-        "y": 591,
-        "z": "429f9ba7.310ba4",
+        "x": 3172,
+        "y": 607,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "8e1bec91.730a68",
-                "6d4b827f.139444"
+                "7c7f58f1.31378",
+                "4913f8dd.a3519"
             ]
         ]
     },
     {
-        "id": "6d4b827f.139444",
+        "id": "4913f8dd.a3519",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3439,
-        "y": 569,
-        "z": "429f9ba7.310ba4",
+        "x": 3425,
+        "y": 585,
+        "z": "973adb8c.e1e518",
         "wires": [
             [
-                "ebf8dd2b.b4f9e8"
+                "166b8d0a.b5831b"
             ]
         ]
     },
     {
-        "id": "8e1bec91.730a68",
+        "id": "7c7f58f1.31378",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3439,
-        "y": 625,
-        "z": "429f9ba7.310ba4",
+        "x": 3425,
+        "y": 641,
+        "z": "973adb8c.e1e518",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
index fc756b8b..1e28b050 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "5a4a886b.6438b8",
+        "id": "1ffbc02a.2de6d",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 118,
-        "y": 82,
-        "z": "d544e90d.c47ab8",
+        "x": 133,
+        "y": 76,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "2fc91b3e.7646fc"
+                "74e0b2b2.75108c"
             ]
         ]
     },
     {
-        "id": "2fc91b3e.7646fc",
+        "id": "74e0b2b2.75108c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1035 +22,1035 @@
         "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": 249.2856903076172,
-        "y": 131.23810863494873,
-        "z": "d544e90d.c47ab8",
+        "x": 264.2856903076172,
+        "y": 125.23810863494873,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "1c977ea2.89d1e9"
+                "f846ccbd.4406d8"
             ]
         ]
     },
     {
-        "id": "1c977ea2.89d1e9",
+        "id": "f846ccbd.4406d8",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-delete",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 252.42861938476562,
-        "y": 216.00003242492676,
-        "z": "d544e90d.c47ab8",
+        "x": 267.4286193847656,
+        "y": 210.00003242492676,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "8ce10b59.587f08"
+                "dc51143b.674018"
             ]
         ]
     },
     {
-        "id": "8ce10b59.587f08",
+        "id": "dc51143b.674018",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 402.238037109375,
-        "y": 345.6666564941406,
-        "z": "d544e90d.c47ab8",
+        "x": 417.238037109375,
+        "y": 339.6666564941406,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "c14a5da1.726bc8",
-                "f7f11593.991128",
-                "fbeb2897.5d3ca"
+                "45b2aaee.4a9d2c",
+                "3e78a125.3512fe",
+                "45ccee1d.26f07"
             ]
         ]
     },
     {
-        "id": "c14a5da1.726bc8",
+        "id": "45b2aaee.4a9d2c",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 698.5716552734375,
-        "y": 622.59716796875,
-        "z": "d544e90d.c47ab8",
+        "x": 713.5716552734375,
+        "y": 616.59716796875,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "86779e76.e7bc38",
+        "id": "9ea4d60.c51a0a8",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 730,
-        "y": 297,
-        "z": "d544e90d.c47ab8",
+        "x": 745,
+        "y": 291,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "f7f11593.991128",
+        "id": "3e78a125.3512fe",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n    \n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 750,
-        "y": 393,
-        "z": "d544e90d.c47ab8",
+        "x": 765,
+        "y": 387,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "6ad861a9.030e08",
-                "37e2fd06.c6c79a",
-                "2beeb8ca.34f3f"
+                "86ee6067.0c17a8",
+                "bf4bb2c3.815168",
+                "ac6196ae.1ef19"
             ]
         ]
     },
     {
-        "id": "6ad861a9.030e08",
+        "id": "86ee6067.0c17a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 969,
-        "y": 331,
-        "z": "d544e90d.c47ab8",
+        "x": 984,
+        "y": 325,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "c860abc6.0b576"
+                "eb95b4de.4ca18"
             ]
         ]
     },
     {
-        "id": "37e2fd06.c6c79a",
+        "id": "bf4bb2c3.815168",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 978.490966796875,
-        "y": 373.57403564453125,
-        "z": "d544e90d.c47ab8",
+        "x": 993.490966796875,
+        "y": 367.57403564453125,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "7a133195.09b68"
+                "4da0ff5c.9fdf8"
             ]
         ]
     },
     {
-        "id": "2beeb8ca.34f3f",
+        "id": "ac6196ae.1ef19",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 967,
-        "y": 420,
-        "z": "d544e90d.c47ab8",
+        "x": 982,
+        "y": 414,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "f9d75edb.c19d18"
+                "49170b5b.8b327c"
             ]
         ]
     },
     {
-        "id": "7a133195.09b68",
+        "id": "4da0ff5c.9fdf8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1132.0623779296875,
-        "y": 376.8597717285156,
-        "z": "d544e90d.c47ab8",
+        "x": 1147.0623779296875,
+        "y": 370.8597717285156,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "f9d75edb.c19d18",
+        "id": "49170b5b.8b327c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1136,
-        "y": 421,
-        "z": "d544e90d.c47ab8",
+        "x": 1151,
+        "y": 415,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "c860abc6.0b576",
+        "id": "eb95b4de.4ca18",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1166,
-        "y": 327,
-        "z": "d544e90d.c47ab8",
+        "x": 1181,
+        "y": 321,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "f376992c.11dc58"
+                "4f2c512c.91fb8"
             ]
         ]
     },
     {
-        "id": "f376992c.11dc58",
+        "id": "4f2c512c.91fb8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1389.33349609375,
-        "y": 326.99993896484375,
-        "z": "d544e90d.c47ab8",
+        "x": 1404.33349609375,
+        "y": 320.99993896484375,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "8db70c24.1a1f5"
+                "fa463b5.38a29c8"
             ]
         ]
     },
     {
-        "id": "8db70c24.1a1f5",
+        "id": "fa463b5.38a29c8",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1590.0001335144043,
-        "y": 328.00002098083496,
-        "z": "d544e90d.c47ab8",
+        "x": 1605.0001335144043,
+        "y": 322.00002098083496,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "5dc8f559.ac7c5c"
+                "e51d2b5.f353758"
             ]
         ]
     },
     {
-        "id": "fbeb2897.5d3ca",
+        "id": "45ccee1d.26f07",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 716,
-        "y": 341,
-        "z": "d544e90d.c47ab8",
+        "x": 731,
+        "y": 335,
+        "z": "e2fe7a53.da009",
         "wires": [
             []
         ]
     },
     {
-        "id": "5dc8f559.ac7c5c",
+        "id": "e51d2b5.f353758",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1828,
-        "y": 330,
-        "z": "d544e90d.c47ab8",
+        "x": 1843,
+        "y": 324,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "17e90170.66a2cf",
-                "46c095c4.314d14",
-                "64e3b5e2.26b114"
+                "bd96538d.fc9d98",
+                "d296a5a5.03f2d8",
+                "59d0b561.049ff4"
             ]
         ]
     },
     {
-        "id": "17e90170.66a2cf",
+        "id": "bd96538d.fc9d98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2036,
-        "y": 294,
-        "z": "d544e90d.c47ab8",
+        "x": 2051,
+        "y": 288,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "c90d8c84.a14a1"
+                "a935f75b.7b8ae8"
             ]
         ]
     },
     {
-        "id": "46c095c4.314d14",
+        "id": "d296a5a5.03f2d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2036.490966796875,
-        "y": 339.57403564453125,
-        "z": "d544e90d.c47ab8",
+        "x": 2051.490966796875,
+        "y": 333.57403564453125,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "3f9ff972.5c8816"
+                "b4d9ea13.dc5c6"
             ]
         ]
     },
     {
-        "id": "64e3b5e2.26b114",
+        "id": "59d0b561.049ff4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2034,
-        "y": 383,
-        "z": "d544e90d.c47ab8",
+        "x": 2049,
+        "y": 377,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "6b417e35.8fa86"
+                "cc59ead5.ab58f"
             ]
         ]
     },
     {
-        "id": "3f9ff972.5c8816",
+        "id": "b4d9ea13.dc5c6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2199.0623779296875,
-        "y": 339.8597717285156,
-        "z": "d544e90d.c47ab8",
+        "x": 2214.0623779296875,
+        "y": 333.8597717285156,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "6b417e35.8fa86",
+        "id": "cc59ead5.ab58f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2203,
-        "y": 384,
-        "z": "d544e90d.c47ab8",
+        "x": 2218,
+        "y": 378,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "62f4640b.361d2c",
+        "id": "2055e9c.9575d16",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2509,
-        "y": 383,
-        "z": "d544e90d.c47ab8",
+        "x": 2524,
+        "y": 377,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "41f800bd.97bbd8",
-                "3588ab7d.ccee3c",
-                "5014f1b1.a66d2"
+                "1719bc42.5de0cc",
+                "b2907373.b3b1a",
+                "fb17b477.f9109"
             ]
         ]
     },
     {
-        "id": "9b1454f6.71587",
+        "id": "c87f5113.e0af38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2893,
-        "y": 383,
-        "z": "d544e90d.c47ab8",
+        "x": 2908,
+        "y": 377,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "3ec88632.a3afda",
-                "ef2eaf52.5162b",
-                "74648c00.009a34",
-                "176c3740.91c4e1",
-                "a43ffa2e.f43268",
-                "b74320f6.969fd8",
-                "2043f8a6.e6867"
+                "1985ee34.d96bba",
+                "52698c53.01b1dc",
+                "6e17a44c.f8e15c",
+                "9562cdef.811fc8",
+                "51f18b3b.809efc",
+                "9405a159.40925",
+                "e776447c.da84c8"
             ]
         ]
     },
     {
-        "id": "41f800bd.97bbd8",
+        "id": "1719bc42.5de0cc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2720,
-        "y": 385,
-        "z": "d544e90d.c47ab8",
+        "x": 2735,
+        "y": 379,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "9b1454f6.71587"
+                "c87f5113.e0af38"
             ]
         ]
     },
     {
-        "id": "3588ab7d.ccee3c",
+        "id": "b2907373.b3b1a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2720.490966796875,
-        "y": 430.57403564453125,
-        "z": "d544e90d.c47ab8",
+        "x": 2735.490966796875,
+        "y": 424.57403564453125,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "f5b7e34a.e6a3a"
+                "34c1a665.03471a"
             ]
         ]
     },
     {
-        "id": "5014f1b1.a66d2",
+        "id": "fb17b477.f9109",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2718,
-        "y": 474,
-        "z": "d544e90d.c47ab8",
+        "x": 2733,
+        "y": 468,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "dad8e49f.e5f9b8"
+                "8d4bf215.03d04"
             ]
         ]
     },
     {
-        "id": "dad8e49f.e5f9b8",
+        "id": "8d4bf215.03d04",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2885,
-        "y": 473,
-        "z": "d544e90d.c47ab8",
+        "x": 2900,
+        "y": 467,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "f5b7e34a.e6a3a",
+        "id": "34c1a665.03471a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2883.0623779296875,
-        "y": 430.8597717285156,
-        "z": "d544e90d.c47ab8",
+        "x": 2898.0623779296875,
+        "y": 424.8597717285156,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "c90d8c84.a14a1",
+        "id": "a935f75b.7b8ae8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2237,
-        "y": 289,
-        "z": "d544e90d.c47ab8",
+        "x": 2252,
+        "y": 283,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "304af23b.91e62e"
+                "67091bed.864304"
             ]
         ]
     },
     {
-        "id": "304af23b.91e62e",
+        "id": "67091bed.864304",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2442,
-        "y": 289,
-        "z": "d544e90d.c47ab8",
+        "x": 2457,
+        "y": 283,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "a73bd099.6c0378"
+                "4e4ac25c.008624"
             ]
         ]
     },
     {
-        "id": "a73bd099.6c0378",
+        "id": "4e4ac25c.008624",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2608,
-        "y": 289,
-        "z": "d544e90d.c47ab8",
+        "x": 2623,
+        "y": 283,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "98e41266.eb692"
+                "7c62e56b.ccfd7c"
             ]
         ]
     },
     {
-        "id": "98e41266.eb692",
+        "id": "7c62e56b.ccfd7c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2771,
-        "y": 289,
-        "z": "d544e90d.c47ab8",
+        "x": 2786,
+        "y": 283,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "62f4640b.361d2c"
+                "2055e9c.9575d16"
             ]
         ]
     },
     {
-        "id": "3ec88632.a3afda",
+        "id": "1985ee34.d96bba",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 3108,
-        "y": 93,
-        "z": "d544e90d.c47ab8",
+        "x": 3123,
+        "y": 87,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "ef2eaf52.5162b",
+        "id": "52698c53.01b1dc",
         "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.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3134,
-        "y": 210,
-        "z": "d544e90d.c47ab8",
+        "x": 3149,
+        "y": 204,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "d4d69c61.a67388",
-                "cc6ec5bd.14d058",
-                "7b98c47b.75268c"
+                "df3dfd24.e7243",
+                "21f9901e.5c5cb",
+                "23d5d99c.1069c6"
             ]
         ]
     },
     {
-        "id": "d4d69c61.a67388",
+        "id": "df3dfd24.e7243",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3329.5001220703125,
-        "y": 162,
-        "z": "d544e90d.c47ab8",
+        "x": 3344.5001220703125,
+        "y": 156,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "6766d137.85bc78"
+                "b45e1015.15138"
             ]
         ]
     },
     {
-        "id": "cc6ec5bd.14d058",
+        "id": "21f9901e.5c5cb",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3321.5001220703125,
-        "y": 217,
-        "z": "d544e90d.c47ab8",
+        "x": 3336.5001220703125,
+        "y": 211,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "e5b8c6a7.d0685"
+                "77f6a688.81ce38"
             ]
         ]
     },
     {
-        "id": "6766d137.85bc78",
+        "id": "b45e1015.15138",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3473.8824462890625,
-        "y": 161.65567016601562,
-        "z": "d544e90d.c47ab8",
+        "x": 3488.8824462890625,
+        "y": 155.65567016601562,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "6ec2253c.e8e2fc"
+                "a3edca1c.ba087"
             ]
         ]
     },
     {
-        "id": "6ec2253c.e8e2fc",
+        "id": "a3edca1c.ba087",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3658,
-        "y": 160,
-        "z": "d544e90d.c47ab8",
+        "x": 3673,
+        "y": 154,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "8bfd549d.ff7578"
+                "db4aebfd.10c0f"
             ]
         ]
     },
     {
-        "id": "8bfd549d.ff7578",
+        "id": "db4aebfd.10c0f",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3853,
-        "y": 160,
-        "z": "d544e90d.c47ab8",
+        "x": 3868,
+        "y": 154,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "e0432128.bf189"
+                "47e44765.fd9158"
             ]
         ]
     },
     {
-        "id": "7b98c47b.75268c",
+        "id": "23d5d99c.1069c6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3326.5001220703125,
-        "y": 274,
-        "z": "d544e90d.c47ab8",
+        "x": 3341.5001220703125,
+        "y": 268,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "a0edf332.814bd"
+                "4952922a.0e6edc"
             ]
         ]
     },
     {
-        "id": "a0edf332.814bd",
+        "id": "4952922a.0e6edc",
         "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": 3478.5001220703125,
-        "y": 275,
-        "z": "d544e90d.c47ab8",
+        "x": 3493.5001220703125,
+        "y": 269,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "e5b8c6a7.d0685",
+        "id": "77f6a688.81ce38",
         "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": 3489.5001220703125,
-        "y": 218,
-        "z": "d544e90d.c47ab8",
+        "x": 3504.5001220703125,
+        "y": 212,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "e1454ec0.76085",
+        "id": "fa4dfe6b.cee79",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4441,
-        "y": 177,
-        "z": "d544e90d.c47ab8",
+        "x": 4456,
+        "y": 171,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "d8d8f637.323998",
-                "a47d1ee9.cdd92",
-                "e6ec849b.7b7268"
+                "cbb209f7.a6664",
+                "74e5e9b0.d9729",
+                "a328bb91.cda89"
             ]
         ]
     },
     {
-        "id": "682b00ad.3f22e",
+        "id": "3f03e2fb.b5f81e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4235,
-        "y": 164,
-        "z": "d544e90d.c47ab8",
+        "x": 4250,
+        "y": 158,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "e9dde318.2ce9c8",
-                "e1454ec0.76085",
-                "d1046ced.fbcef8"
+                "8d9a188f.1a7a4",
+                "fa4dfe6b.cee79",
+                "920b64ba.47efa"
             ]
         ]
     },
     {
-        "id": "e9dde318.2ce9c8",
+        "id": "8d9a188f.1a7a4",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4471,
-        "y": 125,
-        "z": "d544e90d.c47ab8",
+        "x": 4486,
+        "y": 119,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "d8d8f637.323998",
+        "id": "cbb209f7.a6664",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4651,
-        "y": 168,
-        "z": "d544e90d.c47ab8",
+        "x": 4666,
+        "y": 162,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "d20b8026.ed11d"
+                "d166346a.002478"
             ]
         ]
     },
     {
-        "id": "a47d1ee9.cdd92",
+        "id": "74e5e9b0.d9729",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4643,
-        "y": 223,
-        "z": "d544e90d.c47ab8",
+        "x": 4658,
+        "y": 217,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "8f556dc3.062b5"
+                "73697be7.45641c"
             ]
         ]
     },
     {
-        "id": "e6ec849b.7b7268",
+        "id": "a328bb91.cda89",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4648,
-        "y": 280,
-        "z": "d544e90d.c47ab8",
+        "x": 4663,
+        "y": 274,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "c00b4c05.8ab27"
+                "482cf24f.1774ec"
             ]
         ]
     },
     {
-        "id": "c00b4c05.8ab27",
+        "id": "482cf24f.1774ec",
         "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": 4800,
-        "y": 281,
-        "z": "d544e90d.c47ab8",
+        "x": 4815,
+        "y": 275,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "8f556dc3.062b5",
+        "id": "73697be7.45641c",
         "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": 4811,
-        "y": 226,
-        "z": "d544e90d.c47ab8",
+        "x": 4826,
+        "y": 220,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "d20b8026.ed11d",
+        "id": "d166346a.002478",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4795.38232421875,
-        "y": 165.65567016601562,
-        "z": "d544e90d.c47ab8",
+        "x": 4810.38232421875,
+        "y": 159.65567016601562,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "3c8da8b7.eb2a3"
+                "2f421760.45d288"
             ]
         ]
     },
     {
-        "id": "e0432128.bf189",
+        "id": "47e44765.fd9158",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4056,
-        "y": 164,
-        "z": "d544e90d.c47ab8",
+        "x": 4071,
+        "y": 158,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "682b00ad.3f22e"
+                "3f03e2fb.b5f81e"
             ]
         ]
     },
     {
-        "id": "3c8da8b7.eb2a3",
+        "id": "2f421760.45d288",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5010,
-        "y": 162,
-        "z": "d544e90d.c47ab8",
+        "x": 5025,
+        "y": 156,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "d1046ced.fbcef8",
+        "id": "920b64ba.47efa",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4391,
-        "y": 241,
-        "z": "d544e90d.c47ab8",
+        "x": 4406,
+        "y": 235,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "b74320f6.969fd8",
+        "id": "9405a159.40925",
         "type": "execute",
         "name": "execute RestApiCallNode Delete transport slice without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url +  '/restconf/operations/ietf-optical-slice:deallocate-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.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`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3258,
-        "y": 508,
-        "z": "d544e90d.c47ab8",
+        "x": 3273,
+        "y": 502,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "5f11d071.d597d8",
-                "2c04f9a8.8e1bee"
+                "ecacf915.574818",
+                "e290fc99.96c1d8"
             ]
         ]
     },
     {
-        "id": "5f11d071.d597d8",
+        "id": "ecacf915.574818",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3601.5,
-        "y": 503,
-        "z": "d544e90d.c47ab8",
+        "x": 3616.5,
+        "y": 497,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "bc1a033f.a0f87"
+                "6c0fb618.3be698"
             ]
         ]
     },
     {
-        "id": "2c04f9a8.8e1bee",
+        "id": "e290fc99.96c1d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3605.5,
-        "y": 543,
-        "z": "d544e90d.c47ab8",
+        "x": 3620.5,
+        "y": 537,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "14490b55.121775"
+                "735428f1.2ceb3"
             ]
         ]
     },
     {
-        "id": "14490b55.121775",
+        "id": "735428f1.2ceb3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3763,
-        "y": 543,
-        "z": "d544e90d.c47ab8",
+        "x": 3778,
+        "y": 537,
+        "z": "e2fe7a53.da009",
         "wires": [
             []
         ]
     },
     {
-        "id": "bc1a033f.a0f87",
+        "id": "6c0fb618.3be698",
         "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 deallocate transport slice rest api\" />\n",
         "comments": "",
-        "x": 3759.5,
-        "y": 503,
-        "z": "d544e90d.c47ab8",
+        "x": 3774.5,
+        "y": 497,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "74648c00.009a34",
+        "id": "6e17a44c.f8e15c",
         "type": "set",
         "name": "set attachment_param for TN NSSSI deleteion in PNC",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 3234,
-        "y": 383,
-        "z": "d544e90d.c47ab8",
+        "x": 3249,
+        "y": 377,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "176c3740.91c4e1",
+        "id": "9562cdef.811fc8",
         "type": "save",
         "name": "delete connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3164,
-        "y": 818,
-        "z": "d544e90d.c47ab8",
+        "x": 3179,
+        "y": 812,
+        "z": "e2fe7a53.da009",
         "wires": [
             []
         ]
     },
     {
-        "id": "a43ffa2e.f43268",
+        "id": "51f18b3b.809efc",
         "type": "save",
         "name": "delete vpn-binding resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3160,
-        "y": 862,
-        "z": "d544e90d.c47ab8",
+        "x": 3175,
+        "y": 856,
+        "z": "e2fe7a53.da009",
         "wires": [
             []
         ]
     },
     {
-        "id": "2ee33a01.a56356",
+        "id": "9ec21c40.e14a88",
         "type": "execute",
         "name": "execute RestApiCallNode domain UNI deColoring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\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`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3744,
-        "y": 682,
-        "z": "d544e90d.c47ab8",
+        "x": 3759,
+        "y": 676,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "708d25c4.9f039c",
-                "9fd83c73.a107c"
+                "f05a4dc0.054df",
+                "f0f39295.b7b9a8"
             ]
         ]
     },
     {
-        "id": "9fd83c73.a107c",
+        "id": "f0f39295.b7b9a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4010,
-        "y": 662,
-        "z": "d544e90d.c47ab8",
+        "x": 4025,
+        "y": 656,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "a8d157b0.ef0838"
+                "b586e36a.93b3e8"
             ]
         ]
     },
     {
-        "id": "708d25c4.9f039c",
+        "id": "f05a4dc0.054df",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4011.000213623047,
-        "y": 712.9999094009399,
-        "z": "d544e90d.c47ab8",
+        "x": 4026.000213623047,
+        "y": 706.9999094009399,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "aa9d5dd.46a2da"
+                "67ce9419.db502c"
             ]
         ]
     },
     {
-        "id": "a8d157b0.ef0838",
+        "id": "b586e36a.93b3e8",
         "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 decoloring UNI rest api\" />\n",
         "comments": "",
-        "x": 4150.000247955322,
-        "y": 662.0000009536743,
-        "z": "d544e90d.c47ab8",
+        "x": 4165.000247955322,
+        "y": 656.0000009536743,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "aa9d5dd.46a2da",
+        "id": "67ce9419.db502c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4156.02725982666,
-        "y": 710.7453947067261,
-        "z": "d544e90d.c47ab8",
+        "x": 4171.02725982666,
+        "y": 704.7453947067261,
+        "z": "e2fe7a53.da009",
         "wires": [
             []
         ]
     },
     {
-        "id": "2043f8a6.e6867",
+        "id": "e776447c.da84c8",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3193,
-        "y": 699,
-        "z": "d544e90d.c47ab8",
+        "x": 3208,
+        "y": 693,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "f28924af.d151d",
-                "b67c4790.638238"
+                "a367a533.706f78",
+                "4d988de7.d09044"
             ]
         ]
     },
     {
-        "id": "b67c4790.638238",
+        "id": "4d988de7.d09044",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3431,
-        "y": 682,
-        "z": "d544e90d.c47ab8",
+        "x": 3446,
+        "y": 676,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "2ee33a01.a56356"
+                "9ec21c40.e14a88"
             ]
         ]
     },
     {
-        "id": "f28924af.d151d",
+        "id": "a367a533.706f78",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3443,
-        "y": 749,
-        "z": "d544e90d.c47ab8",
+        "x": 3458,
+        "y": 743,
+        "z": "e2fe7a53.da009",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.json
index 7f5f0f6d..f55ef066 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "ac624e71.e83e6",
+        "id": "874ff500.a76198",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 171,
-        "y": 64,
-        "z": "df5c2cef.29f798",
+        "x": 129,
+        "y": 77,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "64be4f08.6aea"
+                "d5019c0d.28df28"
             ]
         ]
     },
     {
-        "id": "64be4f08.6aea",
+        "id": "d5019c0d.28df28",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,5555 +22,5555 @@
         "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": 396.2856903076172,
-        "y": 138.23810863494873,
-        "z": "df5c2cef.29f798",
+        "x": 354.2856903076172,
+        "y": 151.23810863494873,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "f27e10ce.472c98"
+                "cf3663ab.d505b8"
             ]
         ]
     },
     {
-        "id": "f27e10ce.472c98",
+        "id": "cf3663ab.d505b8",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-modify",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-modify' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 402.42860412597656,
-        "y": 223.00003051757812,
-        "z": "df5c2cef.29f798",
+        "x": 360.42860412597656,
+        "y": 236.00003051757812,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "816a022.ba1e5"
+                "13ea815e.0d1c3f"
             ]
         ]
     },
     {
-        "id": "816a022.ba1e5",
+        "id": "13ea815e.0d1c3f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 772.238037109375,
-        "y": 247.66668701171875,
-        "z": "df5c2cef.29f798",
+        "x": 730.238037109375,
+        "y": 260.66668701171875,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "7291ffac.f47d98",
-                "5b16d7f3.f39658",
-                "984b7b53.1aa03"
+                "5ce9625d.05d25c",
+                "98411814.65c58",
+                "48043489.9f26f4"
             ]
         ]
     },
     {
-        "id": "7291ffac.f47d98",
+        "id": "5ce9625d.05d25c",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 1027.571533203125,
-        "y": 401.59698486328125,
-        "z": "df5c2cef.29f798",
+        "x": 985.571533203125,
+        "y": 414.59698486328125,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "5b16d7f3.f39658",
+        "id": "98411814.65c58",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
         "comments": "",
         "outputs": 1,
-        "x": 1095,
-        "y": 221,
-        "z": "df5c2cef.29f798",
+        "x": 1053,
+        "y": 234,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8db3edad.5b6268",
-                "958fc136.3797b8",
-                "401f18c4.3af048"
+                "899f7de0.012718",
+                "bf5ca541.5b386",
+                "44585e79.6d35d"
             ]
         ]
     },
     {
-        "id": "8db3edad.5b6268",
+        "id": "899f7de0.012718",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1320,
-        "y": 79,
-        "z": "df5c2cef.29f798",
+        "x": 1278,
+        "y": 92,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8cab1f9e.65c1d"
+                "63a35dfa.733074"
             ]
         ]
     },
     {
-        "id": "958fc136.3797b8",
+        "id": "bf5ca541.5b386",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1315.490966796875,
-        "y": 148.57403564453125,
-        "z": "df5c2cef.29f798",
+        "x": 1273.490966796875,
+        "y": 161.57403564453125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "cfcd4dd6.dea03"
+                "5ca7f827.5517"
             ]
         ]
     },
     {
-        "id": "401f18c4.3af048",
+        "id": "44585e79.6d35d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1304,
-        "y": 195,
-        "z": "df5c2cef.29f798",
+        "x": 1262,
+        "y": 208,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "d5a10454.2e80c"
+                "f51f087e.0d87d8"
             ]
         ]
     },
     {
-        "id": "8cab1f9e.65c1d",
+        "id": "63a35dfa.733074",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1559,
-        "y": 76,
-        "z": "df5c2cef.29f798",
+        "x": 1517,
+        "y": 89,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "70da458e.fda3bc",
-                "6f3a2217.99f894"
+                "8b5f7eec.f199b",
+                "d7dba561.3c951"
             ]
         ]
     },
     {
-        "id": "cfcd4dd6.dea03",
+        "id": "5ca7f827.5517",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1469.0623779296875,
-        "y": 151.85977172851562,
-        "z": "df5c2cef.29f798",
+        "x": 1427.0623779296875,
+        "y": 164.85977172851562,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "d5a10454.2e80c",
+        "id": "f51f087e.0d87d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1473,
-        "y": 196,
-        "z": "df5c2cef.29f798",
+        "x": 1431,
+        "y": 209,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "70da458e.fda3bc",
+        "id": "8b5f7eec.f199b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1772,
-        "y": 100,
-        "z": "df5c2cef.29f798",
+        "x": 1730,
+        "y": 113,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "bd2fd8a5.f00818"
+                "8ecf6cbb.a31c18"
             ]
         ]
     },
     {
-        "id": "6f3a2217.99f894",
+        "id": "d7dba561.3c951",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1774,
-        "y": 40,
-        "z": "df5c2cef.29f798",
+        "x": 1732,
+        "y": 53,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "37ce0108.16d956",
+        "id": "b7af42d7.d75c5",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1074,
-        "y": 109,
-        "z": "df5c2cef.29f798",
+        "x": 1032,
+        "y": 122,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "bd2fd8a5.f00818",
+        "id": "8ecf6cbb.a31c18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1757,
-        "y": 188,
-        "z": "df5c2cef.29f798",
+        "x": 1715,
+        "y": 201,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ec9312e3.eb3ca",
-                "9b47cb2b.81e09",
-                "adac8296.d1b27",
-                "77439122.61f0b"
+                "8f80cd4e.6bb588",
+                "1ad0a363.7d61cd",
+                "2ea54daa.f8c89a",
+                "19fc5975.9c891f"
             ]
         ]
     },
     {
-        "id": "e730d63c.e66e38",
+        "id": "4de4347b.ee4a6c",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />\n<!--<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-id`\" />-->\n\n\n",
         "comments": "",
-        "x": 4286,
-        "y": 789,
-        "z": "df5c2cef.29f798",
+        "x": 4244,
+        "y": 802,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "c64bfbc6.879f7",
+        "id": "195d5c42.a96a64",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='network-route-B' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
         "comments": "",
-        "x": 4287,
-        "y": 844,
-        "z": "df5c2cef.29f798",
+        "x": 4245,
+        "y": 857,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "ff867076.ee06e",
+        "id": "8f1217ff.70176",
         "type": "save",
         "name": "get allotted-resource from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2243,
-        "y": 239,
-        "z": "df5c2cef.29f798",
+        "x": 2201,
+        "y": 252,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "5403527b.88731c",
-                "8f1044d7.262e1",
-                "fca4f411.30d608"
+                "56c46d50.0cfc0c",
+                "c740637e.1508b",
+                "d63f588b.18e9"
             ]
         ]
     },
     {
-        "id": "5403527b.88731c",
+        "id": "56c46d50.0cfc0c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2459,
-        "y": 306,
-        "z": "df5c2cef.29f798",
+        "x": 2417,
+        "y": 319,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "c2edf5fc.e5137"
+                "576d8604.8f2d9"
             ]
         ]
     },
     {
-        "id": "8f1044d7.262e1",
+        "id": "c740637e.1508b",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2459.490966796875,
-        "y": 205.573974609375,
-        "z": "df5c2cef.29f798",
+        "x": 2417.490966796875,
+        "y": 218.573974609375,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "3217fee.d348a02"
+                "4e6f8b98.289464"
             ]
         ]
     },
     {
-        "id": "fca4f411.30d608",
+        "id": "d63f588b.18e9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2455,
-        "y": 255,
-        "z": "df5c2cef.29f798",
+        "x": 2413,
+        "y": 268,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "f1099938.4bc92"
+                "cf03fd08.161968"
             ]
         ]
     },
     {
-        "id": "3217fee.d348a02",
+        "id": "4e6f8b98.289464",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2637.0625,
-        "y": 205.8597412109375,
-        "z": "df5c2cef.29f798",
+        "x": 2595.0625,
+        "y": 218.8597412109375,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "f1099938.4bc92",
+        "id": "cf03fd08.161968",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2637,
-        "y": 255,
-        "z": "df5c2cef.29f798",
+        "x": 2595,
+        "y": 268,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "f5428168.15427",
+        "id": "520d2541.742f3c",
         "type": "save",
         "name": "get logical-link from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
         "comments": "",
         "outputs": 1,
-        "x": 3512,
-        "y": 760,
-        "z": "df5c2cef.29f798",
+        "x": 3470,
+        "y": 773,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "1fed7fd6.0c4fe",
-                "f8799fe1.4abef8",
-                "d188d9ec.71606"
+                "862d85b.a4a94f8",
+                "1732a1e5.237d0e",
+                "20df7142.af18a6"
             ]
         ]
     },
     {
-        "id": "1fed7fd6.0c4fe",
+        "id": "862d85b.a4a94f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3803.490966796875,
-        "y": 738.573974609375,
-        "z": "df5c2cef.29f798",
+        "x": 3761.490966796875,
+        "y": 751.573974609375,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ffec4368.f8ba48"
+                "b900c0cd.a71608"
             ]
         ]
     },
     {
-        "id": "f8799fe1.4abef8",
+        "id": "1732a1e5.237d0e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3792,
-        "y": 783,
-        "z": "df5c2cef.29f798",
+        "x": 3750,
+        "y": 796,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "151cf988.8ad956"
+                "b39978ef.c4e1"
             ]
         ]
     },
     {
-        "id": "ffec4368.f8ba48",
+        "id": "b900c0cd.a71608",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3952.0625,
-        "y": 738.8597412109375,
-        "z": "df5c2cef.29f798",
+        "x": 3910.0625,
+        "y": 751.8597412109375,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "151cf988.8ad956",
+        "id": "b39978ef.c4e1",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3951,
-        "y": 783,
-        "z": "df5c2cef.29f798",
+        "x": 3909,
+        "y": 796,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "d188d9ec.71606",
+        "id": "20df7142.af18a6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3798,
-        "y": 830,
-        "z": "df5c2cef.29f798",
+        "x": 3756,
+        "y": 843,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "8fff13f1.763be8",
+        "id": "b394b52b.88d4f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3952,
-        "y": 869,
-        "z": "df5c2cef.29f798",
+        "x": 3910,
+        "y": 882,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "e730d63c.e66e38",
-                "c64bfbc6.879f7",
-                "c69cbeca.4faa",
-                "2b820704.044208",
-                "beecbbd2.7ea1a8",
-                "a8912b98.c24c78",
-                "9445731f.f1b8",
-                "beaf21fd.396d98",
-                "2829cd3e.73ff62",
-                "7826fce9.171054",
-                "b9213dab.6d883"
+                "4de4347b.ee4a6c",
+                "195d5c42.a96a64",
+                "f201f9ee.69f46",
+                "922f6ba7.94fc9",
+                "5c94cc42.b4c6e4",
+                "898ec19e.6e281",
+                "f986e215.6b3c08",
+                "4e189d8f.8297c4",
+                "c6ccb3e9.91ea18",
+                "6963f6fb.4a135",
+                "40ae5836.eda238"
             ]
         ]
     },
     {
-        "id": "c69cbeca.4faa",
+        "id": "f201f9ee.69f46",
         "type": "save",
         "name": "get network-route-A from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-A'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-A\">",
         "comments": "",
         "outputs": 1,
-        "x": 4299,
-        "y": 912,
-        "z": "df5c2cef.29f798",
+        "x": 4257,
+        "y": 925,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "d9da27fc.f85c4",
-                "3045193c.0d7bae",
-                "76f3dd2f.3c28d4"
+                "84f44b11.dfd248",
+                "cde6943a.45f4c",
+                "c0c26e2b.b056f"
             ]
         ]
     },
     {
-        "id": "2b820704.044208",
+        "id": "922f6ba7.94fc9",
         "type": "save",
         "name": "get network-route-B from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-B'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-B\">",
         "comments": "",
         "outputs": 1,
-        "x": 4278,
-        "y": 1513.9998779296875,
-        "z": "df5c2cef.29f798",
+        "x": 4236,
+        "y": 1526.9998779296875,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "25feaffc.acded8",
-                "26743549.dc4b22",
-                "ff50bd0e.ddbd08"
+                "13feb8ce.6f8f6f",
+                "6f75f930.e4c9a8",
+                "f4b40172.6e734"
             ]
         ]
     },
     {
-        "id": "d9da27fc.f85c4",
+        "id": "84f44b11.dfd248",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4500,
-        "y": 796,
-        "z": "df5c2cef.29f798",
+        "x": 4458,
+        "y": 809,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ba59ec84.99ac68"
+                "d5ccfec3.15cf68"
             ]
         ]
     },
     {
-        "id": "3045193c.0d7bae",
+        "id": "cde6943a.45f4c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4495.509033203125,
-        "y": 845.426025390625,
-        "z": "df5c2cef.29f798",
+        "x": 4453.509033203125,
+        "y": 858.426025390625,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ad41c558.00f2a8"
+                "83e64e5.e0d02b"
             ]
         ]
     },
     {
-        "id": "76f3dd2f.3c28d4",
+        "id": "c0c26e2b.b056f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4499.509033203125,
-        "y": 896.426025390625,
-        "z": "df5c2cef.29f798",
+        "x": 4457.509033203125,
+        "y": 909.426025390625,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ebc4d333.c786a8"
+                "fb264c22.bb1ad8"
             ]
         ]
     },
     {
-        "id": "ba59ec84.99ac68",
+        "id": "d5ccfec3.15cf68",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4648.571533203125,
-        "y": 795.2857666015625,
-        "z": "df5c2cef.29f798",
+        "x": 4606.571533203125,
+        "y": 808.2857666015625,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "ad41c558.00f2a8",
+        "id": "83e64e5.e0d02b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4638.509033203125,
-        "y": 845.426025390625,
-        "z": "df5c2cef.29f798",
+        "x": 4596.509033203125,
+        "y": 858.426025390625,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "25feaffc.acded8",
+        "id": "13feb8ce.6f8f6f",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4501,
-        "y": 1483.9998779296875,
-        "z": "df5c2cef.29f798",
+        "x": 4459,
+        "y": 1496.9998779296875,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "2bc46d17.93cc82"
+                "ff077827.d85f38"
             ]
         ]
     },
     {
-        "id": "26743549.dc4b22",
+        "id": "6f75f930.e4c9a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4496.509033203125,
-        "y": 1533.4259033203125,
-        "z": "df5c2cef.29f798",
+        "x": 4454.509033203125,
+        "y": 1546.4259033203125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "a64784dd.690338"
+                "509006fc.9b56c"
             ]
         ]
     },
     {
-        "id": "ff50bd0e.ddbd08",
+        "id": "f4b40172.6e734",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4500.509033203125,
-        "y": 1584.4259033203125,
-        "z": "df5c2cef.29f798",
+        "x": 4458.509033203125,
+        "y": 1597.4259033203125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "931306d1.d3283"
+                "43958ec8.7b7b1"
             ]
         ]
     },
     {
-        "id": "2bc46d17.93cc82",
+        "id": "ff077827.d85f38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4649.571533203125,
-        "y": 1483.28564453125,
-        "z": "df5c2cef.29f798",
+        "x": 4607.571533203125,
+        "y": 1496.28564453125,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "a64784dd.690338",
+        "id": "509006fc.9b56c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4639.509033203125,
-        "y": 1533.4259033203125,
-        "z": "df5c2cef.29f798",
+        "x": 4597.509033203125,
+        "y": 1546.4259033203125,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "1aed53b.116f82c",
+        "id": "5e4b48a2.ecf978",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5313.66650390625,
-        "y": 940,
-        "z": "df5c2cef.29f798",
+        "x": 5271.66650390625,
+        "y": 953,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "619a05cb.adfe5c",
-                "5b58ea0d.24a54c",
-                "905e3d50.55dc98",
-                "dd052d48.cba96",
-                "b7a8cd0a.a295c8"
+                "3d7f3635.a666da",
+                "5948d066.6a7168",
+                "363286ce.e60c2a",
+                "92d55b48.2c361",
+                "60b689f0.bdfe6"
             ]
         ]
     },
     {
-        "id": "ea57ed7c.15442",
+        "id": "8fdbb83e.80931",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5141,
-        "y": 941,
-        "z": "df5c2cef.29f798",
+        "x": 5099,
+        "y": 954,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "1aed53b.116f82c"
+                "5e4b48a2.ecf978"
             ]
         ]
     },
     {
-        "id": "8edf59fc.a82d48",
+        "id": "c2d11145.5c5cb",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5150.490966796875,
-        "y": 983.5740356445312,
-        "z": "df5c2cef.29f798",
+        "x": 5108.490966796875,
+        "y": 996.5740356445312,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "570ecccd.bd6704"
+                "f49eb8b9.2e621"
             ]
         ]
     },
     {
-        "id": "e1f5e0a7.fbe22",
+        "id": "15000269.771dce",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5139,
-        "y": 1030,
-        "z": "df5c2cef.29f798",
+        "x": 5097,
+        "y": 1043,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "255c623d.471bfe"
+                "941ca63b.315eb8"
             ]
         ]
     },
     {
-        "id": "570ecccd.bd6704",
+        "id": "f49eb8b9.2e621",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 5304.0623779296875,
-        "y": 986.8597717285156,
-        "z": "df5c2cef.29f798",
+        "x": 5262.0623779296875,
+        "y": 999.8597717285156,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "255c623d.471bfe",
+        "id": "941ca63b.315eb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 5308,
-        "y": 1031,
-        "z": "df5c2cef.29f798",
+        "x": 5266,
+        "y": 1044,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "ebc4d333.c786a8",
+        "id": "fb264c22.bb1ad8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4661,
-        "y": 898,
-        "z": "df5c2cef.29f798",
+        "x": 4619,
+        "y": 911,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ea10d538.727c98",
-                "4657b647.55f63"
+                "eb451f8e.4fb418",
+                "bf3f1942.662798"
             ]
         ]
     },
     {
-        "id": "931306d1.d3283",
+        "id": "43958ec8.7b7b1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4651,
-        "y": 1585.9998779296875,
-        "z": "df5c2cef.29f798",
+        "x": 4609,
+        "y": 1598.9998779296875,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "43662fc0.4ec678",
-                "e3b7ca54.9f27e"
+                "e17370f4.daf058",
+                "42ee84a0.63aa24"
             ]
         ]
     },
     {
-        "id": "2f410c53.a9f8cc",
+        "id": "9695016a.9d52a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5281.66650390625,
-        "y": 1776,
-        "z": "df5c2cef.29f798",
+        "x": 5239.66650390625,
+        "y": 1789,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "70aaa8b7.fc83",
-                "935d2e0c.b95b5",
-                "a91261bc.f4013",
-                "f0d8d3fe.456d88",
-                "4a4ba10e.425478"
+                "798301ec.6e9398",
+                "e16e0955.66caa8",
+                "7dce5f2e.284a1",
+                "ff4b33a5.59c68",
+                "6468f05e.9836a8"
             ]
         ]
     },
     {
-        "id": "c5b9dba7.8bb408",
+        "id": "ae7e9c7a.b5cf4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5109,
-        "y": 1777,
-        "z": "df5c2cef.29f798",
+        "x": 5067,
+        "y": 1790,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "2f410c53.a9f8cc"
+                "9695016a.9d52a8"
             ]
         ]
     },
     {
-        "id": "6fce8e3b.c6c098",
+        "id": "ff1945a1.5b3fb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5118.490966796875,
-        "y": 1819.5740356445312,
-        "z": "df5c2cef.29f798",
+        "x": 5076.490966796875,
+        "y": 1832.5740356445312,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "67bae243.7edff4"
+                "1d67971d.5148d9"
             ]
         ]
     },
     {
-        "id": "f5f65108.ccf83",
+        "id": "11aaad7f.ae123b",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5107,
-        "y": 1866,
-        "z": "df5c2cef.29f798",
+        "x": 5065,
+        "y": 1879,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ec2da4a6.84f478"
+                "cd2d5016.41656"
             ]
         ]
     },
     {
-        "id": "67bae243.7edff4",
+        "id": "1d67971d.5148d9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 5272.0623779296875,
-        "y": 1822.8597717285156,
-        "z": "df5c2cef.29f798",
+        "x": 5230.0623779296875,
+        "y": 1835.8597717285156,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "ec2da4a6.84f478",
+        "id": "cd2d5016.41656",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 5276,
-        "y": 1867,
-        "z": "df5c2cef.29f798",
+        "x": 5234,
+        "y": 1880,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "619a05cb.adfe5c",
+        "id": "3d7f3635.a666da",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5578,
-        "y": 924,
-        "z": "df5c2cef.29f798",
+        "x": 5536,
+        "y": 937,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "5ef97752.07d688",
-                "c9edb813.b2e9a8"
+                "3cfd3bad.5a9524",
+                "5da469b2.dc3e8"
             ]
         ]
     },
     {
-        "id": "c9edb813.b2e9a8",
+        "id": "5da469b2.dc3e8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5801,
-        "y": 879,
-        "z": "df5c2cef.29f798",
+        "x": 5759,
+        "y": 892,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "c390e3ab.84675"
+                "688536c6.06de6"
             ]
         ]
     },
     {
-        "id": "5ef97752.07d688",
+        "id": "3cfd3bad.5a9524",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5803,
-        "y": 943,
-        "z": "df5c2cef.29f798",
+        "x": 5761,
+        "y": 956,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "32a44f9b.55b96"
+                "d7550296.6875"
             ]
         ]
     },
     {
-        "id": "c9427e8e.5d7928",
+        "id": "8343d32.4aa5eb",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
-        "x": 6136,
-        "y": 834,
-        "z": "df5c2cef.29f798",
+        "x": 6094,
+        "y": 847,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "32a44f9b.55b96",
+        "id": "d7550296.6875",
         "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": 5965,
-        "y": 939,
-        "z": "df5c2cef.29f798",
+        "x": 5923,
+        "y": 952,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "c390e3ab.84675",
+        "id": "688536c6.06de6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5966,
-        "y": 876,
-        "z": "df5c2cef.29f798",
+        "x": 5924,
+        "y": 889,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "bdd6ab52.9ce23",
-                "c9427e8e.5d7928"
+                "643d5e30.3c83d8",
+                "8343d32.4aa5eb"
             ]
         ]
     },
     {
-        "id": "bdd6ab52.9ce23",
+        "id": "643d5e30.3c83d8",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
         "comments": "",
-        "x": 6137,
-        "y": 942,
-        "z": "df5c2cef.29f798",
+        "x": 6095,
+        "y": 955,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "23e97c61.f4450c",
+        "id": "d03d942d.9c94e8",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 6138,
-        "y": 891,
-        "z": "df5c2cef.29f798",
+        "x": 6096,
+        "y": 904,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "905e3d50.55dc98",
+        "id": "363286ce.e60c2a",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5580,
-        "y": 1083,
-        "z": "df5c2cef.29f798",
+        "x": 5538,
+        "y": 1096,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "5b58ea0d.24a54c",
+        "id": "5948d066.6a7168",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainA",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5625,
-        "y": 993,
-        "z": "df5c2cef.29f798",
+        "x": 5583,
+        "y": 1006,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "b5028671.057418",
+        "id": "270e5bf.d3c68a4",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 5514,
-        "y": 1034,
-        "z": "df5c2cef.29f798",
+        "x": 5472,
+        "y": 1047,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "70aaa8b7.fc83",
+        "id": "798301ec.6e9398",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5568,
-        "y": 1780.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 5526,
+        "y": 1793.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "2f13a37c.a92d4c",
-                "1f784ca.d54b3b3"
+                "17eb4057.5c41d8",
+                "986119ae.163bd"
             ]
         ]
     },
     {
-        "id": "1f784ca.d54b3b3",
+        "id": "986119ae.163bd",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5791,
-        "y": 1735.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 5749,
+        "y": 1748.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "e1b624d9.9bbf38"
+                "554f229b.2ed824"
             ]
         ]
     },
     {
-        "id": "2f13a37c.a92d4c",
+        "id": "17eb4057.5c41d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5793,
-        "y": 1799.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 5751,
+        "y": 1812.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "4e43e07a.4a4518"
+                "e5820266.08c2b"
             ]
         ]
     },
     {
-        "id": "c9a078dc.2502f",
+        "id": "59292690.4b166",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 6126,
-        "y": 1693.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 6084,
+        "y": 1706.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "4e43e07a.4a4518",
+        "id": "e5820266.08c2b",
         "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": 5952,
-        "y": 1818.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 5910,
+        "y": 1831.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "e1b624d9.9bbf38",
+        "id": "554f229b.2ed824",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5956,
-        "y": 1732.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 5914,
+        "y": 1745.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "c9a078dc.2502f",
-                "99d11d48.4d4eb"
+                "59292690.4b166",
+                "a60da831.30b3f"
             ]
         ]
     },
     {
-        "id": "99d11d48.4d4eb",
+        "id": "a60da831.30b3f",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
         "comments": "",
-        "x": 6127,
-        "y": 1798.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 6085,
+        "y": 1811.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "9eaecf4d.e4667",
+        "id": "bb10fbc2.a10ec8",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 6122,
-        "y": 1747.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 6080,
+        "y": 1760.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "a91261bc.f4013",
+        "id": "7dce5f2e.284a1",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5570,
-        "y": 1939.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 5528,
+        "y": 1952.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "935d2e0c.b95b5",
+        "id": "e16e0955.66caa8",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5615,
-        "y": 1849.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 5573,
+        "y": 1862.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "469c34a1.af89cc",
+        "id": "a786769.ba9bd08",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 5504,
-        "y": 1887.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 5462,
+        "y": 1900.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "beecbbd2.7ea1a8",
+        "id": "5c94cc42.b4c6e4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4498,
-        "y": 2243,
-        "z": "df5c2cef.29f798",
+        "x": 4456,
+        "y": 2256,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "a8912b98.c24c78",
+        "id": "898ec19e.6e281",
         "type": "set",
         "name": "set attachment_param",
         "xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n\n<!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->\n",
         "comments": "",
-        "x": 4292,
-        "y": 2144,
-        "z": "df5c2cef.29f798",
+        "x": 4250,
+        "y": 2157,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "af47af84.110af8",
+        "id": "4cbb6f6d.e8bed",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "put proper values for src topology-id, node-id, ltp-id, etc (in domain A)\nand dst topology-id, node-id, ltp-id, etc (in domain B)",
         "comments": "",
-        "x": 4266,
-        "y": 2097,
-        "z": "df5c2cef.29f798",
+        "x": 4224,
+        "y": 2110,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "dd052d48.cba96",
+        "id": "92d55b48.2c361",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 5708,
-        "y": 1131,
-        "z": "df5c2cef.29f798",
+        "x": 5666,
+        "y": 1144,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "f0d8d3fe.456d88",
+        "id": "ff4b33a5.59c68",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 5697,
-        "y": 2004.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 5655,
+        "y": 2017.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "ae94a833.e2ef38",
+        "id": "c675da0b.5461c8",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 6752,
-        "y": 651,
-        "z": "df5c2cef.29f798",
+        "x": 6710,
+        "y": 664,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "c451b700.662738",
-                "ee68b795.c2a168",
-                "ace90efd.77ffe"
+                "bb4a9deb.45b028",
+                "7bfedf54.b55d88",
+                "d4dc18e1.4b9fa8"
             ]
         ]
     },
     {
-        "id": "c2edf5fc.e5137",
+        "id": "576d8604.8f2d9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2639,
-        "y": 306,
-        "z": "df5c2cef.29f798",
+        "x": 2597,
+        "y": 319,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "1ff347ef.e7b2e8"
+                "8047c637.b43eb"
             ]
         ]
     },
     {
-        "id": "7a5b73c3.f0d28c",
+        "id": "bcb352a5.999038",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1036.0001220703125,
-        "y": 701.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 994.0001220703125,
+        "y": 714.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ccbf1140.19585"
+                "77e7cd5a.50c41c"
             ]
         ]
     },
     {
-        "id": "b1e2d1e5.6e9708",
+        "id": "64e2c5c1.d42b2c",
         "type": "switchNode",
         "name": "switch allotted-resource.relationship-list not empty",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2202,
-        "y": 400,
-        "z": "df5c2cef.29f798",
+        "x": 2160,
+        "y": 413,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "7c767dcf.19dfdc",
-                "d51662bd.168b2"
+                "550b6611.97dc",
+                "d80de88d.6f84f"
             ]
         ]
     },
     {
-        "id": "d51662bd.168b2",
+        "id": "d80de88d.6f84f",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2523,
-        "y": 382,
-        "z": "df5c2cef.29f798",
+        "x": 2481,
+        "y": 395,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "7c767dcf.19dfdc",
+        "id": "550b6611.97dc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2505,
-        "y": 480,
-        "z": "df5c2cef.29f798",
+        "x": 2463,
+        "y": 493,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8418b8d3.470188"
+                "bcacdfd4.14c6d"
             ]
         ]
     },
     {
-        "id": "44cccb98.9e0bdc",
+        "id": "c443600d.94faa8",
         "type": "set",
         "name": "set the current logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n<parameter name='currLinkIsFound' value=\"false\" />\n\n\n",
         "comments": "",
-        "x": 1459,
-        "y": 604,
-        "z": "df5c2cef.29f798",
+        "x": 1417,
+        "y": 617,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "ccbf1140.19585",
+        "id": "77e7cd5a.50c41c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1213,
-        "y": 694,
-        "z": "df5c2cef.29f798",
+        "x": 1171,
+        "y": 707,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "44cccb98.9e0bdc",
-                "320f3490.61a614",
-                "32833f1a.e66008"
+                "c443600d.94faa8",
+                "adcb7aad.70c0d",
+                "7947ec90.0b2fbc"
             ]
         ]
     },
     {
-        "id": "98d74c6b.7ea498",
+        "id": "b29eb633.564108",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 4841,
-        "y": 903,
-        "z": "df5c2cef.29f798",
+        "x": 4799,
+        "y": 916,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "ea10d538.727c98",
+        "id": "eb451f8e.4fb418",
         "type": "save",
         "name": "get p-interface-src from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4884,
-        "y": 968,
-        "z": "df5c2cef.29f798",
+        "x": 4842,
+        "y": 981,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ea57ed7c.15442",
-                "8edf59fc.a82d48",
-                "e1f5e0a7.fbe22"
+                "8fdbb83e.80931",
+                "c2d11145.5c5cb",
+                "15000269.771dce"
             ]
         ]
     },
     {
-        "id": "43662fc0.4ec678",
+        "id": "e17370f4.daf058",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4881,
-        "y": 1812,
-        "z": "df5c2cef.29f798",
+        "x": 4839,
+        "y": 1825,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "c5b9dba7.8bb408",
-                "6fce8e3b.c6c098",
-                "f5f65108.ccf83"
+                "ae7e9c7a.b5cf4",
+                "ff1945a1.5b3fb8",
+                "11aaad7f.ae123b"
             ]
         ]
     },
     {
-        "id": "c2ae8d1a.02bb38",
+        "id": "dcd9fb09.ef46f8",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 4842,
-        "y": 1756,
-        "z": "df5c2cef.29f798",
+        "x": 4800,
+        "y": 1769,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "1ff347ef.e7b2e8",
+        "id": "8047c637.b43eb",
         "type": "save",
         "name": "get allotted-resource relationship from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2932,
-        "y": 253,
-        "z": "df5c2cef.29f798",
+        "x": 2890,
+        "y": 266,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "71f13357.4b37e4",
-                "12669306.d1641d",
-                "413b010a.53c048"
+                "d1511c62.9f2f08",
+                "1f77347e.42dfe4",
+                "64ec23f4.ba3244"
             ]
         ]
     },
     {
-        "id": "12669306.d1641d",
+        "id": "1f77347e.42dfe4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3205.490966796875,
-        "y": 145.573974609375,
-        "z": "df5c2cef.29f798",
+        "x": 3163.490966796875,
+        "y": 158.573974609375,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "d85757cb.be9398"
+                "45b306de.298a5"
             ]
         ]
     },
     {
-        "id": "d85757cb.be9398",
+        "id": "45b306de.298a5",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3383.0625,
-        "y": 145.8597412109375,
-        "z": "df5c2cef.29f798",
+        "x": 3341.0625,
+        "y": 158.8597412109375,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "413b010a.53c048",
+        "id": "64ec23f4.ba3244",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3201,
-        "y": 195,
-        "z": "df5c2cef.29f798",
+        "x": 3159,
+        "y": 208,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "5076f4c7.aca6dc"
+                "fd23c3a.05df04"
             ]
         ]
     },
     {
-        "id": "5076f4c7.aca6dc",
+        "id": "fd23c3a.05df04",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3383,
-        "y": 195,
-        "z": "df5c2cef.29f798",
+        "x": 3341,
+        "y": 208,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "71f13357.4b37e4",
+        "id": "d1511c62.9f2f08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3205,
-        "y": 246,
-        "z": "df5c2cef.29f798",
+        "x": 3163,
+        "y": 259,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "bf1d01a6.50c2b8"
+                "a1083b0f.8f91b8"
             ]
         ]
     },
     {
-        "id": "bf1d01a6.50c2b8",
+        "id": "a1083b0f.8f91b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3385,
-        "y": 246,
-        "z": "df5c2cef.29f798",
+        "x": 3343,
+        "y": 259,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "b1e2d1e5.6e9708"
+                "64e2c5c1.d42b2c"
             ]
         ]
     },
     {
-        "id": "23de1461.f7fad4",
+        "id": "1a6f80e4.595e77",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 811,
-        "y": 630,
-        "z": "df5c2cef.29f798",
+        "x": 769,
+        "y": 643,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "93fa809a.f8471"
+                "3a09f79.98a6388"
             ]
         ]
     },
     {
-        "id": "93fa809a.f8471",
+        "id": "3a09f79.98a6388",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1082,
-        "y": 626,
-        "z": "df5c2cef.29f798",
+        "x": 1040,
+        "y": 639,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "7a5b73c3.f0d28c"
+                "bcb352a5.999038"
             ]
         ]
     },
     {
-        "id": "9f0e5f06.ee06a8",
+        "id": "77ab35ed.5d2284",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3361,
-        "y": 444,
-        "z": "df5c2cef.29f798",
+        "x": 3319,
+        "y": 457,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "b98b1343.e21bb8"
+                "b58a3427.b81d38"
             ]
         ]
     },
     {
-        "id": "b98b1343.e21bb8",
+        "id": "b58a3427.b81d38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3537.9998779296875,
-        "y": 436.9998779296875,
-        "z": "df5c2cef.29f798",
+        "x": 3495.9998779296875,
+        "y": 449.9998779296875,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "9e9361de.0c104",
-                "8294dd76.04b2e8"
+                "362b1182.0bd166",
+                "6c82d6c3.fedf4"
             ]
         ]
     },
     {
-        "id": "9e9361de.0c104",
+        "id": "362b1182.0bd166",
         "type": "set",
         "name": "set the 1st network-policy-id",
         "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 3780.9998779296875,
-        "y": 393.9998779296875,
-        "z": "df5c2cef.29f798",
+        "x": 3738.9998779296875,
+        "y": 406.9998779296875,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "8294dd76.04b2e8",
+        "id": "6c82d6c3.fedf4",
         "type": "save",
         "name": "get network-policy from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
         "comments": "",
         "outputs": 1,
-        "x": 3769.9998779296875,
-        "y": 448.9998779296875,
-        "z": "df5c2cef.29f798",
+        "x": 3727.9998779296875,
+        "y": 461.9998779296875,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "95cd2e3f.fb2aa8",
-                "693c717a.beef58",
-                "f0a71170.4750e"
+                "1ff2fa25.6c9396",
+                "e4e601c1.f5d79",
+                "758d093f.dcc028"
             ]
         ]
     },
     {
-        "id": "f0a71170.4750e",
+        "id": "758d093f.dcc028",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4023,
-        "y": 335,
-        "z": "df5c2cef.29f798",
+        "x": 3981,
+        "y": 348,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "db1f3e72.2f054"
+                "a8089973.873718"
             ]
         ]
     },
     {
-        "id": "db1f3e72.2f054",
+        "id": "a8089973.873718",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4171.571533203125,
-        "y": 335.2857666015625,
-        "z": "df5c2cef.29f798",
+        "x": 4129.571533203125,
+        "y": 348.2857666015625,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "7ea2a2fb.50ff6c",
+        "id": "d2216009.d4e938",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4170.509033203125,
-        "y": 379.426025390625,
-        "z": "df5c2cef.29f798",
+        "x": 4128.509033203125,
+        "y": 392.426025390625,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "693c717a.beef58",
+        "id": "e4e601c1.f5d79",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4011.509033203125,
-        "y": 379.426025390625,
-        "z": "df5c2cef.29f798",
+        "x": 3969.509033203125,
+        "y": 392.426025390625,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "7ea2a2fb.50ff6c"
+                "d2216009.d4e938"
             ]
         ]
     },
     {
-        "id": "95cd2e3f.fb2aa8",
+        "id": "1ff2fa25.6c9396",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4018.509033203125,
-        "y": 458.426025390625,
-        "z": "df5c2cef.29f798",
+        "x": 3976.509033203125,
+        "y": 471.426025390625,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "bd36bdff.e88188"
+                "9a187669.a984"
             ]
         ]
     },
     {
-        "id": "bd36bdff.e88188",
+        "id": "9a187669.a984",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4157.509033203125,
-        "y": 458.426025390625,
-        "z": "df5c2cef.29f798",
+        "x": 4115.509033203125,
+        "y": 471.426025390625,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "643f567.bba5728",
-                "283fdbf8.9648a4"
+                "83c9fbd0.4ea53",
+                "9b904bff.ec9058"
             ]
         ]
     },
     {
-        "id": "643f567.bba5728",
+        "id": "83c9fbd0.4ea53",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4363,
-        "y": 456,
-        "z": "df5c2cef.29f798",
+        "x": 4321,
+        "y": 469,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "4657b647.55f63",
+        "id": "bf3f1942.662798",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4885,
-        "y": 638,
-        "z": "df5c2cef.29f798",
+        "x": 4843,
+        "y": 651,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "6871172e.d637a",
-                "b2977d1.b21a28"
+                "47a119b0.eb6fa8",
+                "52820edd.aa4a2"
             ]
         ]
     },
     {
-        "id": "b2977d1.b21a28",
+        "id": "52820edd.aa4a2",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5108,
-        "y": 624,
-        "z": "df5c2cef.29f798",
+        "x": 5066,
+        "y": 637,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "825034c4.107dc"
+                "7649e490.475914"
             ]
         ]
     },
     {
-        "id": "6871172e.d637a",
+        "id": "47a119b0.eb6fa8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5110,
-        "y": 657,
-        "z": "df5c2cef.29f798",
+        "x": 5068,
+        "y": 670,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "82e08e87.8dd7f"
+                "86cbcc23.726e88"
             ]
         ]
     },
     {
-        "id": "82e08e87.8dd7f",
+        "id": "86cbcc23.726e88",
         "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": 5253,
-        "y": 654,
-        "z": "df5c2cef.29f798",
+        "x": 5211,
+        "y": 667,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "825034c4.107dc",
+        "id": "7649e490.475914",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5256,
-        "y": 617,
-        "z": "df5c2cef.29f798",
+        "x": 5214,
+        "y": 630,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "c1e0b1e8.e0a1e",
-                "d9b3786f.e4ed38"
+                "ff121e57.29292",
+                "450151c8.427488"
             ]
         ]
     },
     {
-        "id": "c1e0b1e8.e0a1e",
+        "id": "ff121e57.29292",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 5418,
-        "y": 612,
-        "z": "df5c2cef.29f798",
+        "x": 5376,
+        "y": 625,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "e3b7ca54.9f27e",
+        "id": "42ee84a0.63aa24",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4899,
-        "y": 1474.9998779296875,
-        "z": "df5c2cef.29f798",
+        "x": 4857,
+        "y": 1487.9998779296875,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "f845da67.b2281",
-                "e9edfbfb.6ae668"
+                "1ca058bb.f36a17",
+                "11f9a295.aa46bd"
             ]
         ]
     },
     {
-        "id": "e9edfbfb.6ae668",
+        "id": "11f9a295.aa46bd",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5122,
-        "y": 1460.9998779296875,
-        "z": "df5c2cef.29f798",
+        "x": 5080,
+        "y": 1473.9998779296875,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "be966044.873a98"
+                "49fa7605.34063"
             ]
         ]
     },
     {
-        "id": "f845da67.b2281",
+        "id": "1ca058bb.f36a17",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5124,
-        "y": 1493.9998779296875,
-        "z": "df5c2cef.29f798",
+        "x": 5082,
+        "y": 1506.9998779296875,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "11abed66.7180bb"
+                "45cb9702.942408"
             ]
         ]
     },
     {
-        "id": "11abed66.7180bb",
+        "id": "45cb9702.942408",
         "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": 5267,
-        "y": 1490.9998779296875,
-        "z": "df5c2cef.29f798",
+        "x": 5225,
+        "y": 1503.9998779296875,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "be966044.873a98",
+        "id": "49fa7605.34063",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5270,
-        "y": 1453.9998779296875,
-        "z": "df5c2cef.29f798",
+        "x": 5228,
+        "y": 1466.9998779296875,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "79f40934.57e7e8",
-                "cf727f02.7a65a"
+                "875267c0.cfa878",
+                "15dbb018.1ec0a8"
             ]
         ]
     },
     {
-        "id": "79f40934.57e7e8",
+        "id": "875267c0.cfa878",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 5464,
-        "y": 1457,
-        "z": "df5c2cef.29f798",
+        "x": 5422,
+        "y": 1470,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "984b7b53.1aa03",
+        "id": "48043489.9f26f4",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1062,
-        "y": 161,
-        "z": "df5c2cef.29f798",
+        "x": 1020,
+        "y": 174,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "b7a8cd0a.a295c8",
+        "id": "60b689f0.bdfe6",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5532,
-        "y": 1208,
-        "z": "df5c2cef.29f798",
+        "x": 5490,
+        "y": 1221,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "e798551d.3d9488"
+                "d6de59ef.b305d8"
             ]
         ]
     },
     {
-        "id": "e798551d.3d9488",
+        "id": "d6de59ef.b305d8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5738,
-        "y": 1208,
-        "z": "df5c2cef.29f798",
+        "x": 5696,
+        "y": 1221,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ac96ab38.3de338"
+                "8fe7cd4d.34b2f"
             ]
         ]
     },
     {
-        "id": "ac96ab38.3de338",
+        "id": "8fe7cd4d.34b2f",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5953.28564453125,
-        "y": 1207.82177734375,
-        "z": "df5c2cef.29f798",
+        "x": 5911.28564453125,
+        "y": 1220.82177734375,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "5414c400.9dc3ac"
+                "a0e0dfef.59beb"
             ]
         ]
     },
     {
-        "id": "5414c400.9dc3ac",
+        "id": "a0e0dfef.59beb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6160.1171875,
-        "y": 1208.34033203125,
-        "z": "df5c2cef.29f798",
+        "x": 6118.1171875,
+        "y": 1221.34033203125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "81a82367.d6151",
-                "2f9bf799.a13628",
-                "18b69352.36c53d"
+                "2cceafd0.237718",
+                "c79a44fd.7a419",
+                "b0ce172f.4e793"
             ]
         ]
     },
     {
-        "id": "81a82367.d6151",
+        "id": "2cceafd0.237718",
         "type": "set",
         "name": "set source ttp-id",
         "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6375.1171875,
-        "y": 1170.34033203125,
-        "z": "df5c2cef.29f798",
+        "x": 6333.1171875,
+        "y": 1183.34033203125,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "2f9bf799.a13628",
+        "id": "c79a44fd.7a419",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 6372.1171875,
-        "y": 1209.34033203125,
-        "z": "df5c2cef.29f798",
+        "x": 6330.1171875,
+        "y": 1222.34033203125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ab674828.77dd8"
+                "6b7d00f0.0adfa"
             ]
         ]
     },
     {
-        "id": "18b69352.36c53d",
+        "id": "b0ce172f.4e793",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6327.6171875,
-        "y": 1251.34033203125,
-        "z": "df5c2cef.29f798",
+        "x": 6285.6171875,
+        "y": 1264.34033203125,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "ab674828.77dd8",
+        "id": "6b7d00f0.0adfa",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6552.6171875,
-        "y": 1208.34033203125,
-        "z": "df5c2cef.29f798",
+        "x": 6510.6171875,
+        "y": 1221.34033203125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "2908f068.502838"
+                "646cdf92.8cc9e8"
             ]
         ]
     },
     {
-        "id": "2908f068.502838",
+        "id": "646cdf92.8cc9e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6710.6171875,
-        "y": 1208.34033203125,
-        "z": "df5c2cef.29f798",
+        "x": 6668.6171875,
+        "y": 1221.34033203125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "81bd3643.b73a3"
+                "6ef1cda7.04969c"
             ]
         ]
     },
     {
-        "id": "81bd3643.b73a3",
+        "id": "6ef1cda7.04969c",
         "type": "set",
         "name": "set source tunnel tp ip",
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 6917.6171875,
-        "y": 1208.34033203125,
-        "z": "df5c2cef.29f798",
+        "x": 6875.6171875,
+        "y": 1221.34033203125,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "4a4ba10e.425478",
+        "id": "6468f05e.9836a8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5529,
-        "y": 2077.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 5487,
+        "y": 2090.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "a847aa00.dd7a08"
+                "592b262a.d8a79"
             ]
         ]
     },
     {
-        "id": "a847aa00.dd7a08",
+        "id": "592b262a.d8a79",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5735,
-        "y": 2077.0001220703125,
-        "z": "df5c2cef.29f798",
+        "x": 5693,
+        "y": 2090.0001220703125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "49e71e1.8d9866"
+                "24f444c6.f34f94"
             ]
         ]
     },
     {
-        "id": "49e71e1.8d9866",
+        "id": "24f444c6.f34f94",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5950.28564453125,
-        "y": 2076.8218994140625,
-        "z": "df5c2cef.29f798",
+        "x": 5908.28564453125,
+        "y": 2089.8218994140625,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "5b5e6199.c314a"
+                "82538773.d9e69"
             ]
         ]
     },
     {
-        "id": "5b5e6199.c314a",
+        "id": "82538773.d9e69",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6157.1171875,
-        "y": 2077.3404541015625,
-        "z": "df5c2cef.29f798",
+        "x": 6115.1171875,
+        "y": 2090.3404541015625,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "278051a2.c31a16",
-                "9a637a3a.0233e8",
-                "2850c206.2136fe"
+                "f8555c72.503248",
+                "ccee56e4.07c16",
+                "c641b1.139d865"
             ]
         ]
     },
     {
-        "id": "278051a2.c31a16",
+        "id": "f8555c72.503248",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6372.1171875,
-        "y": 2039.3404541015625,
-        "z": "df5c2cef.29f798",
+        "x": 6330.1171875,
+        "y": 2052.3404541015625,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "9a637a3a.0233e8",
+        "id": "ccee56e4.07c16",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 6369.1171875,
-        "y": 2078.3404541015625,
-        "z": "df5c2cef.29f798",
+        "x": 6327.1171875,
+        "y": 2091.3404541015625,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ac430b92.d43478"
+                "c03544bc.a4758"
             ]
         ]
     },
     {
-        "id": "2850c206.2136fe",
+        "id": "c641b1.139d865",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6324.6171875,
-        "y": 2120.3404541015625,
-        "z": "df5c2cef.29f798",
+        "x": 6282.6171875,
+        "y": 2133.3404541015625,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "ac430b92.d43478",
+        "id": "c03544bc.a4758",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6549.6171875,
-        "y": 2077.3404541015625,
-        "z": "df5c2cef.29f798",
+        "x": 6507.6171875,
+        "y": 2090.3404541015625,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8753e537.7fd47"
+                "e9ccbcc0.192618"
             ]
         ]
     },
     {
-        "id": "8753e537.7fd47",
+        "id": "e9ccbcc0.192618",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6707.6171875,
-        "y": 2077.3404541015625,
-        "z": "df5c2cef.29f798",
+        "x": 6665.6171875,
+        "y": 2090.3404541015625,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "24ab912c.86e4be"
+                "8cb4312f.1b7fd"
             ]
         ]
     },
     {
-        "id": "24ab912c.86e4be",
+        "id": "8cb4312f.1b7fd",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 6914.6171875,
-        "y": 2077.3404541015625,
-        "z": "df5c2cef.29f798",
+        "x": 6872.6171875,
+        "y": 2090.3404541015625,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "d9b3786f.e4ed38",
+        "id": "450151c8.427488",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 5445,
-        "y": 684,
-        "z": "df5c2cef.29f798",
+        "x": 5403,
+        "y": 697,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8b5e8581.37f4d8",
-                "8910508f.b898c",
-                "40d489be.0b4bf"
+                "a23d1a8f.c26b88",
+                "378c450d.9f83ea",
+                "dfbd70ce.dcae1"
             ]
         ]
     },
     {
-        "id": "8b5e8581.37f4d8",
+        "id": "a23d1a8f.c26b88",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5640.5001220703125,
-        "y": 636,
-        "z": "df5c2cef.29f798",
+        "x": 5598.5001220703125,
+        "y": 649,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "687e1d5.e5b1be4"
+                "47f12a0.7fd7dd8"
             ]
         ]
     },
     {
-        "id": "8910508f.b898c",
+        "id": "378c450d.9f83ea",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5632.5001220703125,
-        "y": 691,
-        "z": "df5c2cef.29f798",
+        "x": 5590.5001220703125,
+        "y": 704,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "cb7280d2.6c252"
+                "aa90c931.1acf78"
             ]
         ]
     },
     {
-        "id": "40d489be.0b4bf",
+        "id": "dfbd70ce.dcae1",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5637.5001220703125,
-        "y": 748,
-        "z": "df5c2cef.29f798",
+        "x": 5595.5001220703125,
+        "y": 761,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ed16936d.de3ee8"
+                "23762cf6.ae956c"
             ]
         ]
     },
     {
-        "id": "ed16936d.de3ee8",
+        "id": "23762cf6.ae956c",
         "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": 5789.5001220703125,
-        "y": 749,
-        "z": "df5c2cef.29f798",
+        "x": 5747.5001220703125,
+        "y": 762,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "cb7280d2.6c252",
+        "id": "aa90c931.1acf78",
         "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": 5800.5001220703125,
-        "y": 694,
-        "z": "df5c2cef.29f798",
+        "x": 5758.5001220703125,
+        "y": 707,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "687e1d5.e5b1be4",
+        "id": "47f12a0.7fd7dd8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5784.8824462890625,
-        "y": 633.6556701660156,
-        "z": "df5c2cef.29f798",
+        "x": 5742.8824462890625,
+        "y": 646.6556701660156,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "38f57278.43482e"
+                "7098fc9f.d79a4c"
             ]
         ]
     },
     {
-        "id": "a206cef4.960698",
+        "id": "afa8e9ca.a2ff88",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6367,
-        "y": 652,
-        "z": "df5c2cef.29f798",
+        "x": 6325,
+        "y": 665,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "7575a6f9.99a6d8"
+                "fcbb91a5.b44ad8"
             ]
         ]
     },
     {
-        "id": "7575a6f9.99a6d8",
+        "id": "fcbb91a5.b44ad8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6544,
-        "y": 644,
-        "z": "df5c2cef.29f798",
+        "x": 6502,
+        "y": 657,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "54e418fd.7d6af",
-                "ae94a833.e2ef38"
+                "81752885.eb63a8",
+                "c675da0b.5461c8"
             ]
         ]
     },
     {
-        "id": "38f57278.43482e",
+        "id": "7098fc9f.d79a4c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5969,
-        "y": 648,
-        "z": "df5c2cef.29f798",
+        "x": 5927,
+        "y": 661,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "465a8b8c.5405ac"
+                "4474e908.078af8"
             ]
         ]
     },
     {
-        "id": "465a8b8c.5405ac",
+        "id": "4474e908.078af8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6164,
-        "y": 648,
-        "z": "df5c2cef.29f798",
+        "x": 6122,
+        "y": 661,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "a206cef4.960698",
-                "59e7f171.2fe93"
+                "afa8e9ca.a2ff88",
+                "82783d37.d452a8"
             ]
         ]
     },
     {
-        "id": "54e418fd.7d6af",
+        "id": "81752885.eb63a8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6782,
-        "y": 599,
-        "z": "df5c2cef.29f798",
+        "x": 6740,
+        "y": 612,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "c451b700.662738",
+        "id": "bb4a9deb.45b028",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6962,
-        "y": 642,
-        "z": "df5c2cef.29f798",
+        "x": 6920,
+        "y": 655,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "b48ed50b.bbbc98"
+                "afb3d4f9.ba93a"
             ]
         ]
     },
     {
-        "id": "ee68b795.c2a168",
+        "id": "7bfedf54.b55d88",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6954,
-        "y": 697,
-        "z": "df5c2cef.29f798",
+        "x": 6912,
+        "y": 710,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "4b320cb9.f09b9c"
+                "4c9ef7f7.e20878"
             ]
         ]
     },
     {
-        "id": "ace90efd.77ffe",
+        "id": "d4dc18e1.4b9fa8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6959,
-        "y": 754,
-        "z": "df5c2cef.29f798",
+        "x": 6917,
+        "y": 767,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "7a2345cb.238a24"
+                "af0e4e29.c0c348"
             ]
         ]
     },
     {
-        "id": "7a2345cb.238a24",
+        "id": "af0e4e29.c0c348",
         "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": 7111,
-        "y": 755,
-        "z": "df5c2cef.29f798",
+        "x": 7069,
+        "y": 768,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "4b320cb9.f09b9c",
+        "id": "4c9ef7f7.e20878",
         "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": 7122,
-        "y": 700,
-        "z": "df5c2cef.29f798",
+        "x": 7080,
+        "y": 713,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "b48ed50b.bbbc98",
+        "id": "afb3d4f9.ba93a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7106.38232421875,
-        "y": 639.6556701660156,
-        "z": "df5c2cef.29f798",
+        "x": 7064.38232421875,
+        "y": 652.6556701660156,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "fd510eb.0c6ebf"
+                "48d857d6.23bcb8"
             ]
         ]
     },
     {
-        "id": "fd510eb.0c6ebf",
+        "id": "48d857d6.23bcb8",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 7321,
-        "y": 636,
-        "z": "df5c2cef.29f798",
+        "x": 7279,
+        "y": 649,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "cf727f02.7a65a",
+        "id": "15dbb018.1ec0a8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 5486,
-        "y": 1525,
-        "z": "df5c2cef.29f798",
+        "x": 5444,
+        "y": 1538,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "e6203203.c9d8",
-                "a4f2c6e3.35c098",
-                "b06c15b4.6714f8"
+                "ddbec5c8.9e7b8",
+                "79a0af8f.4ef61",
+                "7e842000.99ad5"
             ]
         ]
     },
     {
-        "id": "e6203203.c9d8",
+        "id": "ddbec5c8.9e7b8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5681.5001220703125,
-        "y": 1477,
-        "z": "df5c2cef.29f798",
+        "x": 5639.5001220703125,
+        "y": 1490,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "3120e335.92d50c"
+                "dd9e895a.d361b8"
             ]
         ]
     },
     {
-        "id": "a4f2c6e3.35c098",
+        "id": "79a0af8f.4ef61",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5673.5001220703125,
-        "y": 1532,
-        "z": "df5c2cef.29f798",
+        "x": 5631.5001220703125,
+        "y": 1545,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "2b2ce729.3eb29"
+                "bac9dfa5.acb0b8"
             ]
         ]
     },
     {
-        "id": "b06c15b4.6714f8",
+        "id": "7e842000.99ad5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5678.5001220703125,
-        "y": 1589,
-        "z": "df5c2cef.29f798",
+        "x": 5636.5001220703125,
+        "y": 1602,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "372a7e76.6eb402"
+                "39141e3c.f5c4ba"
             ]
         ]
     },
     {
-        "id": "372a7e76.6eb402",
+        "id": "39141e3c.f5c4ba",
         "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": 5830.5001220703125,
-        "y": 1590,
-        "z": "df5c2cef.29f798",
+        "x": 5788.5001220703125,
+        "y": 1603,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "2b2ce729.3eb29",
+        "id": "bac9dfa5.acb0b8",
         "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": 5841.5001220703125,
-        "y": 1535,
-        "z": "df5c2cef.29f798",
+        "x": 5799.5001220703125,
+        "y": 1548,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "3120e335.92d50c",
+        "id": "dd9e895a.d361b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5825.8824462890625,
-        "y": 1474.6556701660156,
-        "z": "df5c2cef.29f798",
+        "x": 5783.8824462890625,
+        "y": 1487.6556701660156,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "4dd7dbd3.a1fbd4"
+                "73633cf3.366dcc"
             ]
         ]
     },
     {
-        "id": "92a891f6.14f2f8",
+        "id": "f9e8a04.0c1b9e",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6408,
-        "y": 1493,
-        "z": "df5c2cef.29f798",
+        "x": 6366,
+        "y": 1506,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "e81d0130.9f5398"
+                "858146ac.41a8b8"
             ]
         ]
     },
     {
-        "id": "e81d0130.9f5398",
+        "id": "858146ac.41a8b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6585,
-        "y": 1485,
-        "z": "df5c2cef.29f798",
+        "x": 6543,
+        "y": 1498,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "43e58e9.258b1f",
-                "f320f01a.c0cb68"
+                "b9f112f1.16fa48",
+                "8777efed.45e25"
             ]
         ]
     },
     {
-        "id": "4dd7dbd3.a1fbd4",
+        "id": "73633cf3.366dcc",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 6010,
-        "y": 1489,
-        "z": "df5c2cef.29f798",
+        "x": 5968,
+        "y": 1502,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ef34bdf9.86d6a"
+                "84157579.d2bb08"
             ]
         ]
     },
     {
-        "id": "ef34bdf9.86d6a",
+        "id": "84157579.d2bb08",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6205,
-        "y": 1489,
-        "z": "df5c2cef.29f798",
+        "x": 6163,
+        "y": 1502,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "92a891f6.14f2f8",
-                "15f68679.004ff2"
+                "f9e8a04.0c1b9e",
+                "bf377915.b45748"
             ]
         ]
     },
     {
-        "id": "f320f01a.c0cb68",
+        "id": "8777efed.45e25",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 6793,
-        "y": 1492,
-        "z": "df5c2cef.29f798",
+        "x": 6751,
+        "y": 1505,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "21d26d09.bf8d42",
-                "e79de436.351eb",
-                "42168163.8f503"
+                "2ab532d7.7f1fb6",
+                "e8de40ac.67f83",
+                "24548740.4d9e68"
             ]
         ]
     },
     {
-        "id": "43e58e9.258b1f",
+        "id": "b9f112f1.16fa48",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6823,
-        "y": 1440,
-        "z": "df5c2cef.29f798",
+        "x": 6781,
+        "y": 1453,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "21d26d09.bf8d42",
+        "id": "2ab532d7.7f1fb6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 7003,
-        "y": 1483,
-        "z": "df5c2cef.29f798",
+        "x": 6961,
+        "y": 1496,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8f151e48.516da8"
+                "feff3b5.5e8b948"
             ]
         ]
     },
     {
-        "id": "e79de436.351eb",
+        "id": "e8de40ac.67f83",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6995,
-        "y": 1538,
-        "z": "df5c2cef.29f798",
+        "x": 6953,
+        "y": 1551,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "43ccb9c7.d7ad"
+                "8e635e5c.8adab"
             ]
         ]
     },
     {
-        "id": "42168163.8f503",
+        "id": "24548740.4d9e68",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 7000,
-        "y": 1595,
-        "z": "df5c2cef.29f798",
+        "x": 6958,
+        "y": 1608,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "d86c14ab.73faf8"
+                "13ac8b5c.0cfaed"
             ]
         ]
     },
     {
-        "id": "d86c14ab.73faf8",
+        "id": "13ac8b5c.0cfaed",
         "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": 7152,
-        "y": 1596,
-        "z": "df5c2cef.29f798",
+        "x": 7110,
+        "y": 1609,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "43ccb9c7.d7ad",
+        "id": "8e635e5c.8adab",
         "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": 7163,
-        "y": 1541,
-        "z": "df5c2cef.29f798",
+        "x": 7121,
+        "y": 1554,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "8f151e48.516da8",
+        "id": "feff3b5.5e8b948",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7147.38232421875,
-        "y": 1480.6556701660156,
-        "z": "df5c2cef.29f798",
+        "x": 7105.38232421875,
+        "y": 1493.6556701660156,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "48915602.68268"
+                "953167d4.139688"
             ]
         ]
     },
     {
-        "id": "48915602.68268",
+        "id": "953167d4.139688",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 7362,
-        "y": 1477,
-        "z": "df5c2cef.29f798",
+        "x": 7320,
+        "y": 1490,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "8418b8d3.470188",
+        "id": "bcacdfd4.14c6d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 359,
-        "y": 606,
-        "z": "df5c2cef.29f798",
+        "x": 317,
+        "y": 619,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "3e42f499.a0a45c",
-                "23de1461.f7fad4"
+                "403b2da3.dcfec4",
+                "1a6f80e4.595e77"
             ]
         ]
     },
     {
-        "id": "3e42f499.a0a45c",
+        "id": "403b2da3.dcfec4",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 805,
-        "y": 465,
-        "z": "df5c2cef.29f798",
+        "x": 763,
+        "y": 478,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "61c833be.b9761c"
+                "9653f59e.977668"
             ]
         ]
     },
     {
-        "id": "61c833be.b9761c",
+        "id": "9653f59e.977668",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3170,
-        "y": 447,
-        "z": "df5c2cef.29f798",
+        "x": 3128,
+        "y": 460,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "9f0e5f06.ee06a8"
+                "77ab35ed.5d2284"
             ]
         ]
     },
     {
-        "id": "59e7f171.2fe93",
+        "id": "82783d37.d452a8",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 6370,
-        "y": 726,
-        "z": "df5c2cef.29f798",
+        "x": 6328,
+        "y": 739,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "db4451ce.036298"
+                "3ce4b168.0164de"
             ]
         ]
     },
     {
-        "id": "db4451ce.036298",
+        "id": "3ce4b168.0164de",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6547,
-        "y": 718,
-        "z": "df5c2cef.29f798",
+        "x": 6505,
+        "y": 731,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "3b56e152.cb5dfe"
+                "963d2fd4.6da64"
             ]
         ]
     },
     {
-        "id": "3b56e152.cb5dfe",
+        "id": "963d2fd4.6da64",
         "type": "set",
         "name": "set domainA ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6782,
-        "y": 842,
-        "z": "df5c2cef.29f798",
+        "x": 6740,
+        "y": 855,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "8d9dc5d1.6f53b",
+        "id": "8e0afe4a.b34a6",
         "type": "set",
         "name": "set domainB ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6822,
-        "y": 1682,
-        "z": "df5c2cef.29f798",
+        "x": 6780,
+        "y": 1695,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "b9cc1a89.57ad48",
+        "id": "249ec401.31a03c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6587,
-        "y": 1558,
-        "z": "df5c2cef.29f798",
+        "x": 6545,
+        "y": 1571,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8d9dc5d1.6f53b"
+                "8e0afe4a.b34a6"
             ]
         ]
     },
     {
-        "id": "15f68679.004ff2",
+        "id": "bf377915.b45748",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 6410,
-        "y": 1566,
-        "z": "df5c2cef.29f798",
+        "x": 6368,
+        "y": 1579,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "b9cc1a89.57ad48"
+                "249ec401.31a03c"
             ]
         ]
     },
     {
-        "id": "283fdbf8.9648a4",
+        "id": "9b904bff.ec9058",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4362,
-        "y": 502,
-        "z": "df5c2cef.29f798",
+        "x": 4320,
+        "y": 515,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "53d902b0.393754",
+        "id": "64d793c7.441b84",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4384,
-        "y": 637,
-        "z": "df5c2cef.29f798",
+        "x": 4342,
+        "y": 650,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "2829cd3e.73ff62",
+        "id": "c6ccb3e9.91ea18",
         "type": "execute",
         "name": "execute UUID generator for otn-tunnel-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4365,
-        "y": 687,
-        "z": "df5c2cef.29f798",
+        "x": 4323,
+        "y": 700,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "ec9312e3.eb3ca",
+        "id": "8f80cd4e.6bb588",
         "type": "for",
         "name": "for each allotted-resource",
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1956,
-        "y": 188,
-        "z": "df5c2cef.29f798",
+        "x": 1914,
+        "y": 201,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "f47a653.ec6e298",
-                "ff867076.ee06e"
+                "f465bd8c.ba2628",
+                "8f1217ff.70176"
             ]
         ]
     },
     {
-        "id": "f47a653.ec6e298",
+        "id": "f465bd8c.ba2628",
         "type": "set",
         "name": "set the current allotted-resource-id",
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
         "comments": "",
-        "x": 2240,
-        "y": 158,
-        "z": "df5c2cef.29f798",
+        "x": 2198,
+        "y": 171,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "9445731f.f1b8",
+        "id": "f986e215.6b3c08",
         "type": "set",
         "name": "set query_param",
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
         "comments": "",
-        "x": 4281,
-        "y": 2196,
-        "z": "df5c2cef.29f798",
+        "x": 4239,
+        "y": 2209,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "beaf21fd.396d98",
+        "id": "4e189d8f.8297c4",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value='' />\n<parameter name='domain-A.node-id' value='' />\n<parameter name='domain-A.network-id' value=\"\" />\n<parameter name='domain-A.provider-id' value=\"\" />\n<parameter name='domain-A.client-id' value=\"\" />\n<parameter name='domain-A.te-topo-id' value=\"\" />\n<parameter name='domain-A.network-type' value=\"\" />\n<parameter name='domain-A.ltpId' value=\"\" />\n<parameter name='tmp.domain-A.network-id' value=\"\" />\n<parameter name='tmp.domain-A.ttp-id' value=\"\" />\n<parameter name='network-route-A' value=\"\" />\n<!--<parameter name='domain-A.' value=\"\" />-->\n\n<parameter name='request-id' value='' />\n<parameter name='otn-source-node' value='' />\n<parameter name='otn-dest-node' value='' />\n<parameter name='bw-odu' value=\"\" />\n<parameter name='src-ttp-id' value='' />\n<parameter name='dst-ttp-id' value='' />\n\n<parameter name='domain-B.tunnel-tp-id' value='' />\n<parameter name='domain-B.node-id' value='' />\n<parameter name='domain-B.network-id' value=\"\" />\n<parameter name='domain-B.provider-id' value=\"\" />\n<parameter name='domain-B.client-id' value=\"\" />\n<parameter name='domain-B.te-topo-id' value=\"\" />\n<parameter name='domain-B.network-type' value=\"\" />\n<parameter name='domain-B.ltpId' value=\"\" />\n<parameter name='tmp.domain-B.network-id' value=\"\" />\n<parameter name='tmp.domain-B.ttp-id' value=\"\" />\n<parameter name='network-route-B' value=\"\" />\n<!--<parameter name='domain-B.' value=\"\" />-->\n\n\n\n\n\n",
         "comments": "",
-        "x": 4265,
-        "y": 3895,
-        "z": "df5c2cef.29f798",
+        "x": 4223,
+        "y": 3908,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "7826fce9.171054",
+        "id": "6963f6fb.4a135",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
-        "x": 4322,
-        "y": 732,
-        "z": "df5c2cef.29f798",
+        "x": 4280,
+        "y": 745,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "b9213dab.6d883",
+        "id": "40ae5836.eda238",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 4316,
-        "y": 2316,
-        "z": "df5c2cef.29f798",
+        "x": 4274,
+        "y": 2329,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "20d68f86.366a48"
+                "2e490e87.e61d42"
             ]
         ]
     },
     {
-        "id": "d817cc51.57c43",
+        "id": "5b2c57a6.c56358",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5439,
-        "y": 2884,
-        "z": "df5c2cef.29f798",
+        "x": 5397,
+        "y": 2897,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "19683517.67ac63"
+                "9802e598.7a08e"
             ]
         ]
     },
     {
-        "id": "ca454382.6438b8",
+        "id": "457942f4.bfb36c",
         "type": "save",
         "name": "save connectivity-A relationship to vpn-binding-A, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 6011.5,
-        "y": 2988,
-        "z": "df5c2cef.29f798",
+        "x": 5969.5,
+        "y": 3001,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "19683517.67ac63",
+        "id": "9802e598.7a08e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5745,
-        "y": 2883,
-        "z": "df5c2cef.29f798",
+        "x": 5703,
+        "y": 2896,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "7b5a7467.79786c"
+                "c8f4f504.510ca8"
             ]
         ]
     },
     {
-        "id": "7b5a7467.79786c",
+        "id": "c8f4f504.510ca8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5954.5,
-        "y": 2883.25390625,
-        "z": "df5c2cef.29f798",
+        "x": 5912.5,
+        "y": 2896.25390625,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "d5f9f3e8.876da8"
+                "20917868.85ed"
             ]
         ]
     },
     {
-        "id": "cfeb42d5.8f30e",
+        "id": "dc51f3dc.862168",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding $otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5475,
-        "y": 2348,
-        "z": "df5c2cef.29f798",
+        "x": 5433,
+        "y": 2361,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "80314abc.ea1038",
+        "id": "8f203418.5717c8",
         "type": "switchNode",
         "name": "switch otnidx == 0",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5348,
-        "y": 3001,
-        "z": "df5c2cef.29f798",
+        "x": 5306,
+        "y": 3014,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "42510192.4150d",
-                "e04d6920.7d592"
+                "22c6b3cb.e79214",
+                "862cb9a5.5437d"
             ]
         ]
     },
     {
-        "id": "42510192.4150d",
+        "id": "22c6b3cb.e79214",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5531,
-        "y": 3001,
-        "z": "df5c2cef.29f798",
+        "x": 5489,
+        "y": 3014,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "c6dc5f2e.5970a8"
+                "2ad37e70.de6eda"
             ]
         ]
     },
     {
-        "id": "e04d6920.7d592",
+        "id": "862cb9a5.5437d",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5356,
-        "y": 3148,
-        "z": "df5c2cef.29f798",
+        "x": 5314,
+        "y": 3161,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "e39528c5.00341"
+                "6c8b8ef6.d3a3"
             ]
         ]
     },
     {
-        "id": "d4bb1111.25cff",
+        "id": "886d3de7.c041d",
         "type": "switchNode",
         "name": "switch otnidx == last",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5697,
-        "y": 3229,
-        "z": "df5c2cef.29f798",
+        "x": 5655,
+        "y": 3242,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "63cb7082.8783",
-                "18ee91c9.b3e6fe"
+                "521941d1.ae6f7",
+                "6f826e7d.af0fc8"
             ]
         ]
     },
     {
-        "id": "63cb7082.8783",
+        "id": "521941d1.ae6f7",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5882,
-        "y": 3230,
-        "z": "df5c2cef.29f798",
+        "x": 5840,
+        "y": 3243,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "629d009e.881158"
+                "7726ccce.f0f08c"
             ]
         ]
     },
     {
-        "id": "18ee91c9.b3e6fe",
+        "id": "6f826e7d.af0fc8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5901,
-        "y": 3496,
-        "z": "df5c2cef.29f798",
+        "x": 5859,
+        "y": 3509,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "78cc4d6b.9a20e4"
+                "49c1c5c0.4e8b8c"
             ]
         ]
     },
     {
-        "id": "72b6f676.a7eaa",
+        "id": "905b732c.f0ad98",
         "type": "save",
         "name": "save connectivity-B relationship to vpn-binding-B, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 6312,
-        "y": 3231,
-        "z": "df5c2cef.29f798",
+        "x": 6270,
+        "y": 3244,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d690add.7eb056",
+        "id": "dd09a90e.7899b",
         "type": "execute",
         "name": "execute UUID generator for connectivity domain otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6386,
-        "y": 3529,
-        "z": "df5c2cef.29f798",
+        "x": 6344,
+        "y": 3542,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "7eb9bec5.6b496",
+        "id": "fc11577c.3662e8",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 6322,
-        "y": 3580,
-        "z": "df5c2cef.29f798",
+        "x": 6280,
+        "y": 3593,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "e4bf0eff.3ff878",
+        "id": "a3be8dfb.ebcf2",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 6451,
-        "y": 3630,
-        "z": "df5c2cef.29f798",
+        "x": 6409,
+        "y": 3643,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "44296fc3.86d838",
+        "id": "28e97ea9.3189d2",
         "type": "comment",
         "name": "connectivity has not been created for middle domains, so we have to create one",
         "info": "",
         "comments": "",
-        "x": 6461,
-        "y": 3473,
-        "z": "df5c2cef.29f798",
+        "x": 6419,
+        "y": 3486,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "dde77510.01e358",
+        "id": "3c225fc2.333288",
         "type": "save",
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 6419,
-        "y": 3689,
-        "z": "df5c2cef.29f798",
+        "x": 6377,
+        "y": 3702,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "78cc4d6b.9a20e4",
+        "id": "49c1c5c0.4e8b8c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 6058,
-        "y": 3497,
-        "z": "df5c2cef.29f798",
+        "x": 6016,
+        "y": 3510,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "2d690add.7eb056",
-                "7eb9bec5.6b496",
-                "e4bf0eff.3ff878",
-                "dde77510.01e358",
-                "cf8ac1fc.c141"
+                "dd09a90e.7899b",
+                "fc11577c.3662e8",
+                "a3be8dfb.ebcf2",
+                "3c225fc2.333288",
+                "6f9b661d.d75948"
             ]
         ]
     },
     {
-        "id": "20d68f86.366a48",
+        "id": "2e490e87.e61d42",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4568,
-        "y": 2377,
-        "z": "df5c2cef.29f798",
+        "x": 4526,
+        "y": 2390,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "cfeb42d5.8f30e",
-                "d817cc51.57c43",
-                "80314abc.ea1038",
-                "7c37f4eb.58f484",
-                "c24bf6c5.fa73c8",
-                "1dbe2057.a5e62",
-                "94fd6991.78fda"
+                "dc51f3dc.862168",
+                "5b2c57a6.c56358",
+                "8f203418.5717c8",
+                "c3673769.ff0828",
+                "3b94d9a7.b824be",
+                "e2ccb618.b8a8d",
+                "77665e36.902488"
             ]
         ]
     },
     {
-        "id": "72da75b4.4b328c",
+        "id": "c5c2060f.16d9c8",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n\n",
         "comments": "",
-        "x": 5936,
-        "y": 3045,
-        "z": "df5c2cef.29f798",
+        "x": 5894,
+        "y": 3058,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "9684161c.06ddd",
+        "id": "db559808.bd4158",
         "type": "execute",
         "name": "execute RestApiCallNode domainA UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\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": 5989,
-        "y": 3089,
-        "z": "df5c2cef.29f798",
+        "x": 5947,
+        "y": 3102,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "efb749b0.733a",
-                "783ce4ab.fbf424"
+                "3a25adfa.fa5c4a",
+                "1deeb503.94e2fb"
             ]
         ]
     },
     {
-        "id": "783ce4ab.fbf424",
+        "id": "1deeb503.94e2fb",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6260,
-        "y": 3074,
-        "z": "df5c2cef.29f798",
+        "x": 6218,
+        "y": 3087,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ddad2f88.846408"
+                "9df348c2.491e88"
             ]
         ]
     },
     {
-        "id": "efb749b0.733a",
+        "id": "3a25adfa.fa5c4a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6258.000213623047,
-        "y": 3131.99990940094,
-        "z": "df5c2cef.29f798",
+        "x": 6216.000213623047,
+        "y": 3144.99990940094,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "d912d706.5a251"
+                "6842e2ab.cc6dcc"
             ]
         ]
     },
     {
-        "id": "ddad2f88.846408",
+        "id": "9df348c2.491e88",
         "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 UNI Coloring for domain A\" />\n",
         "comments": "",
-        "x": 6400.000247955322,
-        "y": 3074.0000009536743,
-        "z": "df5c2cef.29f798",
+        "x": 6358.000247955322,
+        "y": 3087.0000009536743,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "d912d706.5a251",
+        "id": "6842e2ab.cc6dcc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6406.02725982666,
-        "y": 3122.745394706726,
-        "z": "df5c2cef.29f798",
+        "x": 6364.02725982666,
+        "y": 3135.745394706726,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "c6dc5f2e.5970a8",
+        "id": "2ad37e70.de6eda",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5672,
-        "y": 2991,
-        "z": "df5c2cef.29f798",
+        "x": 5630,
+        "y": 3004,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ca454382.6438b8",
-                "9684161c.06ddd",
-                "72da75b4.4b328c"
+                "457942f4.bfb36c",
+                "db559808.bd4158",
+                "c5c2060f.16d9c8"
             ]
         ]
     },
     {
-        "id": "629d009e.881158",
+        "id": "7726ccce.f0f08c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6016,
-        "y": 3231,
-        "z": "df5c2cef.29f798",
+        "x": 5974,
+        "y": 3244,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "72b6f676.a7eaa",
-                "14aebcc4.f7f7cb",
-                "46bbee51.f68868"
+                "905b732c.f0ad98",
+                "7d99b03d.258298",
+                "45df9551.f0104c"
             ]
         ]
     },
     {
-        "id": "46bbee51.f68868",
+        "id": "45df9551.f0104c",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",
         "comments": "",
-        "x": 6236,
-        "y": 3275,
-        "z": "df5c2cef.29f798",
+        "x": 6194,
+        "y": 3288,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "14aebcc4.f7f7cb",
+        "id": "7d99b03d.258298",
         "type": "execute",
         "name": "execute RestApiCallNode domainB UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\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": 6287,
-        "y": 3319,
-        "z": "df5c2cef.29f798",
+        "x": 6245,
+        "y": 3332,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "2a75572.a50f028",
-                "b6918e5c.ab31"
+                "bd0a7a36.9d20c8",
+                "dca7fdc6.a617b"
             ]
         ]
     },
     {
-        "id": "b6918e5c.ab31",
+        "id": "dca7fdc6.a617b",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6550,
-        "y": 3299,
-        "z": "df5c2cef.29f798",
+        "x": 6508,
+        "y": 3312,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "18902915.6118d7"
+                "fccd3cd5.48582"
             ]
         ]
     },
     {
-        "id": "2a75572.a50f028",
+        "id": "bd0a7a36.9d20c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6551.000213623047,
-        "y": 3349.99990940094,
-        "z": "df5c2cef.29f798",
+        "x": 6509.000213623047,
+        "y": 3362.99990940094,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "6d64d1d4.bfd958"
+                "21901264.638a9e"
             ]
         ]
     },
     {
-        "id": "18902915.6118d7",
+        "id": "fccd3cd5.48582",
         "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 UNI coloring for domain B\" />\n",
         "comments": "",
-        "x": 6690.000247955322,
-        "y": 3299.0000009536743,
-        "z": "df5c2cef.29f798",
+        "x": 6648.000247955322,
+        "y": 3312.0000009536743,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "6d64d1d4.bfd958",
+        "id": "21901264.638a9e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6696.02725982666,
-        "y": 3347.745394706726,
-        "z": "df5c2cef.29f798",
+        "x": 6654.02725982666,
+        "y": 3360.745394706726,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "cf8ac1fc.c141",
+        "id": "6f9b661d.d75948",
         "type": "set",
         "name": "set attachment_param domain otnidx",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 6333,
-        "y": 3749,
-        "z": "df5c2cef.29f798",
+        "x": 6291,
+        "y": 3762,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "77439122.61f0b",
+        "id": "19fc5975.9c891f",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3652,
-        "y": 4096,
-        "z": "df5c2cef.29f798",
+        "x": 3610,
+        "y": 4109,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "a916ce6e.3a2dd8",
-                "8ea0214a.83c",
-                "1e283443.a11834"
+                "3b17ad03.4221a2",
+                "d69cd907.6aa748",
+                "2274d619.b436c2"
             ]
         ]
     },
     {
-        "id": "a916ce6e.3a2dd8",
+        "id": "3b17ad03.4221a2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3840,
-        "y": 4109,
-        "z": "df5c2cef.29f798",
+        "x": 3798,
+        "y": 4122,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "34b3b115.5888ce"
+                "c84d9923.4faed"
             ]
         ]
     },
     {
-        "id": "8ea0214a.83c",
+        "id": "d69cd907.6aa748",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3840.490966796875,
-        "y": 4154.574035644531,
-        "z": "df5c2cef.29f798",
+        "x": 3798.490966796875,
+        "y": 4167.574035644531,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "389d2b9f.8874d4"
+                "ab55f6d5.77c7d"
             ]
         ]
     },
     {
-        "id": "1e283443.a11834",
+        "id": "2274d619.b436c2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3838,
-        "y": 4198,
-        "z": "df5c2cef.29f798",
+        "x": 3796,
+        "y": 4211,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8afc42fa.281da"
+                "7380e8da.afb22"
             ]
         ]
     },
     {
-        "id": "34b3b115.5888ce",
+        "id": "c84d9923.4faed",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4013,
-        "y": 4107,
-        "z": "df5c2cef.29f798",
+        "x": 3971,
+        "y": 4120,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "9cfe8596.af4768"
+                "4f7659f.9cf48a8"
             ]
         ]
     },
     {
-        "id": "389d2b9f.8874d4",
+        "id": "ab55f6d5.77c7d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4003.0623779296875,
-        "y": 4154.859771728516,
-        "z": "df5c2cef.29f798",
+        "x": 3961.0623779296875,
+        "y": 4167.859771728516,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "8afc42fa.281da",
+        "id": "7380e8da.afb22",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4005,
-        "y": 4197,
-        "z": "df5c2cef.29f798",
+        "x": 3963,
+        "y": 4210,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "adac8296.d1b27",
+        "id": "2ea54daa.f8c89a",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3641,
-        "y": 4287,
-        "z": "df5c2cef.29f798",
+        "x": 3599,
+        "y": 4300,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "a0b78348.a09218"
+                "1b14a9d6.5d5776"
             ]
         ]
     },
     {
-        "id": "a5b6bb26.da9ec8",
+        "id": "ae6235d1.274b2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4451,
-        "y": 4287,
-        "z": "df5c2cef.29f798",
+        "x": 4409,
+        "y": 4300,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "45429cd9.5d7224"
+                "b2a4c6eb.8f6fb8"
             ]
         ]
     },
     {
-        "id": "d9387db0.98ab68",
+        "id": "c8a00103.c44878",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4223,
-        "y": 4287,
-        "z": "df5c2cef.29f798",
+        "x": 4181,
+        "y": 4300,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "a5b6bb26.da9ec8"
+                "ae6235d1.274b2"
             ]
         ]
     },
     {
-        "id": "e7eee5b6.16e978",
+        "id": "315b6688.54502a",
         "type": "set",
         "name": "set providerValue",
         "xml": "<set>\n<parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\n<parameter name='found' value='false' />\n\n\n",
         "comments": "",
-        "x": 5343,
-        "y": 4054,
-        "z": "df5c2cef.29f798",
+        "x": 5301,
+        "y": 4067,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "e4dd1d5b.f089e8",
+        "id": "ea932ad5.e0e7e8",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",
         "comments": "",
-        "x": 5645,
-        "y": 3180,
-        "z": "df5c2cef.29f798",
+        "x": 5603,
+        "y": 3193,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "e39528c5.00341",
+        "id": "6c8b8ef6.d3a3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5480,
-        "y": 3155,
-        "z": "df5c2cef.29f798",
+        "x": 5438,
+        "y": 3168,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "e4dd1d5b.f089e8",
-                "d4bb1111.25cff"
+                "ea932ad5.e0e7e8",
+                "886d3de7.c041d"
             ]
         ]
     },
     {
-        "id": "9b47cb2b.81e09",
+        "id": "1ad0a363.7d61cd",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<parameter name='tmp.slicevpns' value='' />\n<parameter name='tmp.slicevpns_length' value='0' />\n\n<parameter name='tmp.slicevpnuuids' value='' />\n<parameter name='tmp.slicevpnuuids.' value='' />\n\n<parameter name='bwModified' value='false' />\n\n\n",
         "comments": "",
-        "x": 1938,
-        "y": 134,
-        "z": "df5c2cef.29f798",
+        "x": 1896,
+        "y": 147,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "9cfe8596.af4768",
+        "id": "4f7659f.9cf48a8",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4242,
-        "y": 4108,
-        "z": "df5c2cef.29f798",
+        "x": 4200,
+        "y": 4121,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "9ba3a7c0.b0cb88"
+                "39723735.013e2"
             ]
         ]
     },
     {
-        "id": "9ba3a7c0.b0cb88",
+        "id": "39723735.013e2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4457,
-        "y": 4109,
-        "z": "df5c2cef.29f798",
+        "x": 4415,
+        "y": 4122,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "45048a47.3aa5fc"
+                "a85f98e7.7e0e3"
             ]
         ]
     },
     {
-        "id": "30ee7ab9.1c084e",
+        "id": "45b1bc5.a80fac4",
         "type": "for",
         "name": "for arridx in tmp.arr",
         "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5910,
-        "y": 4029,
-        "z": "df5c2cef.29f798",
+        "x": 5868,
+        "y": 4042,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "53d8a5a4.d4c3ac"
+                "6b77cda7.20313c"
             ]
         ]
     },
     {
-        "id": "b5b6b6e5.2bc768",
+        "id": "2e1bb3dd.371e44",
         "type": "switchNode",
         "name": "switch $tmp.arr_length != 0",
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5376,
-        "y": 4109,
-        "z": "df5c2cef.29f798",
+        "x": 5334,
+        "y": 4122,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "1acbae51.13627a",
-                "b78197f0.7f231"
+                "24502626.aaa1ba",
+                "5f3af9a.344a808"
             ]
         ]
     },
     {
-        "id": "1acbae51.13627a",
+        "id": "24502626.aaa1ba",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5572,
-        "y": 4079,
-        "z": "df5c2cef.29f798",
+        "x": 5530,
+        "y": 4092,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "4305d70.41fb128"
+                "d529614e.bbdc5"
             ]
         ]
     },
     {
-        "id": "b78197f0.7f231",
+        "id": "5f3af9a.344a808",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5573,
-        "y": 4150,
-        "z": "df5c2cef.29f798",
+        "x": 5531,
+        "y": 4163,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "513cbe42.5f9f78"
+                "ec475a9a.8eb8b8"
             ]
         ]
     },
     {
-        "id": "4305d70.41fb128",
+        "id": "d529614e.bbdc5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5723,
-        "y": 4077,
-        "z": "df5c2cef.29f798",
+        "x": 5681,
+        "y": 4090,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "30ee7ab9.1c084e",
-                "2ee86607.39702a"
+                "45b1bc5.a80fac4",
+                "c40fb6f1.31454"
             ]
         ]
     },
     {
-        "id": "53d8a5a4.d4c3ac",
+        "id": "6b77cda7.20313c",
         "type": "switchNode",
         "name": "switch tmp.arr[$arridx] == $providerValue",
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6201,
-        "y": 4029,
-        "z": "df5c2cef.29f798",
+        "x": 6159,
+        "y": 4042,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "f8741b2b.9feaa8",
-                "d4cbae1e.f8339"
+                "de5fc252.aa8c8",
+                "5ea06666.14b488"
             ]
         ]
     },
     {
-        "id": "f8741b2b.9feaa8",
+        "id": "de5fc252.aa8c8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6476,
-        "y": 3998,
-        "z": "df5c2cef.29f798",
+        "x": 6434,
+        "y": 4011,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8f2d4eac.99e5f8"
+                "171b52be.079295"
             ]
         ]
     },
     {
-        "id": "d4cbae1e.f8339",
+        "id": "5ea06666.14b488",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6477,
-        "y": 4069,
-        "z": "df5c2cef.29f798",
+        "x": 6435,
+        "y": 4082,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "5e18e353.3a05ac"
+                "9281ca71.e773a"
             ]
         ]
     },
     {
-        "id": "8f2d4eac.99e5f8",
+        "id": "171b52be.079295",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 6627,
-        "y": 3996,
-        "z": "df5c2cef.29f798",
+        "x": 6585,
+        "y": 4009,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8b8a8ce1.3ddff",
-                "9358083a.54b3b8",
-                "842d4e41.428d6",
-                "c78fe39c.41c76",
-                "78c705fa.24e9dc"
+                "e713eb27.04e0e8",
+                "321eb6fe.b414b2",
+                "2f73393e.94f68e",
+                "3f07f766.243a2",
+                "ef925dc2.f8f9f"
             ]
         ]
     },
     {
-        "id": "8b8a8ce1.3ddff",
+        "id": "e713eb27.04e0e8",
         "type": "set",
         "name": "set found to true",
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
         "comments": "",
-        "x": 6815,
-        "y": 3956,
-        "z": "df5c2cef.29f798",
+        "x": 6773,
+        "y": 3969,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "9358083a.54b3b8",
+        "id": "321eb6fe.b414b2",
         "type": "save",
         "name": "store $arridx somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 6887,
-        "y": 4001,
-        "z": "df5c2cef.29f798",
+        "x": 6845,
+        "y": 4014,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "78c705fa.24e9dc",
+        "id": "ef925dc2.f8f9f",
         "type": "set",
         "name": "set twoD arr",
         "xml": "<set>\n\n<!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\n<!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\n<parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\n\n",
         "comments": "",
-        "x": 6802,
-        "y": 4128,
-        "z": "df5c2cef.29f798",
+        "x": 6760,
+        "y": 4141,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "c78fe39c.41c76",
+        "id": "3f07f766.243a2",
         "type": "set",
         "name": "set sizeOfSliceList",
         "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",
         "comments": "",
-        "x": 6823,
-        "y": 4064,
-        "z": "df5c2cef.29f798",
+        "x": 6781,
+        "y": 4077,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "513cbe42.5f9f78",
+        "id": "ec475a9a.8eb8b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5725,
-        "y": 4150,
-        "z": "df5c2cef.29f798",
+        "x": 5683,
+        "y": 4163,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "56c68e45.b909e",
-                "62724f29.35ed9"
+                "1e5d0b07.cb12bd",
+                "6806bbfa.adddec"
             ]
         ]
     },
     {
-        "id": "56c68e45.b909e",
+        "id": "1e5d0b07.cb12bd",
         "type": "save",
         "name": "store $arridx somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='0' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5980,
-        "y": 4143,
-        "z": "df5c2cef.29f798",
+        "x": 5938,
+        "y": 4156,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "62724f29.35ed9",
+        "id": "6806bbfa.adddec",
         "type": "set",
         "name": "set twoD array",
         "xml": "<set>\n<parameter name='tmp.arr[0]' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='1' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[0].list_length' value='1' />\n\n",
         "comments": "",
-        "x": 5908,
-        "y": 4190,
-        "z": "df5c2cef.29f798",
+        "x": 5866,
+        "y": 4203,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "2ee86607.39702a",
+        "id": "c40fb6f1.31454",
         "type": "switchNode",
         "name": "switch found?",
         "xml": "<switch test='`$found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5901,
-        "y": 4074,
-        "z": "df5c2cef.29f798",
+        "x": 5859,
+        "y": 4087,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "57630af9.c71c94",
-                "27468ceb.58bbcc"
+                "58a78c2e.66d86c",
+                "d7b2b4c.94059c8"
             ]
         ]
     },
     {
-        "id": "57630af9.c71c94",
+        "id": "58a78c2e.66d86c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6061,
-        "y": 4066,
-        "z": "df5c2cef.29f798",
+        "x": 6019,
+        "y": 4079,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "55618a59.0218f4"
+                "cde5de2c.7d36b8"
             ]
         ]
     },
     {
-        "id": "27468ceb.58bbcc",
+        "id": "d7b2b4c.94059c8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6059,
-        "y": 4103,
-        "z": "df5c2cef.29f798",
+        "x": 6017,
+        "y": 4116,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "dbf50489.ec13e"
+                "74309960.8d777"
             ]
         ]
     },
     {
-        "id": "55618a59.0218f4",
+        "id": "cde5de2c.7d36b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6186,
-        "y": 4066,
-        "z": "df5c2cef.29f798",
+        "x": 6144,
+        "y": 4079,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "54fbb2b4.70fc04",
+        "id": "6b083096.f77d9",
         "type": "save",
         "name": "store $arridx+1 somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx + 1`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 6493,
-        "y": 4124,
-        "z": "df5c2cef.29f798",
+        "x": 6451,
+        "y": 4137,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "dbf50489.ec13e",
+        "id": "74309960.8d777",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 6219,
-        "y": 4111,
-        "z": "df5c2cef.29f798",
+        "x": 6177,
+        "y": 4124,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "54fbb2b4.70fc04",
-                "7e39f539.ebf16c"
+                "6b083096.f77d9",
+                "b4ddb8c9.5ca64"
             ]
         ]
     },
     {
-        "id": "7e39f539.ebf16c",
+        "id": "b4ddb8c9.5ca64",
         "type": "set",
         "name": "set twoD array",
         "xml": "<set>\n<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\n\n",
         "comments": "",
-        "x": 6410,
-        "y": 4170,
-        "z": "df5c2cef.29f798",
+        "x": 6368,
+        "y": 4183,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "5e18e353.3a05ac",
+        "id": "9281ca71.e773a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6610,
-        "y": 4068,
-        "z": "df5c2cef.29f798",
+        "x": 6568,
+        "y": 4081,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "842d4e41.428d6",
+        "id": "2f73393e.94f68e",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6781,
-        "y": 4195,
-        "z": "df5c2cef.29f798",
+        "x": 6739,
+        "y": 4208,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "7c37f4eb.58f484",
+        "id": "c3673769.ff0828",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5178,
-        "y": 2407,
-        "z": "df5c2cef.29f798",
+        "x": 5136,
+        "y": 2420,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "16caf8de.d229e7",
-                "54697afc.bd57bc"
+                "354051ca.f807c6",
+                "2ad9a102.280abe"
             ]
         ]
     },
     {
-        "id": "16caf8de.d229e7",
+        "id": "354051ca.f807c6",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5567,
-        "y": 2385,
-        "z": "df5c2cef.29f798",
+        "x": 5525,
+        "y": 2398,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "6d8c7c43.cb932c"
+                "dcf8c46b.cd2d9"
             ]
         ]
     },
     {
-        "id": "54697afc.bd57bc",
+        "id": "2ad9a102.280abe",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5568,
-        "y": 2431,
-        "z": "df5c2cef.29f798",
+        "x": 5526,
+        "y": 2444,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "92ed67c7.8c7a"
+                "d548eb8f.ae0418"
             ]
         ]
     },
     {
-        "id": "6d8c7c43.cb932c",
+        "id": "dcf8c46b.cd2d9",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",
         "comments": "",
-        "x": 5781,
-        "y": 2384,
-        "z": "df5c2cef.29f798",
+        "x": 5739,
+        "y": 2397,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "92ed67c7.8c7a",
+        "id": "d548eb8f.ae0418",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",
         "comments": "",
-        "x": 5779,
-        "y": 2429,
-        "z": "df5c2cef.29f798",
+        "x": 5737,
+        "y": 2442,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "45429cd9.5d7224",
+        "id": "b2a4c6eb.8f6fb8",
         "type": "set",
         "name": "set attachment_param sliceG",
         "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`\" />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\n\n\n<parameter name=\"tmp.domainG.restapiUrl\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`\" />\n<parameter name=\"tmp.domainG.restapiUser\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`\" />\n<parameter name=\"tmp.domainG.restapiPassword\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`\" />",
         "comments": "",
-        "x": 4704,
-        "y": 4285,
-        "z": "df5c2cef.29f798",
+        "x": 4662,
+        "y": 4298,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "8c979de9.c09378",
+        "id": "83baeacb.444588",
         "type": "execute",
         "name": "execute RestApiCallNode sliceG creation domainG",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.domainG.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`tmp.domainG.restapiPassword`\" />\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`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4289,
-        "y": 4393,
-        "z": "df5c2cef.29f798",
+        "x": 4247,
+        "y": 4406,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "e196ec28.ce397",
-                "9ae42505.217cf8"
+                "27e27e6a.f2ce82",
+                "450c3617.7079e"
             ]
         ]
     },
     {
-        "id": "9ae42505.217cf8",
+        "id": "450c3617.7079e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4572,
-        "y": 4373,
-        "z": "df5c2cef.29f798",
+        "x": 4530,
+        "y": 4386,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "bf5b9f50.921198"
+                "2c8d1c7a.f387cc"
             ]
         ]
     },
     {
-        "id": "e196ec28.ce397",
+        "id": "27e27e6a.f2ce82",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4573.000213623047,
-        "y": 4423.99990940094,
-        "z": "df5c2cef.29f798",
+        "x": 4531.000213623047,
+        "y": 4436.99990940094,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ca17658e.a8462"
+                "2b775544.0b0442"
             ]
         ]
     },
     {
-        "id": "bf5b9f50.921198",
+        "id": "2c8d1c7a.f387cc",
         "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 slice creation api for domain A\" />\n",
         "comments": "",
-        "x": 4712.000247955322,
-        "y": 4373.000000953674,
-        "z": "df5c2cef.29f798",
+        "x": 4670.000247955322,
+        "y": 4386.000000953674,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "ca17658e.a8462",
+        "id": "2b775544.0b0442",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4718.02725982666,
-        "y": 4421.745394706726,
-        "z": "df5c2cef.29f798",
+        "x": 4676.02725982666,
+        "y": 4434.745394706726,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "c24bf6c5.fa73c8",
+        "id": "3b94d9a7.b824be",
         "type": "set",
         "name": "set srcdstpnf-name",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
         "comments": "",
-        "x": 5362,
-        "y": 2527,
-        "z": "df5c2cef.29f798",
+        "x": 5320,
+        "y": 2540,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "1dbe2057.a5e62",
+        "id": "e2ccb618.b8a8d",
         "type": "get-resource",
         "name": "get-resource tmp.srcdstpnf-name",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 5406,
-        "y": 2575,
-        "z": "df5c2cef.29f798",
+        "x": 5364,
+        "y": 2588,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "b817832b.d2bf5",
-                "fd3a55f8.c9d638",
-                "b887d27c.b753c8"
+                "7cc0ff8d.947d5",
+                "847ae6cc.cd8548",
+                "514e2f17.0688a8"
             ]
         ]
     },
     {
-        "id": "b817832b.d2bf5",
+        "id": "7cc0ff8d.947d5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5618.5,
-        "y": 2522,
-        "z": "df5c2cef.29f798",
+        "x": 5576.5,
+        "y": 2535,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ad57831e.648c8"
+                "3cc1d272.0b4856"
             ]
         ]
     },
     {
-        "id": "fd3a55f8.c9d638",
+        "id": "847ae6cc.cd8548",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5630.5,
-        "y": 2572,
-        "z": "df5c2cef.29f798",
+        "x": 5588.5,
+        "y": 2585,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "b93496a6.69adc"
+                "3fb63137.b62f46"
             ]
         ]
     },
     {
-        "id": "b887d27c.b753c8",
+        "id": "514e2f17.0688a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5621.5,
-        "y": 2627,
-        "z": "df5c2cef.29f798",
+        "x": 5579.5,
+        "y": 2640,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "b15272b2.6a6078"
+                "e6964c37.0e1d08"
             ]
         ]
     },
     {
-        "id": "b15272b2.6a6078",
+        "id": "e6964c37.0e1d08",
         "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": 5766.5,
-        "y": 2626,
-        "z": "df5c2cef.29f798",
+        "x": 5724.5,
+        "y": 2639,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "b93496a6.69adc",
+        "id": "3fb63137.b62f46",
         "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": 5777.5,
-        "y": 2569,
-        "z": "df5c2cef.29f798",
+        "x": 5735.5,
+        "y": 2582,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "ad57831e.648c8",
+        "id": "3cc1d272.0b4856",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5743.8824462890625,
-        "y": 2515.6556701660156,
-        "z": "df5c2cef.29f798",
+        "x": 5701.8824462890625,
+        "y": 2528.6556701660156,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "de6a0737.bde95"
+                "597135e9.9cf8dc"
             ]
         ]
     },
     {
-        "id": "8779930e.acaac",
+        "id": "641197e8.a0857",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6303,
-        "y": 2534,
-        "z": "df5c2cef.29f798",
+        "x": 6261,
+        "y": 2547,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "eb5cb5f4.6dd96"
+                "ec2f2380.dc3938"
             ]
         ]
     },
     {
-        "id": "eb5cb5f4.6dd96",
+        "id": "ec2f2380.dc3938",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6480,
-        "y": 2526,
-        "z": "df5c2cef.29f798",
+        "x": 6438,
+        "y": 2539,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "c49affc6.c8c2f",
-                "d02c8535.9950a"
+                "f9283f20.fcecb",
+                "5f7551a8.c48a"
             ]
         ]
     },
     {
-        "id": "de6a0737.bde95",
+        "id": "597135e9.9cf8dc",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5905,
-        "y": 2530,
-        "z": "df5c2cef.29f798",
+        "x": 5863,
+        "y": 2543,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "38bf0267.963d4e"
+                "af459c6d.98172"
             ]
         ]
     },
     {
-        "id": "38bf0267.963d4e",
+        "id": "af459c6d.98172",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6100,
-        "y": 2530,
-        "z": "df5c2cef.29f798",
+        "x": 6058,
+        "y": 2543,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8779930e.acaac"
+                "641197e8.a0857"
             ]
         ]
     },
     {
-        "id": "d02c8535.9950a",
+        "id": "5f7551a8.c48a",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 6688,
-        "y": 2533,
-        "z": "df5c2cef.29f798",
+        "x": 6646,
+        "y": 2546,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "cdad79e0.120d78",
-                "28e812c3.6536fe",
-                "4be09c5b.0037ec"
+                "64071614.e531b8",
+                "1c3ac340.54b235",
+                "e738e604.11d738"
             ]
         ]
     },
     {
-        "id": "c49affc6.c8c2f",
+        "id": "f9283f20.fcecb",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6718,
-        "y": 2481,
-        "z": "df5c2cef.29f798",
+        "x": 6676,
+        "y": 2494,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "cdad79e0.120d78",
+        "id": "64071614.e531b8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6898,
-        "y": 2524,
-        "z": "df5c2cef.29f798",
+        "x": 6856,
+        "y": 2537,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "131587f4.87c8f8"
+                "68b02952.bfbd08"
             ]
         ]
     },
     {
-        "id": "28e812c3.6536fe",
+        "id": "1c3ac340.54b235",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6890,
-        "y": 2579,
-        "z": "df5c2cef.29f798",
+        "x": 6848,
+        "y": 2592,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "f025d314.592c4"
+                "84e50897.107018"
             ]
         ]
     },
     {
-        "id": "4be09c5b.0037ec",
+        "id": "e738e604.11d738",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6895,
-        "y": 2636,
-        "z": "df5c2cef.29f798",
+        "x": 6853,
+        "y": 2649,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ca734be9.796a3"
+                "69a8c55f.4a217c"
             ]
         ]
     },
     {
-        "id": "ca734be9.796a3",
+        "id": "69a8c55f.4a217c",
         "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": 7047,
-        "y": 2637,
-        "z": "df5c2cef.29f798",
+        "x": 7005,
+        "y": 2650,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "f025d314.592c4",
+        "id": "84e50897.107018",
         "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": 7058,
-        "y": 2582,
-        "z": "df5c2cef.29f798",
+        "x": 7016,
+        "y": 2595,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "131587f4.87c8f8",
+        "id": "68b02952.bfbd08",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7042.38232421875,
-        "y": 2521.6556701660156,
-        "z": "df5c2cef.29f798",
+        "x": 7000.38232421875,
+        "y": 2534.6556701660156,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "b10b1934.5f3698"
+                "ca909332.9badd"
             ]
         ]
     },
     {
-        "id": "b10b1934.5f3698",
+        "id": "ca909332.9badd",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 7257,
-        "y": 2518,
-        "z": "df5c2cef.29f798",
+        "x": 7215,
+        "y": 2531,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "a0b78348.a09218",
+        "id": "1b14a9d6.5d5776",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3873,
-        "y": 4285,
-        "z": "df5c2cef.29f798",
+        "x": 3831,
+        "y": 4298,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "d9387db0.98ab68",
-                "8c979de9.c09378"
+                "c8a00103.c44878",
+                "83baeacb.444588"
             ]
         ]
     },
     {
-        "id": "94fd6991.78fda",
+        "id": "77665e36.902488",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5376,
-        "y": 2744,
-        "z": "df5c2cef.29f798",
+        "x": 5334,
+        "y": 2757,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "a8dd9104.b00cc8",
-                "a5fa454e.c7391"
+                "84137cfa.8c833",
+                "67fc26bd.7160b"
             ]
         ]
     },
     {
-        "id": "a8dd9104.b00cc8",
+        "id": "84137cfa.8c833",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5577,
-        "y": 2742,
-        "z": "df5c2cef.29f798",
+        "x": 5535,
+        "y": 2755,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "bde911bd.4178d"
+                "f473c0e8.32ced8"
             ]
         ]
     },
     {
-        "id": "bde911bd.4178d",
+        "id": "f473c0e8.32ced8",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 5791,
-        "y": 2744,
-        "z": "df5c2cef.29f798",
+        "x": 5749,
+        "y": 2757,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "99bcb408.94c238",
+        "id": "fc82d42d.acc69",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5794,
-        "y": 2793,
-        "z": "df5c2cef.29f798",
+        "x": 5752,
+        "y": 2806,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ba84b2ac.820f48",
-                "f2bc6a9d.359a1"
+                "7c791386.dabd3c",
+                "9bcb702f.f45c28"
             ]
         ]
     },
     {
-        "id": "ba84b2ac.820f48",
+        "id": "7c791386.dabd3c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6024,
-        "y": 2789,
-        "z": "df5c2cef.29f798",
+        "x": 5982,
+        "y": 2802,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "7b7412c.2c058ec"
+                "982b0489.27b268"
             ]
         ]
     },
     {
-        "id": "7b7412c.2c058ec",
+        "id": "982b0489.27b268",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
         "comments": "",
-        "x": 6238,
-        "y": 2792,
-        "z": "df5c2cef.29f798",
+        "x": 6196,
+        "y": 2805,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "a5fa454e.c7391",
+        "id": "67fc26bd.7160b",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5577,
-        "y": 2791,
-        "z": "df5c2cef.29f798",
+        "x": 5535,
+        "y": 2804,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "99bcb408.94c238"
+                "fc82d42d.acc69"
             ]
         ]
     },
     {
-        "id": "f2bc6a9d.359a1",
+        "id": "9bcb702f.f45c28",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6025,
-        "y": 2835,
-        "z": "df5c2cef.29f798",
+        "x": 5983,
+        "y": 2848,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "97f6382c.08a66"
+                "95308046.cfa4"
             ]
         ]
     },
     {
-        "id": "97f6382c.08a66",
+        "id": "95308046.cfa4",
         "type": "set",
         "name": "set attachment_param domain G",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 6239,
-        "y": 2835,
-        "z": "df5c2cef.29f798",
+        "x": 6197,
+        "y": 2848,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "d5f9f3e8.876da8",
+        "id": "20917868.85ed",
         "type": "set",
         "name": "set tmp.slicevpns",
         "xml": "<set>\n<parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n<parameter name='tmp.slicevpns_length' value=\"`$tmp.slicevpns_length + 1`\" />\n\n<parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n\n",
         "comments": "",
-        "x": 6137,
-        "y": 2884,
-        "z": "df5c2cef.29f798",
+        "x": 6095,
+        "y": 2897,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "45048a47.3aa5fc",
+        "id": "a85f98e7.7e0e3",
         "type": "switchNode",
         "name": "switch vpnuuid is for this slice",
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n    \n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.aai.service-instance.service-instance-id `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 4701,
-        "y": 4108,
-        "z": "df5c2cef.29f798",
+        "x": 4659,
+        "y": 4121,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "34a9fd7.c9a0402",
-                "a146c972.fd19c"
+                "c594891a.4ece58",
+                "9fcde7ff.ff63c8"
             ]
         ]
     },
     {
-        "id": "34a9fd7.c9a0402",
+        "id": "c594891a.4ece58",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4918,
-        "y": 4087,
-        "z": "df5c2cef.29f798",
+        "x": 4876,
+        "y": 4100,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "7c5ab1e1.aaf1f8"
+                "4b2347b3.08fa3"
             ]
         ]
     },
     {
-        "id": "a146c972.fd19c",
+        "id": "9fcde7ff.ff63c8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4918,
-        "y": 4136,
-        "z": "df5c2cef.29f798",
+        "x": 4876,
+        "y": 4149,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "7c5ab1e1.aaf1f8",
+        "id": "4b2347b3.08fa3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5086,
-        "y": 4087,
-        "z": "df5c2cef.29f798",
+        "x": 5044,
+        "y": 4100,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "e7eee5b6.16e978",
-                "b5b6b6e5.2bc768"
+                "315b6688.54502a",
+                "2e1bb3dd.371e44"
             ]
         ]
     },
     {
-        "id": "320f3490.61a614",
+        "id": "adcb7aad.70c0d",
         "type": "save",
         "name": "get logical-link from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
         "comments": "",
         "outputs": 1,
-        "x": 1426,
-        "y": 718,
-        "z": "df5c2cef.29f798",
+        "x": 1384,
+        "y": 731,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "653e0797.1d827",
-                "db86f5c5.803548",
-                "a788197d.0ee218"
+                "89022850.9f967",
+                "75f048cb.75fe2",
+                "d7d4823f.55128"
             ]
         ]
     },
     {
-        "id": "653e0797.1d827",
+        "id": "89022850.9f967",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1638.490966796875,
-        "y": 684.573974609375,
-        "z": "df5c2cef.29f798",
+        "x": 1596.490966796875,
+        "y": 697.573974609375,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "a3fdac41.0f5208"
+                "278a0fef.2766a8"
             ]
         ]
     },
     {
-        "id": "db86f5c5.803548",
+        "id": "75f048cb.75fe2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1627,
-        "y": 729,
-        "z": "df5c2cef.29f798",
+        "x": 1585,
+        "y": 742,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "6b3d987f.3963e8"
+                "93e6204d.139fe"
             ]
         ]
     },
     {
-        "id": "a3fdac41.0f5208",
+        "id": "278a0fef.2766a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1787.0625,
-        "y": 684.8597412109375,
-        "z": "df5c2cef.29f798",
+        "x": 1745.0625,
+        "y": 697.8597412109375,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "6b3d987f.3963e8",
+        "id": "93e6204d.139fe",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1786,
-        "y": 729,
-        "z": "df5c2cef.29f798",
+        "x": 1744,
+        "y": 742,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "a788197d.0ee218",
+        "id": "d7d4823f.55128",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1632,
-        "y": 772,
-        "z": "df5c2cef.29f798",
+        "x": 1590,
+        "y": 785,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "6f79cb60.ba682c"
+                "6c086bfb.a0d044"
             ]
         ]
     },
     {
-        "id": "6f79cb60.ba682c",
+        "id": "6c086bfb.a0d044",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 778,
-        "y": 1111,
-        "z": "df5c2cef.29f798",
+        "x": 736,
+        "y": 1124,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "b6c5466.cef2ab8"
+                "b122eb38.341668"
             ]
         ]
     },
     {
-        "id": "b6c5466.cef2ab8",
+        "id": "b122eb38.341668",
         "type": "for",
         "name": "for each svc-instance relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1052,
-        "y": 1111,
-        "z": "df5c2cef.29f798",
+        "x": 1010,
+        "y": 1124,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "db0349a.25c5f38"
+                "428eb2b6.4c43ec"
             ]
         ]
     },
     {
-        "id": "db0349a.25c5f38",
+        "id": "428eb2b6.4c43ec",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1287.33349609375,
-        "y": 1112,
-        "z": "df5c2cef.29f798",
+        "x": 1245.33349609375,
+        "y": 1125,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "e2db5406.ea53a8"
+                "6c08ceaa.3d7e3"
             ]
         ]
     },
     {
-        "id": "e2db5406.ea53a8",
+        "id": "6c08ceaa.3d7e3",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 571.000244140625,
-        "y": 1265,
-        "z": "df5c2cef.29f798",
+        "x": 529.000244140625,
+        "y": 1278,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "4dfa6aad.834ec4"
+                "42fb5b21.64c794"
             ]
         ]
     },
     {
-        "id": "a29cb5bb.c12f3",
+        "id": "c24bb232.38015",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 960,
-        "y": 1270,
-        "z": "df5c2cef.29f798",
+        "x": 918,
+        "y": 1283,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "c355a2e8.7aaf9",
-                "bfa7f0cb.443038",
-                "86dae01c.e8a7d8"
+                "a881a6a4.94a7c8",
+                "2e732415.a6ca64",
+                "10e50fbd.fcc5a"
             ]
         ]
     },
     {
-        "id": "c355a2e8.7aaf9",
+        "id": "a881a6a4.94a7c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1156,
-        "y": 1235,
-        "z": "df5c2cef.29f798",
+        "x": 1114,
+        "y": 1248,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "1f5a660e.de0452"
+                "2f6cf4f3.693c54"
             ]
         ]
     },
     {
-        "id": "bfa7f0cb.443038",
+        "id": "2e732415.a6ca64",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1156.490966796875,
-        "y": 1280.5740356445312,
-        "z": "df5c2cef.29f798",
+        "x": 1114.490966796875,
+        "y": 1293.5740356445312,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "f567d172.d846a8"
+                "75b4d03c.1b0488"
             ]
         ]
     },
     {
-        "id": "86dae01c.e8a7d8",
+        "id": "10e50fbd.fcc5a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1121,
-        "y": 1326,
-        "z": "df5c2cef.29f798",
+        "x": 1079,
+        "y": 1339,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "3f353c11.763704"
+                "83cefb63.3d3958"
             ]
         ]
     },
     {
-        "id": "f567d172.d846a8",
+        "id": "75b4d03c.1b0488",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1316.0625,
-        "y": 1277.8597412109375,
-        "z": "df5c2cef.29f798",
+        "x": 1274.0625,
+        "y": 1290.8597412109375,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "3f353c11.763704",
+        "id": "83cefb63.3d3958",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1274,
-        "y": 1328,
-        "z": "df5c2cef.29f798",
+        "x": 1232,
+        "y": 1341,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "11174c12.9e5084",
+        "id": "f0221f2b.2ca488",
         "type": "switchNode",
         "name": "switch loglink-id exists in conn",
         "xml": "<switch test='`$tmp.aai.logical-link.link-id == $tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1549,
-        "y": 1218,
-        "z": "df5c2cef.29f798",
+        "x": 1507,
+        "y": 1231,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "b3297b62.15a2f",
-                "5b8a7e9c.a8c0b8"
+                "1f27bf84.77001",
+                "e05aac94.264e2"
             ]
         ]
     },
     {
-        "id": "b3297b62.15a2f",
+        "id": "1f27bf84.77001",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1760,
-        "y": 1183,
-        "z": "df5c2cef.29f798",
+        "x": 1718,
+        "y": 1196,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "1488db49.ce832d"
+                "5241d9c1.c5a"
             ]
         ]
     },
     {
-        "id": "5b8a7e9c.a8c0b8",
+        "id": "e05aac94.264e2",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1757,
-        "y": 1244,
-        "z": "df5c2cef.29f798",
+        "x": 1715,
+        "y": 1257,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "3dd67f85.457d6",
+        "id": "7d1ab491.7a47ec",
         "type": "set",
         "name": "set currLinkIsFound",
         "xml": "<set>\n<parameter name='currLinkIsFound' value=\"true\" />\n\n\n",
         "comments": "",
-        "x": 2098,
-        "y": 1156,
-        "z": "df5c2cef.29f798",
+        "x": 2056,
+        "y": 1169,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "1488db49.ce832d",
+        "id": "5241d9c1.c5a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1912,
-        "y": 1184,
-        "z": "df5c2cef.29f798",
+        "x": 1870,
+        "y": 1197,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "3dd67f85.457d6"
+                "7d1ab491.7a47ec"
             ]
         ]
     },
     {
-        "id": "17fda0a8.543d27",
+        "id": "ac3d3bcb.07c358",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2065,
-        "y": 1212,
-        "z": "df5c2cef.29f798",
+        "x": 2023,
+        "y": 1225,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "9e795c2b.8794b8",
+        "id": "3aa19f56.483778",
         "type": "comment",
         "name": "currLinkIsFound. Go to the next logical-link",
         "info": "",
         "comments": "",
-        "x": 2070,
-        "y": 1106,
-        "z": "df5c2cef.29f798",
+        "x": 2028,
+        "y": 1119,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "32833f1a.e66008",
+        "id": "7947ec90.0b2fbc",
         "type": "switchNode",
         "name": "switch currLinkIsFound",
         "xml": "<switch test='`$currLinkIsFound`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1352,
-        "y": 836,
-        "z": "df5c2cef.29f798",
+        "x": 1310,
+        "y": 849,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "89a54b3d.dce24",
-                "e0be93c4.ec1bf"
+                "69298f6c.9e2dd",
+                "bb557fd5.52031"
             ]
         ]
     },
     {
-        "id": "89a54b3d.dce24",
+        "id": "69298f6c.9e2dd",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1538,
-        "y": 815,
-        "z": "df5c2cef.29f798",
+        "x": 1496,
+        "y": 828,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "73540b39.f320f4"
+                "cab96485.7156b"
             ]
         ]
     },
     {
-        "id": "e0be93c4.ec1bf",
+        "id": "bb557fd5.52031",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1535,
-        "y": 951,
-        "z": "df5c2cef.29f798",
+        "x": 1493,
+        "y": 964,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8fff13f1.763be8"
+                "b394b52b.88d4f8"
             ]
         ]
     },
     {
-        "id": "73540b39.f320f4",
+        "id": "cab96485.7156b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1780,
-        "y": 810,
-        "z": "df5c2cef.29f798",
+        "x": 1738,
+        "y": 823,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "71783690.9edfa",
+        "id": "b4a6c43d.bfc078",
         "type": "comment",
         "name": "A new logical-link has been found: modify process should be triggered",
         "info": "",
         "comments": "",
-        "x": 1726,
-        "y": 914,
-        "z": "df5c2cef.29f798",
+        "x": 1684,
+        "y": 927,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "1f5a660e.de0452",
+        "id": "2f6cf4f3.693c54",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1320,
-        "y": 1219,
-        "z": "df5c2cef.29f798",
+        "x": 1278,
+        "y": 1232,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "11174c12.9e5084",
-                "28a678cf.73375"
+                "f0221f2b.2ca488",
+                "9c07de97.8ce1e8"
             ]
         ]
     },
     {
-        "id": "28a678cf.73375",
+        "id": "9c07de97.8ce1e8",
         "type": "switchNode",
         "name": "switch connectivityBW == gfp",
         "xml": "<switch test='`$tmp.aai.connectivity.bandwidth-profile-name == $gfp`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1550,
-        "y": 1309,
-        "z": "df5c2cef.29f798",
+        "x": 1508,
+        "y": 1322,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "7593ee23.7a5fc8",
-                "f472c4e4.19eb4"
+                "e92f497c.306ff",
+                "202f30a4.8a9778"
             ]
         ]
     },
     {
-        "id": "7593ee23.7a5fc8",
+        "id": "e92f497c.306ff",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1755,
-        "y": 1305,
-        "z": "df5c2cef.29f798",
+        "x": 1713,
+        "y": 1318,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "f472c4e4.19eb4",
+        "id": "202f30a4.8a9778",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1757,
-        "y": 1355,
-        "z": "df5c2cef.29f798",
+        "x": 1715,
+        "y": 1368,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "a1ad62a5.377c38"
+                "aabbec3c.d5f948"
             ]
         ]
     },
     {
-        "id": "dbf4dd89.edfbf8",
+        "id": "79a3430c.be3b14",
         "type": "set",
         "name": "set bwModified",
         "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
         "comments": "",
-        "x": 2106,
-        "y": 1333,
-        "z": "df5c2cef.29f798",
+        "x": 2064,
+        "y": 1346,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "a1ad62a5.377c38",
+        "id": "aabbec3c.d5f948",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1911,
-        "y": 1354,
-        "z": "df5c2cef.29f798",
+        "x": 1869,
+        "y": 1367,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "dbf4dd89.edfbf8",
-                "8b32fc44.9a74b"
+                "79a3430c.be3b14",
+                "b3b4a039.5c091"
             ]
         ]
     },
     {
-        "id": "8b32fc44.9a74b",
+        "id": "b3b4a039.5c091",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 931,
-        "y": 1559,
-        "z": "df5c2cef.29f798",
+        "x": 889,
+        "y": 1572,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "3a2b0e4e.390f2a"
+                "74886cc5.56820c"
             ]
         ]
     },
     {
-        "id": "3a2b0e4e.390f2a",
+        "id": "74886cc5.56820c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1136,
-        "y": 1559,
-        "z": "df5c2cef.29f798",
+        "x": 1094,
+        "y": 1572,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "8cc489a8.1663e8"
+                "ab7d3bd9.5a0118"
             ]
         ]
     },
     {
-        "id": "8cc489a8.1663e8",
+        "id": "ab7d3bd9.5a0118",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1302,
-        "y": 1559,
-        "z": "df5c2cef.29f798",
+        "x": 1260,
+        "y": 1572,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "39440cdd.73e4a4"
+                "9ac61acb.25a0c8"
             ]
         ]
     },
     {
-        "id": "39440cdd.73e4a4",
+        "id": "9ac61acb.25a0c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1465,
-        "y": 1559,
-        "z": "df5c2cef.29f798",
+        "x": 1423,
+        "y": 1572,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "e3ceb0b1.0227c",
-                "837372e0.8cfe9"
+                "2370c115.ac8fd6",
+                "1b61e8de.a73647"
             ]
         ]
     },
     {
-        "id": "837372e0.8cfe9",
+        "id": "1b61e8de.a73647",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 1694,
-        "y": 1499,
-        "z": "df5c2cef.29f798",
+        "x": 1652,
+        "y": 1512,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "e3ceb0b1.0227c",
+        "id": "2370c115.ac8fd6",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1203,
-        "y": 1653,
-        "z": "df5c2cef.29f798",
+        "x": 1161,
+        "y": 1666,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "53bbab14.df656c",
-                "656ddda.68726a4",
-                "3942f2bd.5b5c6e"
+                "28298f17.ccf108",
+                "b6883dde.6b7bf8",
+                "744baf90.7b9cd8"
             ]
         ]
     },
     {
-        "id": "ee3fab4d.b900c8",
+        "id": "98131352.4a889",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1587,
-        "y": 1653,
-        "z": "df5c2cef.29f798",
+        "x": 1545,
+        "y": 1666,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "27f47760.daaf38",
-                "8574ddfc.4f71a8"
+                "1b2b6a88.49f2b5",
+                "43c66f34.653488"
             ]
         ]
     },
     {
-        "id": "53bbab14.df656c",
+        "id": "28298f17.ccf108",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1414,
-        "y": 1655,
-        "z": "df5c2cef.29f798",
+        "x": 1372,
+        "y": 1668,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "ee3fab4d.b900c8"
+                "98131352.4a889"
             ]
         ]
     },
     {
-        "id": "656ddda.68726a4",
+        "id": "b6883dde.6b7bf8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1414.490966796875,
-        "y": 1700.5740356445312,
-        "z": "df5c2cef.29f798",
+        "x": 1372.490966796875,
+        "y": 1713.5740356445312,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "a14bcd53.80dad"
+                "15cd27be.d92658"
             ]
         ]
     },
     {
-        "id": "3942f2bd.5b5c6e",
+        "id": "744baf90.7b9cd8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1412,
-        "y": 1744,
-        "z": "df5c2cef.29f798",
+        "x": 1370,
+        "y": 1757,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "3d036bfb.d96184"
+                "d3584005.2bd19"
             ]
         ]
     },
     {
-        "id": "3d036bfb.d96184",
+        "id": "d3584005.2bd19",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1579,
-        "y": 1761,
-        "z": "df5c2cef.29f798",
+        "x": 1537,
+        "y": 1774,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "a14bcd53.80dad",
+        "id": "15cd27be.d92658",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1577.0623779296875,
-        "y": 1700.8597717285156,
-        "z": "df5c2cef.29f798",
+        "x": 1535.0623779296875,
+        "y": 1713.8597717285156,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "4dfa6aad.834ec4",
+        "id": "42fb5b21.64c794",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 743,
-        "y": 1265,
-        "z": "df5c2cef.29f798",
+        "x": 701,
+        "y": 1278,
+        "z": "a1c94a24.22ed9",
         "wires": [
             [
-                "a29cb5bb.c12f3",
-                "ff2edf17.9b8f3"
+                "c24bb232.38015",
+                "cd433210.9124b"
             ]
         ]
     },
     {
-        "id": "ff2edf17.9b8f3",
+        "id": "cd433210.9124b",
         "type": "set",
         "name": "unset tmp.aai.connectivity",
         "xml": "<set>\n<parameter name='tmp.aai.connectivity.' value='' />\n",
         "comments": "",
-        "x": 963,
-        "y": 1213,
-        "z": "df5c2cef.29f798",
+        "x": 921,
+        "y": 1226,
+        "z": "a1c94a24.22ed9",
         "wires": []
     },
     {
-        "id": "27f47760.daaf38",
+        "id": "1b2b6a88.49f2b5",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1937.5,
-        "y": 1648,
-        "z": "df5c2cef.29f798",
+        "x": 1895.5,
+        "y": 1661,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
     },
     {
-        "id": "8574ddfc.4f71a8",
+        "id": "43c66f34.653488",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1864.5,
-        "y": 1712,
-        "z": "df5c2cef.29f798",
+        "x": 1822.5,
+        "y": 1725,
+        "z": "a1c94a24.22ed9",
         "wires": [
             []
         ]
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 82210c16..3120201e 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
@@ -3,434 +3,436 @@
         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}'>
     <method rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync'>
         <block atomic="true">
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
-                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url + '?ethsrvType=' + $prop.ethsrvType`" />
-                <parameter name="restapiUser" value="`$prop.oof.user`" />
-                <parameter name="restapiPassword" value="`$prop.oof.password`" />
-                <parameter name="format" value="json"/>
-                <parameter name="httpMethod" value="post"/>
-                <parameter name="responsePrefix" value="otn-oof"/>
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                <parameter name="trustStorePassword" value="adminadmin"/>
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                <parameter name="keyStorePassword" value="adminadmin"/>
-                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error executing OOF api" />
-                    </return>
-                </outcome>
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-            </execute>
             <block atomic='true'>
                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                              resource="pnfs"
-                              key="selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'"
+                              resource="network-resources"
+                              key="selflink = 'https://aai.onap:8443/aai/v21/network/network-resources?depth=0'"
                               local-only="false"
-                              pfx="ccsdkTopo.pnfs" >
-                    <outcome value='Other'>
-                        <return status='failure'>
-                            <parameter name='error-code' value='' />
-                            <parameter name='error-message' value='' />
-                        </return>
-                    </outcome>
-                    <outcome value='not-found'>
-                        <return status='failure'>
-                            <parameter name='error-code' value='' />
-                            <parameter name='error-message' value='' />
-                        </return>
-                    </outcome>
-                    <outcome value='success'></outcome>
-                </get-resource>
-                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                              resource="logical-links"
-                              key="selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'"
-                              local-only="false"
-                              pfx="ccsdkTopo.logicalLinks" >
-                    <outcome value='Other'>
-                        <return status='failure'>
-                            <parameter name='error-code' value='' />
-                            <parameter name='error-message' value='' />
-                        </return>
-                    </outcome>
-                    <outcome value='not-found'>
-                        <return status='failure'>
-                            <parameter name='error-code' value='' />
-                            <parameter name='error-message' value='' />
-                        </return>
-                    </outcome>
+                              pfx="allNetworksList" >
                     <outcome value='success'></outcome>
+                    <outcome value='Other'></outcome>
+                    <outcome value='not-found'></outcome>
                 </get-resource>
-                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.slitopologyutils.SliTopologyUtils' method='computePath' >
-                    <parameter name="pnfs-pfx" value='`$ccsdkTopo.pnfs`'/>
-                    <parameter name="links-pfx" value="`$ccsdkTopo.logicalLinks`"/>
+                <for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >
+                    <switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>
+                        <outcome value='true'>
+                            <switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>
+                                <outcome value='true'>
+                                    <set>
+                                        <parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                        <outcome value='false'>
+                            <switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainB-pnfName[2]`'>
+                                <outcome value='true'>
+                                    <switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainB-pnfName[6]`'>
+                                        <outcome value='true'>
+                                            <set>
+                                                <parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                            </set>
+                                        </outcome>
+                                    </switch>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                </for>
+                <set>
+                    <parameter name='tmp.pce-src-node.' value='' />
+                </set>
+                <set>
+                    <parameter name='tmp.pce-dst-node.' value='' />
+                </set>
+                <set>
+                    <!--<parameter name='`otn-oof`' value='' />-->
+                    <parameter name='otn-oof.' value='' />
+                    <!--<parameter name='`otn-oof.solutions`' value='' />-->
+                    <!--<parameter name='`otn-oof.solutions.`' value='' />-->
+                    <!--<parameter name='`otn-oof.solutions_length`' value='0' />-->
+                </set>
+                <set>
+                    <!--<parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->
+                    <!--                                                   1 + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[8]`" />-->
+                    <parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $otnTopoIdSrc + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                </set>
+                <set>
+                    <!--<parameter name='$tmp.pce-dst-node' value="`$param-prefix-domainB-pnfName[0] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[1] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[2] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[3] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[4] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[5] + '-' +-->
+                    <!--                                                   1 + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[7] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[8]`" />-->
+                    <parameter name='tmp.pce-dst-node' value="`$param-prefix-domainB-pnfName[0] + '-' +
+                                                   $param-prefix-domainB-pnfName[1] + '-' +
+                                                   $param-prefix-domainB-pnfName[2] + '-' +
+                                                   $param-prefix-domainB-pnfName[3] + '-' +
+                                                   $param-prefix-domainB-pnfName[4] + '-' +
+                                                   $param-prefix-domainB-pnfName[5] + '-' +
+                                                   $otnTopoIdDst + '-' +
+                                                   $param-prefix-domainB-pnfName[7] + '-' +
+                                                   $param-prefix-domainB-pnfName[8]`" />
+                </set>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                    <parameter name="logger" value="message-log" />
+                    <parameter name="level" value="info" />
+                    <!--<parameter name="field1" value="Path computation succeed!"/>-->
+                    <!--<parameter name="field2" value="`$ccsdkTopo.resp.solutions_length`"/>-->
+                    <!--<parameter name="field1" value="`$tmp.src.domainA.pnf-name`"/>-->
+                    <!--<parameter name="field2" value="`$tmp.dst.domainB.pnf-name`"/>-->
+                    <parameter name="field1" value="`$tmp.pce-src-node`"/>
+                    <parameter name="field2" value="`$tmp.pce-dst-node`"/>
+                </record>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                    <parameter name="logger" value="message-log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="`$otn-oof.`"/>
+                </record>
+                <set>
+                    <!--<parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->
+                    <!--                                                   1 + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[8]`" />-->
+                    <parameter name='filenamemm' value="`$tmp.pce-src-node + $tmp.pce-dst-node`" />
+                </set>
+                <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="true"/>
-                    <parameter name="src-node" value="`$tmp.src.domainA.pnf-name`"/>
-                    <parameter name="dst-node" value="`$tmp.src.domainB.pnf-name`"/>
+                    <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>
             <set>
                 <parameter name='`tmp.otninfo.`' value='' />
-                <parameter name='`tmp.otninfo_length`' value='0' />
+                <!--<parameter name='`tmp.otninfo_length`' value='0' />-->
             </set>
             <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >
                 <block atomic="true">
                     <set>
                         <parameter name='otn-oof.link-name' value='' />
-                        <parameter name='tmp.aai.cross-link' value='' />
+                        <!--<parameter name='tmp.aai.cross-link' value='' />-->
                         <parameter name='tmp.aai.cross-link.' value='' />
-                        <parameter name='tmp.aai.cross-link.link-role' value='' />
+                        <!--<parameter name='tmp.aai.cross-link.link-role' value='' />-->
                     </set>
                     <set>
-                        <parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />
-                        <parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].start_node`' />
-                        <parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].end_node`' />
+                        <parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].original_link`' />
+                        <parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].src_node`' />
+                        <parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].dst_node`' />
                     </set>
-                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                  resource="logical-link"
-                                  key="logical-link.link-name = $otn-oof.link-name"
-                                  pfx='tmp.aai.cross-link' local-only='false' >
-                        <!--AND depth = '0'"-->
-                        <outcome value='success'>
-                            <block>
-                                <switch test='`$tmp.aai.cross-link.link-role`'>
-                                    <outcome value='cross-domain'>
-                                        <block atomic="true">
-                                            <for index='lridx' start='0' end='`$tmp.aai.cross-link.relationship-list.relationship_length`' >
-                                                <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>
-                                                    <outcome value='p-interface'>
-                                                        <block>
-                                                            <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.start-node`'>
-                                                                <outcome value='true'>
-                                                                    <block atomic="true">
-                                                                        <set>
-                                                                            <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
-                                                                            <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
-                                                                            <!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-ltp-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />-->
-                                                                            <!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />-->
-                                                                            <!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />-->
-                                                                        </set>
-                                                                    </block>
-                                                                </outcome>
-                                                            </switch>
-                                                            <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.end-node`'>
-                                                                <outcome value='true'>
-                                                                    <block atomic="true">
-                                                                        <set>
-                                                                            <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
-                                                                            <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
-                                                                            <!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-ltp-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />-->
-                                                                            <!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-node-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />-->
-                                                                            <!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />-->
-                                                                        </set>
-                                                                    </block>
-                                                                </outcome>
-                                                            </switch>
-                                                        </block>
-                                                    </outcome>
-                                                </switch>
-                                            </for>
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                          resource="p-interface"
-                                                          key="pnf.pnf-name = $tmp.src-pnf-name
+                    <set>
+                        <parameter name='tmp.cross-link.src-ltpId' value="`$otn-oof.solutions[$vidx].src_pinterface`" />
+                        <parameter name='tmp.src-pnf-name' value="`$otn-oof.solutions[$vidx].src_node`" />
+                    </set>
+                    <set>
+                        <parameter name='tmp.cross-link.dst-ltpId' value="`$otn-oof.solutions[$vidx].dst_pinterface`" />
+                        <parameter name='tmp.dst-pnf-name' value="`$otn-oof.solutions[$vidx].dst_node`" />
+                    </set>
+                    <block atomic="true">
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                      resource="p-interface"
+                                      key="pnf.pnf-name = $tmp.src-pnf-name
 		    AND p-interface.interface-name = $tmp.cross-link.src-ltpId"
-                                                          pfx='tmp.aai.src-tp' local-only='false' >
-                                                <!--AND depth = '0'"-->
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >
-                                                            <switch test='`$tmp.aai.src-tp.relationship-list.relationship[$vidx].related-to`'>
-                                                                <outcome value='tunnel-termination-point'>
-                                                                    <block atomic="true">
-                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                            <parameter name="original_string" value='`$tmp.aai.src-tp`'/>
-                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                            <parameter name="regex" value="[-]+"/>
-                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-src-tp"/>
-                                                                            <outcome value='success'>
-                                                                                <block atomic="true">
-                                                                                    <set>
-                                                                                        <parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />
-                                                                                        <parameter name='`tmp.otninfo[$vidx].dstPort.dst-ltp-id`' value="`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`" />
-                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
-                                                                                    </set>
-                                                                                </block>
-                                                                            </outcome>
-                                                                            <outcome value='failure'>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='error-code' value='' />
-                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                </return>
-                                                                            </outcome>
-                                                                        </execute>
-                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                      resource="pnf"
-                                                                                      key="pnf.pnf-name = $tmp.src-pnf-name"
-                                                                                      pfx='tmp.aai.src-pnf' local-only='false' >
-                                                                            <!--AND depth = '0'"-->
-                                                                            <outcome value='success'>
-                                                                                <block>
-                                                                                    <set>
-                                                                                        <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />
-                                                                                        <parameter name='domain-A.tpn' value='1' />
-                                                                                        <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value="`$tmp.aai.src-pnf.pnf-id`" />
-                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
-                                                                                    </set>
-                                                                                    <for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >
-                                                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>
-                                                                                            <outcome value='network-resource'>
-                                                                                                <block atomic="true">
-                                                                                                    <set>
-                                                                                                        <parameter name='tmp.domain-A.network-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`" />
-                                                                                                    </set>
-                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                  resource="network-resource"
-                                                                                                                  key="network-resource.network-id = $tmp.domain-A.network-id
+                                      pfx='tmp.aai.src-tp' local-only='false' >
+                            <!--AND depth = '0'"-->
+                            <outcome value='success'>
+                                <block>
+                                    <for silentFailure='true' index='pintsidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >
+                                        <switch test='`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].related-to`'>
+                                            <outcome value='tunnel-termination-point'>
+                                                <block atomic="true">
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                        <!--<parameter name="original_string" value='`$tmp.aai.src-tp`'/>-->
+                                                        <parameter name="original_string" value='`$tmp.aai.src-tp.interface-name`'/>
+                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                        <parameter name="regex" value="[-]+"/>
+                                                        <parameter name="ctx_memory_result_key" value="param-prefix-src-tp"/>
+                                                        <outcome value='success'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />
+                                                                    <parameter name='`tmp.otninfo[$vidx].dstPort.dst-ltp-id`' value="`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`" />
+                                                                    <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='failure'>
+                                                            <return status='failure'>
+                                                                <parameter name='error-code' value='' />
+                                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                            </return>
+                                                        </outcome>
+                                                    </execute>
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                  resource="pnf"
+                                                                  key="pnf.pnf-name = $tmp.src-pnf-name"
+                                                                  pfx='tmp.aai.src-pnf' local-only='false' >
+                                                        <!--AND depth = '0'"-->
+                                                        <outcome value='success'>
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                                    <parameter name='domain-A.tpn' value='1' />
+                                                                    <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                                    <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
+                                                                </set>
+                                                                <for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >
+                                                                    <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>
+                                                                        <outcome value='network-resource'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='tmp.domain-A.network-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`" />
+                                                                                </set>
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                              resource="network-resource"
+                                                                                              key="network-resource.network-id = $tmp.domain-A.network-id
 		AND depth = '0'"
-                                                                                                                  pfx='tmp.aai.src-network-resource' local-only='false' >
-                                                                                                        <outcome value='success'>
-                                                                                                            <set>
-                                                                                                                <parameter name='domain-A.network-id' value="`$tmp.aai.src-network-resource.network-id`" />
-                                                                                                                <parameter name='domain-A.provider-id' value="`$tmp.aai.src-network-resource.provider-id`" />
-                                                                                                                <parameter name='domain-A.client-id' value="`$tmp.aai.src-network-resource.client-id`" />
-                                                                                                                <parameter name='domain-A.te-topo-id' value="`$tmp.aai.src-network-resource.te-topo-id`" />
-                                                                                                                <parameter name='domain-A.network-type' value="`$tmp.aai.src-network-resource.network-type`" />
-                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-id`' value="`$tmp.aai.src-network-resource.network-id`" />
-                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-provider-id`' value="`$tmp.aai.src-network-resource.provider-id`" />
-                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-client-id`' value="`$tmp.aai.src-network-resource.client-id`" />
-                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-topology-id`' value="`$tmp.aai.src-network-resource.te-topo-id`" />
-                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-type`' value="`$tmp.aai.src-network-resource.network-type`" />
-                                                                                                                <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
-                                                                                                            </set>
-                                                                                                        </outcome>
-                                                                                                    </get-resource>
-                                                                                                    <break/>
-                                                                                                </block>
-                                                                                            </outcome>
-                                                                                        </switch>
-                                                                                    </for>
-                                                                                </block>
-                                                                            </outcome>
-                                                                            <outcome value='not-found'>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                    <parameter name="error-code" value="500" />
-                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                </return>
-                                                                            </outcome>
-                                                                            <outcome value='Other'>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                    <parameter name="error-code" value="500" />
-                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                </return>
-                                                                            </outcome>
-                                                                        </get-resource>
-                                                                        <set>
-                                                                            <parameter name='tmp.domain-A.ttp-id' value="`$tmp.aai.src-tp.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
-                                                                        </set>
-                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                      resource="tunnel-termination-point"
-                                                                                      key="tunnel-termination-point.ttp-id = $tmp.domain-A.ttp-id
+                                                                                              pfx='tmp.aai.src-network-resource' local-only='false' >
+                                                                                    <outcome value='success'>
+                                                                                        <set>
+                                                                                            <parameter name='domain-A.network-id' value="`$tmp.aai.src-network-resource.network-id`" />
+                                                                                            <parameter name='domain-A.provider-id' value="`$tmp.aai.src-network-resource.provider-id`" />
+                                                                                            <parameter name='domain-A.client-id' value="`$tmp.aai.src-network-resource.client-id`" />
+                                                                                            <parameter name='domain-A.te-topo-id' value="`$tmp.aai.src-network-resource.te-topo-id`" />
+                                                                                            <parameter name='domain-A.network-type' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                                            <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-id`' value="`$tmp.aai.src-network-resource.network-id`" />
+                                                                                            <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-provider-id`' value="`$tmp.aai.src-network-resource.provider-id`" />
+                                                                                            <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-client-id`' value="`$tmp.aai.src-network-resource.client-id`" />
+                                                                                            <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-topology-id`' value="`$tmp.aai.src-network-resource.te-topo-id`" />
+                                                                                            <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-type`' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                                            <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
+                                                                                        </set>
+                                                                                    </outcome>
+                                                                                </get-resource>
+                                                                                <break/>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='not-found'>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                            </return>
+                                                        </outcome>
+                                                        <outcome value='Other'>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                            </return>
+                                                        </outcome>
+                                                    </get-resource>
+                                                    <set>
+                                                        <parameter name='tmp.domain-A.ttp-id' value="`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].relationship-data[0].relationship-value`" />
+                                                    </set>
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                  resource="tunnel-termination-point"
+                                                                  key="tunnel-termination-point.ttp-id = $tmp.domain-A.ttp-id
 		AND depth = '0'"
-                                                                                      pfx='tmp.aai.src-ttp' local-only='false' >
-                                                                            <outcome value='success'>
-                                                                                <block atomic="true">
-                                                                                    <set>
-                                                                                        <parameter name='domain-A.tunnel-tp-id' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />
-                                                                                        <parameter name='`tmp.otninfo[$vidx].dstPort.dst-tunnel-tp-id`' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />
-                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
-                                                                                    </set>
-                                                                                </block>
-                                                                            </outcome>
-                                                                        </get-resource>
-                                                                        <break/>
-                                                                    </block>
-                                                                </outcome>
-                                                            </switch>
-                                                        </for>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                    </return>
-                                                </outcome>
-                                                <outcome value='Other'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                    </return>
-                                                </outcome>
-                                            </get-resource>
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                          resource="p-interface"
-                                                          key="pnf.pnf-name = $tmp.dst-pnf-name
+                                                                  pfx='tmp.aai.src-ttp' local-only='false' >
+                                                        <outcome value='success'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name='domain-A.tunnel-tp-id' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />
+                                                                    <parameter name='`tmp.otninfo[$vidx].dstPort.dst-tunnel-tp-id`' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />
+                                                                    <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </get-resource>
+                                                    <break/>
+                                                </block>
+                                            </outcome>
+                                        </switch>
+                                    </for>
+                                </block>
+                            </outcome>
+                            <outcome value='not-found'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                </return>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                </return>
+                            </outcome>
+                        </get-resource>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                      resource="p-interface"
+                                      key="pnf.pnf-name = $tmp.dst-pnf-name
 		    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId"
-                                                          pfx='tmp.aai.dst-tp' local-only='false' >
-                                                <!--AND depth = '0'"-->
-                                                <outcome value='success'>
-                                                    <block>
-                                                        <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >
-                                                            <switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$vidx].related-to`'>
-                                                                <outcome value='tunnel-termination-point'>
-                                                                    <block atomic="true">
-                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                            <parameter name="original_string" value='`$tmp.aai.dst-tp`'/>
-                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                            <parameter name="regex" value="[-]+"/>
-                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-dst-tp"/>
-                                                                            <outcome value='success'>
-                                                                                <block atomic="true">
-                                                                                    <set>
-                                                                                        <parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />
-                                                                                        <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-ltp-id`' value="`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`" />
-                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
-                                                                                    </set>
-                                                                                </block>
-                                                                            </outcome>
-                                                                            <outcome value='failure'>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='error-code' value='' />
-                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                </return>
-                                                                            </outcome>
-                                                                        </execute>
-                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                      resource="pnf"
-                                                                                      key="pnf.pnf-name = $tmp.dst-pnf-name"
-                                                                                      pfx='tmp.aai.dst-pnf' local-only='false' >
-                                                                            <!--AND depth = '0'"-->
-                                                                            <outcome value='success'>
-                                                                                <block>
-                                                                                    <set>
-                                                                                        <parameter name='domain-B.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />
-                                                                                        <parameter name='domain-B.tpn' value='1' />
-                                                                                        <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-node-id`' value="`$tmp.aai.dst-pnf.pnf-id`" />
-                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
-                                                                                    </set>
-                                                                                    <for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >
-                                                                                        <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>
-                                                                                            <outcome value='network-resource'>
-                                                                                                <block atomic="true">
-                                                                                                    <set>
-                                                                                                        <parameter name='tmp.domain-B.network-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`" />
-                                                                                                    </set>
-                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                  resource="network-resource"
-                                                                                                                  key="network-resource.network-id = $tmp.domain-B.network-id
+                                      pfx='tmp.aai.dst-tp' local-only='false' >
+                            <!--AND depth = '0'"-->
+                            <outcome value='success'>
+                                <block>
+                                    <for silentFailure='true' index='pintdidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >
+                                        <switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].related-to`'>
+                                            <outcome value='tunnel-termination-point'>
+                                                <block atomic="true">
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                        <parameter name="original_string" value='`$tmp.aai.dst-tp`'/>
+                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                        <parameter name="regex" value="[-]+"/>
+                                                        <parameter name="ctx_memory_result_key" value="param-prefix-dst-tp"/>
+                                                        <outcome value='success'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />
+                                                                    <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-ltp-id`' value="`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`" />
+                                                                    <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='failure'>
+                                                            <return status='failure'>
+                                                                <parameter name='error-code' value='' />
+                                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                            </return>
+                                                        </outcome>
+                                                    </execute>
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                  resource="pnf"
+                                                                  key="pnf.pnf-name = $tmp.dst-pnf-name"
+                                                                  pfx='tmp.aai.dst-pnf' local-only='false' >
+                                                        <!--AND depth = '0'"-->
+                                                        <outcome value='success'>
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name='domain-B.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                                    <parameter name='domain-B.tpn' value='1' />
+                                                                    <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-node-id`' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                                    <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
+                                                                </set>
+                                                                <for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >
+                                                                    <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>
+                                                                        <outcome value='network-resource'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='tmp.domain-B.network-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`" />
+                                                                                </set>
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                              resource="network-resource"
+                                                                                              key="network-resource.network-id = $tmp.domain-B.network-id
 		AND depth = '0'"
-                                                                                                                  pfx='tmp.aai.dst-network-resource' local-only='false' >
-                                                                                                        <outcome value='success'>
-                                                                                                            <set>
-                                                                                                                <parameter name='domain-B.network-id' value="`$tmp.aai.dst-network-resource.network-id`" />
-                                                                                                                <parameter name='domain-B.provider-id' value="`$tmp.aai.dst-network-resource.provider-id`" />
-                                                                                                                <parameter name='domain-B.client-id' value="`$tmp.aai.dst-network-resource.client-id`" />
-                                                                                                                <parameter name='domain-B.te-topo-id' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
-                                                                                                                <parameter name='domain-B.network-type' value="`$tmp.aai.dst-network-resource.network-type`" />
-                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-id`' value="`$tmp.aai.dst-network-resource.network-id`" />
-                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-provider-id`' value="`$tmp.aai.dst-network-resource.provider-id`" />
-                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-client-id`' value="`$tmp.aai.dst-network-resource.client-id`" />
-                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-topology-id`' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
-                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-type`' value="`$tmp.aai.dst-network-resource.network-type`" />
-                                                                                                                <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
-                                                                                                            </set>
-                                                                                                        </outcome>
-                                                                                                    </get-resource>
-                                                                                                    <break/>
-                                                                                                </block>
-                                                                                            </outcome>
-                                                                                        </switch>
-                                                                                    </for>
-                                                                                </block>
-                                                                            </outcome>
-                                                                            <outcome value='not-found'>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                    <parameter name="error-code" value="500" />
-                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                </return>
-                                                                            </outcome>
-                                                                            <outcome value='Other'>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                    <parameter name="error-code" value="500" />
-                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                </return>
-                                                                            </outcome>
-                                                                        </get-resource>
-                                                                        <set>
-                                                                            <parameter name='tmp.domain-B.ttp-id' value="`$tmp.aai.dst-tp.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
-                                                                        </set>
-                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                      resource="tunnel-termination-point"
-                                                                                      key="tunnel-termination-point.ttp-id = $tmp.domain-B.ttp-id
+                                                                                              pfx='tmp.aai.dst-network-resource' local-only='false' >
+                                                                                    <outcome value='success'>
+                                                                                        <set>
+                                                                                            <parameter name='domain-B.network-id' value="`$tmp.aai.dst-network-resource.network-id`" />
+                                                                                            <parameter name='domain-B.provider-id' value="`$tmp.aai.dst-network-resource.provider-id`" />
+                                                                                            <parameter name='domain-B.client-id' value="`$tmp.aai.dst-network-resource.client-id`" />
+                                                                                            <parameter name='domain-B.te-topo-id' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
+                                                                                            <parameter name='domain-B.network-type' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                                            <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-id`' value="`$tmp.aai.dst-network-resource.network-id`" />
+                                                                                            <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-provider-id`' value="`$tmp.aai.dst-network-resource.provider-id`" />
+                                                                                            <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-client-id`' value="`$tmp.aai.dst-network-resource.client-id`" />
+                                                                                            <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-topology-id`' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
+                                                                                            <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-type`' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                                            <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
+                                                                                        </set>
+                                                                                    </outcome>
+                                                                                </get-resource>
+                                                                                <break/>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='not-found'>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                            </return>
+                                                        </outcome>
+                                                        <outcome value='Other'>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                            </return>
+                                                        </outcome>
+                                                    </get-resource>
+                                                    <set>
+                                                        <parameter name='tmp.domain-B.ttp-id' value="`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].relationship-data[0].relationship-value`" />
+                                                    </set>
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                  resource="tunnel-termination-point"
+                                                                  key="tunnel-termination-point.ttp-id = $tmp.domain-B.ttp-id
 		AND depth = '0'"
-                                                                                      pfx='tmp.aai.dst-ttp' local-only='false' >
-                                                                            <outcome value='success'>
-                                                                                <block atomic="true">
-                                                                                    <set>
-                                                                                        <parameter name='domain-B.tunnel-tp-id' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />
-                                                                                        <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-tunnel-tp-id`' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />
-                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
-                                                                                    </set>
-                                                                                </block>
-                                                                            </outcome>
-                                                                        </get-resource>
-                                                                        <break/>
-                                                                    </block>
-                                                                </outcome>
-                                                            </switch>
-                                                        </for>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                    </return>
-                                                </outcome>
-                                                <outcome value='Other'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                    </return>
-                                                </outcome>
-                                            </get-resource>
-                                            <break/>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                            </block>
-                        </outcome>
-                        <outcome value='not-found'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                            </return>
-                        </outcome>
-                        <outcome value='Other'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                            </return>
-                        </outcome>
-                    </get-resource>
+                                                                  pfx='tmp.aai.dst-ttp' local-only='false' >
+                                                        <outcome value='success'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name='domain-B.tunnel-tp-id' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />
+                                                                    <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-tunnel-tp-id`' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />
+                                                                    <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </get-resource>
+                                                    <break/>
+                                                </block>
+                                            </outcome>
+                                        </switch>
+                                    </for>
+                                </block>
+                            </outcome>
+                            <outcome value='not-found'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                </return>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                </return>
+                            </outcome>
+                        </get-resource>
+                    </block>
                 </block>
             </for>
         </block>
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
index d61c494b..446a74a8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
@@ -33,16 +33,26 @@
                         <outcome value='false'></outcome>
                         <outcome value='true'>
                             <block>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="pnfs"
+                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'"
+                                              local-only="false"
+                                              pfx="ccsdkTopopnfs" ></get-resource>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="logical-links"
+                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'"
+                                              local-only="false"
+                                              pfx="ccsdkTopologicalLinks" ></get-resource>
                                 <set>
                                     <parameter name='tmp.arr' value='' />
                                     <parameter name='tmp.arridx' value='0' />
                                     <parameter name='tmp.arr_length' value='0' />
                                     <parameter name='otn-tunnel-slice' value='' />
                                     <parameter name='otn-tunnel-slice_length' value='0' />
-                                    <parameter name='tmp.slicevpns' value='' />
-                                    <parameter name='tmp.slicevpns_length' value='0' />
-                                    <parameter name='tmp.slicevpnuuids' value='' />
-                                    <parameter name='tmp.slicevpnuuids.' value='' />
+                                    <!--<parameter name='tmp.slicevpns' value='' />-->
+                                    <!--<parameter name='tmp.slicevpns_length' value='0' />-->
+                                    <!--<parameter name='tmp.slicevpnuuids' value='' />-->
+                                    <!--<parameter name='tmp.slicevpnuuids.' value='' />-->
                                 </set>
                                 <for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >
                                     <set>
@@ -721,6 +731,9 @@
                                                                                                         <parameter name='prop.ethsrvType' value='`$network-route-A`' />
                                                                                                     </set>
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                                                                        <parameter name="filename" value="`$filenamemm`" />
+                                                                                                    </execute>
                                                                                                     <for index='otnidx' start='0' end='`$tmp.otninfo_length`' >
                                                                                                         <block atomic='true'>
                                                                                                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
@@ -828,18 +841,22 @@
                                                                                                             </get-resource>
                                                                                                             <switch test='`$otnidx == 0`'>
                                                                                                                 <outcome value='true'>
-                                                                                                                    <set>
-                                                                                                                        <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                                        <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
-                                                                                                                    </set>
+                                                                                                                    <block>
+                                                                                                                        <set>
+                                                                                                                            <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                            <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
+                                                                                                                        </set>
+                                                                                                                    </block>
                                                                                                                 </outcome>
                                                                                                                 <outcome value='false'>
                                                                                                                     <switch test='`$otnidx == $tmp.otninfo_length - 1`'>
                                                                                                                         <outcome value='true'>
-                                                                                                                            <set>
-                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
-                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                                            </set>
+                                                                                                                            <block>
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
+                                                                                                                                    <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                                </set>
+                                                                                                                            </block>
                                                                                                                         </outcome>
                                                                                                                         <outcome value='false'>
                                                                                                                             <set>
@@ -878,13 +895,7 @@
                                                                                                                 <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->
                                                                                                                 <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />
                                                                                                                 <outcome value='success'>
-                                                                                                                    <block>
-                                                                                                                        <set>
-                                                                                                                            <parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value="`$prop.vpn-binding-otnidx-uuid`" />
-                                                                                                                            <parameter name='tmp.slicevpns_length' value="`$tmp.slicevpns_length + 1`" />
-                                                                                                                            <parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value="`$prop.vpn-binding-otnidx-uuid`" />
-                                                                                                                        </set>
-                                                                                                                    </block>
+                                                                                                                    <block></block>
                                                                                                                 </outcome>
                                                                                                             </save>
                                                                                                             <switch test='`$otnidx == 0`'>
-- 
cgit 1.2.3-korg