From: Dan Timoney <dtimoney@att.com>
Date: Fri, 15 May 2020 17:23:14 +0000 (+0000)
Subject: Merge "Change log4j2 configuration"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=589bc64347dc1281b43622cfd70ba0bc5f5dca1a;hp=582d94bcc69ea564596e2cfe40f625b0f9b4591d;p=sdnc%2Foam.git

Merge "Change log4j2 configuration"
---

diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
index d87fd490..411e70d3 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
@@ -64,7 +64,8 @@
                 "e66d9ed0.3d3d8",
                 "f1256a59.e632c",
                 "1dca15d7.0a7a3a",
-                "1c1d34a0.adaa8b"
+                "1c1d34a0.adaa8b",
+                "4469da89.6a377c"
             ]
         ]
     },
@@ -89,8 +90,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $unique-nodeId' >\n<parameter name='pnf-name' value='`$unique-nodeId`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 905.1111450195312,
-        "y": 221.11758422851562,
+        "x": 893.1111450195312,
+        "y": 502.1175842285156,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -103,8 +104,8 @@
         "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 676.8888549804688,
-        "y": 201.33981323242188,
+        "x": 664.8888549804688,
+        "y": 482.3398132324219,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -126,8 +127,8 @@
         "name": "set node",
         "xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",
         "comments": "",
-        "x": 910.111083984375,
-        "y": 117.22871398925781,
+        "x": 898.111083984375,
+        "y": 398.2287139892578,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
@@ -138,8 +139,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.network-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1001.7779541015625,
-        "y": 396.45097827911377,
+        "x": 989.7779541015625,
+        "y": 677.4509782791138,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -152,8 +153,8 @@
         "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1287.4444580078125,
-        "y": 572.1175842285156,
+        "x": 1297.4444580078125,
+        "y": 593.1175537109375,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -171,8 +172,8 @@
         "name": "set termination point",
         "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
         "comments": "",
-        "x": 1557.111328125,
-        "y": 555.0065612792969,
+        "x": 1567.111328125,
+        "y": 576.0065307617188,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
@@ -183,8 +184,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\n<parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1551.815185546875,
-        "y": 742.5621032714844,
+        "x": 1561.815185546875,
+        "y": 763.5620727539062,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -200,8 +201,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $unique-nodeId '/p-interfaces/p-interface/' + $unique-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1634.703857421875,
-        "y": 899.3398742675781,
+        "x": 1382.703857421875,
+        "y": 1676.33984375,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -213,8 +214,8 @@
         "name": "set unique-ltpId",
         "xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",
         "comments": "",
-        "x": 1541.000244140625,
-        "y": 612.1175842285156,
+        "x": 1551.000244140625,
+        "y": 633.1175537109375,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
@@ -239,8 +240,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 983,
-        "y": 433,
+        "x": 971,
+        "y": 714,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -253,8 +254,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1723.499885559082,
-        "y": 729.7525787353516,
+        "x": 1733.499885559082,
+        "y": 750.7525482177734,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -269,8 +270,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1717.1784744262695,
-        "y": 781.966890335083,
+        "x": 1727.1784744262695,
+        "y": 802.9668598175049,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -286,8 +287,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1874.0000457763672,
-        "y": 729.0065097808838,
+        "x": 1884.0000457763672,
+        "y": 750.0064792633057,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -300,8 +301,8 @@
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->\n<parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />",
         "comments": "",
         "outputs": 1,
-        "x": 1903,
-        "y": 783.0065002441406,
+        "x": 1913,
+        "y": 804.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -311,11 +312,11 @@
         "id": "7077dcc4.1aa314",
         "type": "save",
         "name": "save tunnel-termination-point",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id[0]`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1686,
-        "y": 329.0065002441406,
+        "x": 1627,
+        "y": 1055.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -331,8 +332,8 @@
         "xml": "<for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1349,
-        "y": 317.0065002441406,
+        "x": 1290,
+        "y": 1043.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -340,7 +341,8 @@
                 "458ce581.77bfe4",
                 "7077dcc4.1aa314",
                 "dad1a90d.61b018",
-                "7da29c03.1dbdf4"
+                "7da29c03.1dbdf4",
+                "58b65656.8480c8"
             ]
         ]
     },
@@ -350,8 +352,8 @@
         "name": "set tunnel termination point",
         "xml": "<set>\n<parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\n",
         "comments": "",
-        "x": 1684,
-        "y": 237.00650024414062,
+        "x": 1625,
+        "y": 963.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
@@ -361,8 +363,8 @@
         "name": "set unique-ttpId",
         "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 1642.888916015625,
-        "y": 275.1175842285156,
+        "x": 1583.888916015625,
+        "y": 1001.1175537109375,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
@@ -373,8 +375,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1952,
-        "y": 315.0065002441406,
+        "x": 1893,
+        "y": 1041.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -389,8 +391,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1945.6785888671875,
-        "y": 367.22081184387207,
+        "x": 1886.6785888671875,
+        "y": 1093.220781326294,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -406,8 +408,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2102.500160217285,
-        "y": 314.26043128967285,
+        "x": 2043.5001602172852,
+        "y": 1040.2604007720947,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -417,11 +419,11 @@
         "id": "652a4eb1.3c9f7",
         "type": "update",
         "name": "update tunnel-termination-point",
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id[0]`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2183,
-        "y": 369.0065002441406,
+        "x": 2124,
+        "y": 1095.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -433,8 +435,8 @@
         "name": "set local variables",
         "xml": "<set>\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",
         "comments": "",
-        "x": 935,
-        "y": 164.00650024414062,
+        "x": 923,
+        "y": 445.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
@@ -445,8 +447,8 @@
         "xml": "<call module='DataChange' rpc='update-network-links-to-aai' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 619,
-        "y": 327.0065002441406,
+        "x": 607,
+        "y": 608.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -459,8 +461,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-nodeId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-nodeId`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1635,
-        "y": 842.0065002441406,
+        "x": 1389,
+        "y": 1632.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -473,8 +475,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"tunnel-termination-point\" />\n<!--<parameter name=\"relationship-list.relationship[$ttidx].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />-->\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.ttp-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1757,
-        "y": 421.0065002441406,
+        "x": 1698,
+        "y": 1147.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -490,8 +492,8 @@
         "xml": "<switch test='`$node.te.tunnel-termination-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 921,
-        "y": 293.0065002441406,
+        "x": 862,
+        "y": 1019.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -509,8 +511,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1269,
-        "y": 245.00650024414062,
+        "x": 1210,
+        "y": 971.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -523,8 +525,8 @@
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1111,
-        "y": 316.0065002441406,
+        "x": 1057,
+        "y": 1054.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -539,8 +541,8 @@
         "xml": "<switch test='`$node.termination-point_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 901,
-        "y": 548.0065002441406,
+        "x": 911,
+        "y": 569.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -557,8 +559,8 @@
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1080,
-        "y": 500.0065002441406,
+        "x": 1090,
+        "y": 521.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -573,8 +575,8 @@
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1079,
-        "y": 602.0065002441406,
+        "x": 1089,
+        "y": 623.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -590,8 +592,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1235,
-        "y": 500.0065002441406,
+        "x": 1245,
+        "y": 521.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -604,8 +606,8 @@
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Hesam log file\" />\n    <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n    <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 899,
-        "y": 337.0065002441406,
+        "x": 840,
+        "y": 1063.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -618,8 +620,8 @@
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1109,
-        "y": 179.00650024414062,
+        "x": 1050,
+        "y": 905.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -634,8 +636,8 @@
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1114,
-        "y": 254.00650024414062,
+        "x": 1055,
+        "y": 980.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -650,8 +652,8 @@
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1090,
-        "y": 548.0065002441406,
+        "x": 1100,
+        "y": 569.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -665,8 +667,8 @@
         "name": "unset node",
         "xml": "<set>\n<parameter name='node.' value='' />\n\n",
         "comments": "",
-        "x": 907,
-        "y": 66.00650024414062,
+        "x": 895,
+        "y": 347.0065002441406,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
@@ -676,8 +678,8 @@
         "name": "unset termination point",
         "xml": "<set>\n<parameter name='tp.' value='' />\n",
         "comments": "",
-        "x": 1569,
-        "y": 498.0065002441406,
+        "x": 1579,
+        "y": 519.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
@@ -687,8 +689,8 @@
         "name": "unset tunnel termination point",
         "xml": "<set>\n<parameter name='ttp.' value='' />\n",
         "comments": "",
-        "x": 1684,
-        "y": 189.00650024414062,
+        "x": 1625,
+        "y": 915.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
@@ -699,8 +701,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2089,
-        "y": 424.0065002441406,
+        "x": 2030,
+        "y": 1150.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -715,8 +717,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2086,
-        "y": 472.0065002441406,
+        "x": 2027,
+        "y": 1198.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -731,8 +733,8 @@
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Hesam log file\" />\n    <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n    <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n    <parameter name=\"field5\" value=\"sucessfully saved ttp\" />\n    <parameter name=\"field6\" value=\"`relationship-list.relationship[$ttidx].related-link`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2244,
-        "y": 425.0065002441406,
+        "x": 2185,
+        "y": 1151.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -745,8 +747,8 @@
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/logTopologyDiscovery.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Hesam log file\" />\n    <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n    <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n    <parameter name=\"field5\" value=\"failuire on saving ttp\" />\n    <parameter name=\"field6\" value=\"`relationship-list.relationship[$ttidx].related-link`\" />\n\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2245,
-        "y": 473.0065002441406,
+        "x": 2186,
+        "y": 1199.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -759,8 +761,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='base64DecodingAlgo' >\n    <parameter name=\"encodedValue\" value='`$tp.te.inter-domain-plug-id`'/>\n    <parameter name=\"decodedValue\" value=\"tmp.decoded-plug-id\"/>\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2035,
-        "y": 667.0065002441406,
+        "x": 2045,
+        "y": 688.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -776,8 +778,8 @@
         "xml": "<switch test='`length($tp.te.inter-domain-plug-id) == 0`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1605,
-        "y": 668.0065002441406,
+        "x": 1615,
+        "y": 689.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -793,8 +795,8 @@
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1832,
-        "y": 621.0065002441406,
+        "x": 1842,
+        "y": 642.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -809,8 +811,8 @@
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1833,
-        "y": 667.0065002441406,
+        "x": 1843,
+        "y": 688.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -824,8 +826,8 @@
         "name": "unset tmp.decoded-plug-id",
         "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='' />\n",
         "comments": "",
-        "x": 2036,
-        "y": 621.0065002441406,
+        "x": 2046,
+        "y": 642.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
@@ -836,8 +838,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2240,
-        "y": 644.0065002441406,
+        "x": 2250,
+        "y": 665.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -852,8 +854,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2233.6785888671875,
-        "y": 696.2208118438721,
+        "x": 2243.6785888671875,
+        "y": 717.220781326294,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             [
@@ -869,8 +871,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2381,
-        "y": 644.0065002441406,
+        "x": 2391,
+        "y": 665.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": [
             []
@@ -882,8 +884,8 @@
         "name": "unset tmp.decoded-plug-id",
         "xml": "<set>\n<parameter name='tmp.decoded-plug-id' value='`$tp.te.inter-domain-plug-id`' />\n",
         "comments": "",
-        "x": 2440,
-        "y": 696.0065002441406,
+        "x": 2450,
+        "y": 717.0064697265625,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
     },
@@ -897,5 +899,248 @@
         "y": 81.00650024414062,
         "z": "6d6b8a1f.be1cb4",
         "wires": []
+    },
+    {
+        "id": "4469da89.6a377c",
+        "type": "get-resource",
+        "name": "get-resource 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 = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 736,
+        "y": 220,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "259a6f10.d859c",
+                "2643a1bc.bc0f46",
+                "7a6e0ac1.83425c"
+            ]
+        ]
+    },
+    {
+        "id": "259a6f10.d859c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 982,
+        "y": 180,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "83c13ac.c0250c8"
+            ]
+        ]
+    },
+    {
+        "id": "2643a1bc.bc0f46",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 986,
+        "y": 220,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "7add65bd.d43c1c"
+            ]
+        ]
+    },
+    {
+        "id": "7a6e0ac1.83425c",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 978,
+        "y": 260,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "a3451a06.01294"
+            ]
+        ]
+    },
+    {
+        "id": "7add65bd.d43c1c",
+        "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+        "comments": "",
+        "x": 1136,
+        "y": 220,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": []
+    },
+    {
+        "id": "a3451a06.01294",
+        "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+        "comments": "",
+        "x": 1136,
+        "y": 260,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": []
+    },
+    {
+        "id": "83c13ac.c0250c8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1126,
+        "y": 178,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "70f6d2fc.749b0c"
+            ]
+        ]
+    },
+    {
+        "id": "70f6d2fc.749b0c",
+        "type": "save",
+        "name": "save network-resource relationship to esr-thirdparty-sdnc",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource:relationship-list' \n      key='network-resource.network-id = $tmp.network-id'\n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"esr-thirdparty-sdnc\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/' + $prop.sdncRestApi.thirdpartySdnc.id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"esr-thirdparty-sdnc.thirdparty-sdnc-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sdncRestApi.thirdpartySdnc.id`\" />\n\n<!--/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/SOTNControllerDomain2-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1429,
+        "y": 179,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "58b65656.8480c8",
+        "type": "switchNode",
+        "name": "switch llcl length",
+        "xml": "<switch test='`$node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1559,
+        "y": 1319,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "cf6621ae.60449",
+                "a969fa1e.a9262",
+                "31cb7972.09206e"
+            ]
+        ]
+    },
+    {
+        "id": "cf6621ae.60449",
+        "type": "other",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1747,
+        "y": 1205,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "95b8f366.2c9b38"
+            ]
+        ]
+    },
+    {
+        "id": "a969fa1e.a9262",
+        "type": "outcome",
+        "name": "length 0",
+        "xml": "<outcome value='0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1752,
+        "y": 1280,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "95b8f366.2c9b38"
+            ]
+        ]
+    },
+    {
+        "id": "31cb7972.09206e",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1754,
+        "y": 1354,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "df66f384.e71e78"
+            ]
+        ]
+    },
+    {
+        "id": "95b8f366.2c9b38",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1907,
+        "y": 1271,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ba6a5053.fa9158",
+        "type": "save",
+        "name": "save ttp relationship to tp in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point:relationship-list' \n      key='tunnel-termination-point.ttp-id = $unique-ttpId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-nodeId + '/p-interfaces/p-interface/' + $unique-ltpId-second`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId-second`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 2135,
+        "y": 1357,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f20766b0.56af",
+        "type": "set",
+        "name": "set unique-ltpId second",
+        "xml": "<set>\n<parameter name='unique-ltpId-second' value=\"`$unique-nodeId + '-ltpId-' + $node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity[0].link-tp-ref`\" />\n",
+        "comments": "",
+        "x": 2084,
+        "y": 1313,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": []
+    },
+    {
+        "id": "df66f384.e71e78",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1894,
+        "y": 1350,
+        "z": "6d6b8a1f.be1cb4",
+        "wires": [
+            [
+                "f20766b0.56af",
+                "ba6a5053.fa9158"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
index a47bab0b..a22a5bdd 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json
@@ -257,7 +257,7 @@
         "id": "1e876a82.9683f5",
         "type": "set",
         "name": "set ttp-inter-layer-lock-id",
-        "xml": "<set>\n<parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />\n",
+        "xml": "<set>\n<parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id[0]`' />\n",
         "comments": "",
         "x": 1931,
         "y": 459,
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
index 5a0255de..afe1fc0e 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
@@ -1,221 +1,263 @@
-<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='DataChange' version='${project.version}'>
-    <method rpc='update-network-to-aai' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
+    <method rpc="update-network-to-aai" mode="sync">
         <block atomic="true">
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
                 <parameter name="source" value="`$network.network-id`"/>
                 <parameter name="outputPath" value="tmp.original-network-id"/>
                 <parameter name="target" value="/"/>
                 <parameter name="replacement" value="-"/>
             </execute>
             <set>
-                <parameter name='tmp.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`" />
+                <parameter name="tmp.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`"/>
             </set>
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  
-     key='network-resource.network-id = $tmp.network-id' >
-                <parameter name='network-id' value='`$tmp.network-id`' />
-                <parameter name='client-id' value='`$network.client-id`' />
-                <parameter name='te-topo-id' value='`$network.te-topology-id`' />
-                <parameter name='provider-id' value='`$network.provider-id`' />
-                <parameter name='network-type' value='`$network.network-types`' />
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.network-id">
+                <parameter name="network-id" value="`$tmp.network-id`"/>
+                <parameter name="client-id" value="`$network.client-id`"/>
+                <parameter name="te-topo-id" value="`$network.te-topology-id`"/>
+                <parameter name="provider-id" value="`$network.provider-id`"/>
+                <parameter name="network-type" value="`$network.network-types`"/>
             </save>
-            <for index='pidx' start='0' end='`$network.node_length`' >
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+                <outcome value="success">
+                    <block>
+                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource:relationship-list" key="network-resource.network-id = $tmp.network-id" force="true" pfx="tmp.AnAI-data">
+                            <parameter name="relationship-list.relationship[0].related-to" value="esr-thirdparty-sdnc"/>
+                            <parameter name="relationship-list.relationship[0].related-link" value="`'/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/' + $prop.sdncRestApi.thirdpartySdnc.id`"/>
+                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="esr-thirdparty-sdnc.thirdparty-sdnc-id"/>
+                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sdncRestApi.thirdpartySdnc.id`"/>
+                            <!--
+                            /aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/SOTNControllerDomain2
+                            -->
+                        </save>
+                    </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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`"/>
+                    </return>
+                </outcome>
+            </get-resource>
+            <for index="pidx" start="0" end="`$network.node_length`">
                 <set>
-                    <parameter name='node.' value='' />
+                    <parameter name="node." value=""/>
                 </set>
                 <set>
-                    <parameter name='node.' value='`$network.node[$pidx].`' />
-                    <parameter name='unique-networkId' value='`$tmp.network-id`' />
+                    <parameter name="node." value="`$network.node[$pidx].`"/>
+                    <parameter name="unique-networkId" value="`$tmp.network-id`"/>
                 </set>
                 <set>
-                    <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />
+                    <parameter name="unique-nodeId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`"/>
                 </set>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' 
-      key='pnf.pnf-name = $unique-nodeId' >
-                    <parameter name='pnf-name' value='`$unique-nodeId`' />
-                    <parameter name='pnf-id' value='`$node.node-id`' />
-                    <parameter name='operational-status' value='`$node.te.oper-status`' />
-                    <parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />
-                    <parameter name='in-maint' value='true' />
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $unique-nodeId">
+                    <parameter name="pnf-name" value="`$unique-nodeId`"/>
+                    <parameter name="pnf-id" value="`$node.node-id`"/>
+                    <parameter name="operational-status" value="`$node.te.oper-status`"/>
+                    <parameter name="admin-status" value="`$node.te.te-node-attributes.admin-status`"/>
+                    <parameter name="in-maint" value="true"/>
                 </save>
-                <switch test='`$node.te.tunnel-termination-point_length`'>
-                    <outcome value=''>
-                        <block></block>
+                <switch test="`$node.termination-point_length`">
+                    <outcome value="">
+                        <block/>
                     </outcome>
-                    <outcome value='0'>
-                        <block></block>
+                    <outcome value="0">
+                        <block/>
                     </outcome>
-                    <outcome value='Other'>
-                        <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >
+                    <outcome value="Other">
+                        <for index="tidx" start="0" end="`$node.termination-point_length`">
                             <set>
-                                <parameter name='ttp.' value='' />
+                                <parameter name="tp." value=""/>
                             </set>
                             <set>
-                                <parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />
+                                <parameter name="tp." value="`$node.termination-point[$tidx].`"/>
                             </set>
                             <set>
-                                <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />
+                                <parameter name="unique-ltpId" value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>
                             </set>
-                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' 
-      key='tunnel-termination-point.ttp-id = $unique-ttpId' >
-                                <parameter name='ttp-id' value='`$unique-ttpId`' />
-                                <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
-                                <parameter name='name' value='`$ttp.name`' />
-                                <parameter name='admin-status' value='`$ttp.admin-status`' />
-                                <parameter name='oper-status' value='`$ttp.oper-status`' />
-                                <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />
-                                <parameter name='switching-capability' value='`$ttp.switching-capability`' />
-                                <parameter name='protection-type' value='`$ttp.protection-type`' />
-                                <parameter name='encoding' value='`$ttp.encoding`' />
-                                <outcome value='success'>
-                                    <block></block>
+                            <switch test="`length($tp.te.inter-domain-plug-id) == 0`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="tmp.decoded-plug-id" value=""/>
+                                    </set>
                                 </outcome>
-                                <outcome value='failure'>
-                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' 
-      key='tunnel-termination-point.ttp-id = $unique-ttpId' >
-                                        <parameter name='ttp-id' value='`$unique-ttpId`' />
-                                        <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
-                                        <parameter name='name' value='`$ttp.name`' />
-                                        <parameter name='admin-status' value='`$ttp.admin-status`' />
-                                        <parameter name='oper-status' value='`$ttp.oper-status`' />
-                                        <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />
-                                        <parameter name='switching-capability' value='`$ttp.switching-capability`' />
-                                        <parameter name='protection-type' value='`$ttp.protection-type`' />
-                                        <parameter name='encoding' value='`$ttp.encoding`' />
-                                    </update>
+                                <outcome value="false">
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="base64DecodingAlgo">
+                                        <parameter name="encodedValue" value="`$tp.te.inter-domain-plug-id`"/>
+                                        <parameter name="decodedValue" value="tmp.decoded-plug-id"/>
+                                        <outcome value="success">
+                                            <block/>
+                                        </outcome>
+                                        <outcome value="failure">
+                                            <set>
+                                                <parameter name="tmp.decoded-plug-id" value="`$tp.te.inter-domain-plug-id`"/>
+                                            </set>
+                                        </outcome>
+                                    </execute>
                                 </outcome>
-                            </save>
-                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' 
-      key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
-                                <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />
-                                <!--<parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />-->
-                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />
-                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id" />
-                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
-                                <outcome value='success'>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
-                                        <parameter name="field1" value="__TIMESTAMP__" />
-                                        <parameter name="field2" value="sucess executing Hesam log file" />
-                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
-                                        <parameter name="field4" value="`$node.termination-point_length`" />
-                                        <parameter name="field5" value="sucessfully saved ttp" />
-                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />
-                                    </record>
+                            </switch>
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">
+                                <parameter name="interface-name" value="`$unique-ltpId`"/>
+                                <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>
+                                <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>
+                                <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>
+                                <parameter name="operational-status" value="`$tp.te.oper-status`"/>
+                                <parameter name="in-maint" value="true"/>
+                                <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
+                                <!--
+                                <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
+                                -->
+                                <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>
+                                <outcome value="success">
+                                    <block/>
                                 </outcome>
-                                <outcome value='failure'>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
-                                        <parameter name="field1" value="__TIMESTAMP__" />
-                                        <parameter name="field2" value="sucess executing Hesam log file" />
-                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
-                                        <parameter name="field4" value="`$node.termination-point_length`" />
-                                        <parameter name="field5" value="failuire on saving ttp" />
-                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />
-                                    </record>
+                                <outcome value="failure">
+                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">
+                                        <parameter name="interface-name" value="`$unique-ltpId`"/>
+                                        <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>
+                                        <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>
+                                        <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>
+                                        <parameter name="operational-status" value="`$tp.te.oper-status`"/>
+                                        <parameter name="in-maint" value="true"/>
+                                        <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
+                                        <!--
+                                        <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
+                                        -->
+                                        <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>
+                                    </update>
                                 </outcome>
                             </save>
                         </for>
                     </outcome>
                 </switch>
-                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                    <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
-                    <parameter name="field1" value="__TIMESTAMP__" />
-                    <parameter name="field2" value="sucess executing Hesam log file" />
-                    <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
-                    <parameter name="field4" value="`$node.termination-point_length`" />
-                </record>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' 
-      key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
-                    <parameter name="relationship-list.relationship[0].related-to" value="network-resource" />
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`" />
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">
+                    <parameter name="relationship-list.relationship[0].related-to" value="network-resource"/>
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`"/>
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id"/>
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`"/>
                 </save>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' 
-      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' 
-      force="true" pfx="tmp.AnAI-data">
-                    <parameter name="relationship-list.relationship[0].related-to" value="pnf" />
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc:relationship-list" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id" force="true" pfx="tmp.AnAI-data">
+                    <parameter name="relationship-list.relationship[0].related-to" value="pnf"/>
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`"/>
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name"/>
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`"/>
                 </save>
-                <switch test='`$node.termination-point_length`'>
-                    <outcome value=''>
-                        <block></block>
+                <switch test="`$node.te.tunnel-termination-point_length`">
+                    <outcome value="">
+                        <block/>
                     </outcome>
-                    <outcome value='0'>
-                        <block></block>
+                    <outcome value="0">
+                        <block/>
                     </outcome>
-                    <outcome value='Other'>
-                        <for index='tidx' start='0' end='`$node.termination-point_length`' >
+                    <outcome value="Other">
+                        <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">
                             <set>
-                                <parameter name='tp.' value='' />
+                                <parameter name="ttp." value=""/>
                             </set>
                             <set>
-                                <parameter name='tp.' value='`$node.termination-point[$tidx].`' />
+                                <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>
                             </set>
                             <set>
-                                <parameter name='unique-ltpId' value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`" />
+                                <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`"/>
                             </set>
-                            <switch test='`length($tp.te.inter-domain-plug-id) == 0`'>
-                                <outcome value='true'>
-                                    <set>
-                                        <parameter name='tmp.decoded-plug-id' value='' />
-                                    </set>
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">
+                                <parameter name="ttp-id" value="`$unique-ttpId`"/>
+                                <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
+                                <parameter name="name" value="`$ttp.name`"/>
+                                <parameter name="admin-status" value="`$ttp.admin-status`"/>
+                                <parameter name="oper-status" value="`$ttp.oper-status`"/>
+                                <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id[0]`"/>
+                                <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
+                                <parameter name="protection-type" value="`$ttp.protection-type`"/>
+                                <parameter name="encoding" value="`$ttp.encoding`"/>
+                                <outcome value="success">
+                                    <block/>
                                 </outcome>
-                                <outcome value='false'>
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='base64DecodingAlgo' >
-                                        <parameter name="encodedValue" value='`$tp.te.inter-domain-plug-id`'/>
-                                        <parameter name="decodedValue" value="tmp.decoded-plug-id"/>
-                                        <outcome value='success'>
-                                            <block></block>
-                                        </outcome>
-                                        <outcome value='failure'>
-                                            <set>
-                                                <parameter name='tmp.decoded-plug-id' value='`$tp.te.inter-domain-plug-id`' />
-                                            </set>
-                                        </outcome>
-                                    </execute>
+                                <outcome value="failure">
+                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">
+                                        <parameter name="ttp-id" value="`$unique-ttpId`"/>
+                                        <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
+                                        <parameter name="name" value="`$ttp.name`"/>
+                                        <parameter name="admin-status" value="`$ttp.admin-status`"/>
+                                        <parameter name="oper-status" value="`$ttp.oper-status`"/>
+                                        <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id[0]`"/>
+                                        <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
+                                        <parameter name="protection-type" value="`$ttp.protection-type`"/>
+                                        <parameter name="encoding" value="`$ttp.encoding`"/>
+                                    </update>
                                 </outcome>
-                            </switch>
-                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 
-      key='pnf.pnf-name = $unique-nodeId
-      AND p-interface.interface-name = $unique-ltpId' >
-                                <parameter name='interface-name' value='`$unique-ltpId`' />
-                                <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
-                                <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
-                                <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
-                                <parameter name='operational-status' value='`$tp.te.oper-status`' />
-                                <parameter name='in-maint' value="true" />
-                                <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />
-                                <!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->
-                                <parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />
-                                <outcome value='success'>
-                                    <block></block>
+                            </save>
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">
+                                <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point"/>
+                                <!--
+                                <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />
+                                -->
+                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>
+                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id"/>
+                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>
+                                <outcome value="success">
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
+                                        <parameter name="field1" value="__TIMESTAMP__"/>
+                                        <parameter name="field2" value="sucess executing Hesam log file"/>
+                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
+                                        <parameter name="field4" value="`$node.termination-point_length`"/>
+                                        <parameter name="field5" value="sucessfully saved ttp"/>
+                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>
+                                    </record>
                                 </outcome>
-                                <outcome value='failure'>
-                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 
-      key='pnf.pnf-name = $unique-nodeId
-      AND p-interface.interface-name = $unique-ltpId' >
-                                        <parameter name='interface-name' value='`$unique-ltpId`' />
-                                        <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
-                                        <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
-                                        <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
-                                        <parameter name='operational-status' value='`$tp.te.oper-status`' />
-                                        <parameter name='in-maint' value="true" />
-                                        <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />
-                                        <!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->
-                                        <parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />
-                                    </update>
+                                <outcome value="failure">
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
+                                        <parameter name="field1" value="__TIMESTAMP__"/>
+                                        <parameter name="field2" value="sucess executing Hesam log file"/>
+                                        <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
+                                        <parameter name="field4" value="`$node.termination-point_length`"/>
+                                        <parameter name="field5" value="failuire on saving ttp"/>
+                                        <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>
+                                    </record>
                                 </outcome>
                             </save>
+                            <switch test="`$node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity_length`">
+                                <outcome value="">
+                                    <block/>
+                                </outcome>
+                                <outcome value="0">
+                                    <block/>
+                                </outcome>
+                                <outcome value="Other">
+                                    <block>
+                                        <set>
+                                            <parameter name="unique-ltpId-second" value="`$unique-nodeId + '-ltpId-' + $node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity[0].link-tp-ref`"/>
+                                        </set>
+                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point:relationship-list" key="tunnel-termination-point.ttp-id = $unique-ttpId" force="true" pfx="tmp.AnAI-data">
+                                            <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>
+                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-nodeId + '/p-interfaces/p-interface/' + $unique-ltpId-second`"/>
+                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
+                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ltpId-second`"/>
+                                        </save>
+                                    </block>
+                                </outcome>
+                            </switch>
                         </for>
                     </outcome>
                 </switch>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
+                    <parameter name="field1" value="__TIMESTAMP__"/>
+                    <parameter name="field2" value="sucess executing Hesam log file"/>
+                    <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
+                    <parameter name="field4" value="`$node.termination-point_length`"/>
+                </record>
             </for>
-            <call module='DataChange' rpc='update-network-links-to-aai' mode='sync' ></call>
+            <call module="DataChange" rpc="update-network-links-to-aai" mode="sync"/>
         </block>
     </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
index 90396852..4ce33625 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml
@@ -1,99 +1,96 @@
-<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='DataChange' version='${project.version}'>
-    <method rpc='update-tp-ttp-relationship' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
+    <method rpc="update-tp-ttp-relationship" mode="sync">
         <block atomic="true">
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
                 <parameter name="source" value="`$network-eth.network-id`"/>
                 <parameter name="outputPath" value="tmp.original-network-eth.network-id"/>
                 <parameter name="target" value="/"/>
                 <parameter name="replacement" value="-"/>
             </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
                 <parameter name="source" value="`$network-otn.network-id`"/>
                 <parameter name="outputPath" value="tmp.original-network-otn.network-id"/>
                 <parameter name="target" value="/"/>
                 <parameter name="replacement" value="-"/>
             </execute>
             <set>
-                <parameter name='tmp.network-eth.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`" />
-                <parameter name='tmp.network-otn.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`" />
+                <parameter name="tmp.network-eth.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`"/>
+                <parameter name="tmp.network-otn.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`"/>
             </set>
-            <for index='pethidx' start='0' end='`$network-eth.node_length`' >
+            <for index="pethidx" start="0" end="`$network-eth.node_length`">
                 <set>
-                    <parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />
+                    <parameter name="node-eth." value="`$network-eth.node[$pethidx].`"/>
                 </set>
                 <set>
-                    <parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />
+                    <parameter name="unique-network-ethId" value="`$tmp.network-eth.network-id`"/>
                 </set>
                 <set>
-                    <parameter name='unique-node-ethId' value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`" />
+                    <parameter name="unique-node-ethId" value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`"/>
                 </set>
-                <switch test='`$node-eth.termination-point_length`'>
-                    <outcome value=''>
-                        <block></block>
+                <switch test="`$node-eth.termination-point_length`">
+                    <outcome value="">
+                        <block/>
                     </outcome>
-                    <outcome value='0'>
-                        <block></block>
+                    <outcome value="0">
+                        <block/>
                     </outcome>
-                    <outcome value='Other'>
-                        <for index='tidx' start='0' end='`$node-eth.termination-point_length`' >
+                    <outcome value="Other">
+                        <for index="tidx" start="0" end="`$node-eth.termination-point_length`">
                             <set>
-                                <parameter name='tp-eth.' value='' />
+                                <parameter name="tp-eth." value=""/>
                             </set>
                             <set>
-                                <parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />
+                                <parameter name="tp-eth." value="`$node-eth.termination-point[$tidx].`"/>
                             </set>
                             <set>
-                                <parameter name='unique-ltpethId' value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`" />
+                                <parameter name="unique-ltpethId" value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`"/>
                             </set>
                             <set>
-                                <parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />
+                                <parameter name="tp-inter-layer-lock-id" value="`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`"/>
                             </set>
-                            <for index='potnidx' start='0' end='`$network-otn.node_length`' >
+                            <for index="potnidx" start="0" end="`$network-otn.node_length`">
                                 <set>
-                                    <parameter name='node-otn.' value='' />
-                                    <parameter name='unique-network-otnId' value='' />
-                                    <parameter name='unique-node-otnId' value="" />
+                                    <parameter name="node-otn." value=""/>
+                                    <parameter name="unique-network-otnId" value=""/>
+                                    <parameter name="unique-node-otnId" value=""/>
                                 </set>
                                 <set>
-                                    <parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />
+                                    <parameter name="node-otn." value="`$network-otn.node[$potnidx].`"/>
                                 </set>
                                 <set>
-                                    <parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />
+                                    <parameter name="unique-network-otnId" value="`$tmp.network-otn.network-id`"/>
                                 </set>
                                 <set>
-                                    <parameter name='unique-node-otnId' value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`" />
+                                    <parameter name="unique-node-otnId" value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`"/>
                                 </set>
-                                <switch test='`$node-otn.te.tunnel-termination-point_length`'>
-                                    <outcome value=''>
-                                        <block></block>
+                                <switch test="`$node-otn.te.tunnel-termination-point_length`">
+                                    <outcome value="">
+                                        <block/>
                                     </outcome>
-                                    <outcome value='0'>
-                                        <block></block>
+                                    <outcome value="0">
+                                        <block/>
                                     </outcome>
-                                    <outcome value='Other'>
-                                        <for index='ttidx' start='0' end='`$node-otn.te.tunnel-termination-point_length`' >
+                                    <outcome value="Other">
+                                        <for index="ttidx" start="0" end="`$node-otn.te.tunnel-termination-point_length`">
                                             <set>
-                                                <parameter name='ttp.' value='' />
+                                                <parameter name="ttp." value=""/>
                                             </set>
                                             <set>
-                                                <parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />
+                                                <parameter name="ttp." value="`$node-otn.te.tunnel-termination-point[$ttidx].`"/>
                                             </set>
                                             <set>
-                                                <parameter name='unique-ttpId' value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`" />
+                                                <parameter name="unique-ttpId" value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`"/>
                                             </set>
                                             <set>
-                                                <parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id`' />
+                                                <parameter name="ttp-inter-layer-lock-id" value="`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id[0]`"/>
                                             </set>
-                                            <switch test='`$tp-inter-layer-lock-id`'>
-                                                <outcome value='`$ttp-inter-layer-lock-id`'>
-                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' 
-      key='p-interface.interface-name = $unique-ltpethId' force="true" pfx="tmp.AnAI-data">
-                                                        <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />
-                                                        <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`" />
-                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id" />
-                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
+                                            <switch test="`$tp-inter-layer-lock-id`">
+                                                <outcome value="`$ttp-inter-layer-lock-id`">
+                                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface:relationship-list" key="p-interface.interface-name = $unique-ltpethId" force="true" pfx="tmp.AnAI-data">
+                                                        <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point"/>
+                                                        <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`"/>
+                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id"/>
+                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>
                                                     </save>
                                                 </outcome>
                                             </switch>
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json
index 8b19b0e4..6d2bdbbf 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json
@@ -105,7 +105,7 @@
         "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "84d1cb1a.eb2fc8"
+                "921b5877.d781b"
             ]
         ]
     },
@@ -121,7 +121,7 @@
         "z": "3b47dc40.0a0c44",
         "wires": [
             [
-                "2182e897.132d8"
+                "5ee72a4.dae15d4"
             ]
         ]
     },
@@ -129,7 +129,7 @@
         "id": "2182e897.132d8",
         "type": "execute",
         "name": "execute RestconfApiCallNode Create OTN tunnel with token",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/sdnc/restapi/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
         "x": 1223,
@@ -146,7 +146,7 @@
         "id": "84d1cb1a.eb2fc8",
         "type": "execute",
         "name": "execute RestconfApiCallNode Creat OTN tunnel without token",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/sdnc/restapi/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\"/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/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\"/>",
         "comments": "",
         "outputs": 1,
         "x": 1235,
@@ -681,7 +681,7 @@
         "id": "77be498b.1e80d",
         "type": "set",
         "name": "set attachment_param",
-        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$otn-domain.ttp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='`$otn-domain.tpn`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />",
+        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$otn-domain.ttp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='`$otn-domain.tpn`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />\n\n<!--<set>-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$otn-domain.node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$otn-domain.ttp-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='`$otn-domain.tpn`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->\n\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$otn-domain.node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->\n\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->",
         "comments": "",
         "x": 1269,
         "y": 823,
@@ -692,7 +692,7 @@
         "id": "5ad550e4.a3ef2",
         "type": "set",
         "name": "set attachment_param",
-        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].src-ttp-id' value='`$otn-domain.ttp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn' value='`$otn-domain.tpn`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />",
+        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].src-ttp-id' value='`$otn-domain.ttp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn' value='`$otn-domain.tpn`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$otn-domain.node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />\n\n<!--<set>-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$otn-domain.node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].src-ttp-id' value='`$otn-domain.ttp-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn' value='`$otn-domain.tpn`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->\n\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$otn-domain.node-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->\n\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->",
         "comments": "",
         "x": 1669,
         "y": 872,
@@ -714,5 +714,39 @@
                 "84bd363f.cecab"
             ]
         ]
+    },
+    {
+        "id": "921b5877.d781b",
+        "type": "execute",
+        "name": "execute RestApiCallNode Create OTN tunnel without token",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/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": 1231,
+        "y": 1112,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "ab8d3cb8.cfa08",
+                "1b911a1d.a19f46"
+            ]
+        ]
+    },
+    {
+        "id": "5ee72a4.dae15d4",
+        "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 + '/sotn-otn-tunnel-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1223,
+        "y": 1285,
+        "z": "3b47dc40.0a0c44",
+        "wires": [
+            [
+                "ab8d3cb8.cfa08",
+                "1b911a1d.a19f46"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json
index 58005857..044737f5 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json
@@ -203,8 +203,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1389.0001220703125,
-        "y": 756.2864990234375,
+        "x": 1150.0001220703125,
+        "y": 1085.2864990234375,
         "z": "5b68e0d.bd97b2",
         "wires": [
             [
@@ -219,8 +219,8 @@
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1383.0001220703125,
-        "y": 806.2864990234375,
+        "x": 1144.0001220703125,
+        "y": 1135.2864990234375,
         "z": "5b68e0d.bd97b2",
         "wires": [
             [
@@ -234,8 +234,8 @@
         "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": 1550.0001220703125,
-        "y": 745.2864990234375,
+        "x": 1311.0001220703125,
+        "y": 1074.2864990234375,
         "z": "5b68e0d.bd97b2",
         "wires": []
     },
@@ -245,8 +245,8 @@
         "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": 1548.0001220703125,
-        "y": 801.2864990234375,
+        "x": 1309.0001220703125,
+        "y": 1130.2864990234375,
         "z": "5b68e0d.bd97b2",
         "wires": []
     },
@@ -318,7 +318,7 @@
     {
         "id": "40299798.13bc",
         "type": "switchNode",
-        "name": "test cross-domain-link",
+        "name": "test cross-domain-link role",
         "xml": "<switch test='`$tmp.aai.cross-link.link-role`'>\n",
         "comments": "",
         "outputs": 1,
@@ -353,7 +353,7 @@
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2198.5001220703125,
+        "x": 2232.5,
         "y": 999,
         "z": "5b68e0d.bd97b2",
         "wires": []
@@ -371,9 +371,9 @@
         "wires": [
             [
                 "dd179bba.27e578",
-                "3a661a62.460126",
-                "a736e107.ab857",
-                "51dd454b.e64094"
+                "51dd454b.e64094",
+                "e9ba305b.3f7b08",
+                "a736e107.ab857"
             ]
         ]
     },
@@ -383,29 +383,11 @@
         "name": "setup variables",
         "info": "",
         "comments": "",
-        "x": 2330.5001220703125,
-        "y": 379,
+        "x": 2331.5,
+        "y": 182,
         "z": "5b68e0d.bd97b2",
         "wires": []
     },
-    {
-        "id": "a736e107.ab857",
-        "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": 2359.5001220703125,
-        "y": 529,
-        "z": "5b68e0d.bd97b2",
-        "wires": [
-            [
-                "30082dde.5085da",
-                "a603f43.0659d88",
-                "ed057305.d13bc"
-            ]
-        ]
-    },
     {
         "id": "30082dde.5085da",
         "type": "success",
@@ -614,7 +596,7 @@
         "z": "5b68e0d.bd97b2",
         "wires": [
             [
-                "ebf0e7da.b09cb"
+                "a982c4fa.2154f"
             ]
         ]
     },
@@ -622,10 +604,10 @@
         "id": "ebf0e7da.b09cb",
         "type": "set",
         "name": "set domain A node ttp-id",
-        "xml": "<set>\n<parameter name='domain-A.ttp-id' value=\"`$tmp.aai.src-ttp.ttp-id`\" />\n",
+        "xml": "<set>\n<parameter name='domain-A.ttp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 4671.5001220703125,
-        "y": 373,
+        "x": 6035.5,
+        "y": 431,
         "z": "5b68e0d.bd97b2",
         "wires": []
     },
@@ -815,7 +797,7 @@
         "id": "51dd454b.e64094",
         "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.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
+        "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": 2313.5001220703125,
@@ -1165,21 +1147,10 @@
         "z": "5b68e0d.bd97b2",
         "wires": [
             [
-                "5bd66639.66f16"
+                "fe418352.84c6"
             ]
         ]
     },
-    {
-        "id": "5bd66639.66f16",
-        "type": "set",
-        "name": "set domain B node ttp-id",
-        "xml": "<set>\n<parameter name='domain-B.ttp-id' value=\"`$tmp.aai.dst-ttp.ttp-id`\" />\n",
-        "comments": "",
-        "x": 4625.5001220703125,
-        "y": 739,
-        "z": "5b68e0d.bd97b2",
-        "wires": []
-    },
     {
         "id": "d4d32344.490fe8",
         "type": "set",
@@ -1353,8 +1324,741 @@
         "wires": [
             [
                 "40299798.13bc",
-                "c0faec82.816fb8"
+                "ba0dda0.572ad28"
+            ]
+        ]
+    },
+    {
+        "id": "e9ba305b.3f7b08",
+        "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": 2266,
+        "y": 307,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "5728cf0a.e04c88"
+            ]
+        ]
+    },
+    {
+        "id": "5728cf0a.e04c88",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2465,
+        "y": 304,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "a07b7ba1.16119"
+            ]
+        ]
+    },
+    {
+        "id": "a07b7ba1.16119",
+        "type": "outcome",
+        "name": "p-interface",
+        "xml": "<outcome value='p-interface'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2642.117431640625,
+        "y": 302.34027099609375,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "5430daff.402bcc"
+            ]
+        ]
+    },
+    {
+        "id": "b3de6391.5ab778",
+        "type": "set",
+        "name": "set src-ltpId and dst-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.cross-link.dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`\" />\n\n<parameter name='tmp.src-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`\" />\n\n\n",
+        "comments": "",
+        "x": 2956,
+        "y": 246,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "cf93cd1e.3a945",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2917,
+        "y": 309,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "5430daff.402bcc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2782,
+        "y": 287,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "b3de6391.5ab778",
+                "cf93cd1e.3a945"
+            ]
+        ]
+    },
+    {
+        "id": "f1b6891b.494ac",
+        "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": 1342,
+        "y": 890,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "71c25391.1fc4f4"
+            ]
+        ]
+    },
+    {
+        "id": "71c25391.1fc4f4",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1541,
+        "y": 887,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "fb1d0e47.e5d04"
+            ]
+        ]
+    },
+    {
+        "id": "fb1d0e47.e5d04",
+        "type": "outcome",
+        "name": "p-interface",
+        "xml": "<outcome value='p-interface'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1718.117431640625,
+        "y": 885.3402709960938,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "d166e350.8b25f"
+            ]
+        ]
+    },
+    {
+        "id": "d166e350.8b25f",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1858,
+        "y": 870,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "76dcccfc.66809c",
+                "c46fae49.1a78a8"
+            ]
+        ]
+    },
+    {
+        "id": "76dcccfc.66809c",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 1993,
+        "y": 892,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "8ebbd23d.9dd4d",
+        "type": "switchNode",
+        "name": "test $vidx",
+        "xml": "<switch test='`$vidx`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1793,
+        "y": 730,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "e155bd88.0bc8b",
+                "74a1badc.9d6fbc"
+            ]
+        ]
+    },
+    {
+        "id": "e155bd88.0bc8b",
+        "type": "outcome",
+        "name": "outcome first",
+        "xml": "<outcome value='0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1958,
+        "y": 708,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "f1b6891b.494ac"
+            ]
+        ]
+    },
+    {
+        "id": "74a1badc.9d6fbc",
+        "type": "outcome",
+        "name": "outcome last",
+        "xml": "<outcome value='`$otn-oof.solutions_length - 1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1957,
+        "y": 769,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "bf04627d.7c822"
+            ]
+        ]
+    },
+    {
+        "id": "c46fae49.1a78a8",
+        "type": "set",
+        "name": "set oofsolutions-first info",
+        "xml": "<set>\n<parameter name='tmp.oofsolutions-first-src-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.oofsolutions-first-src-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`\" />\n\n\n\n",
+        "comments": "",
+        "x": 2041,
+        "y": 847,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "bf04627d.7c822",
+        "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": 1320,
+        "y": 993,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "1e746899.4a1de7"
+            ]
+        ]
+    },
+    {
+        "id": "1e746899.4a1de7",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1519,
+        "y": 990,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "1fda2797.1ef958"
+            ]
+        ]
+    },
+    {
+        "id": "1fda2797.1ef958",
+        "type": "outcome",
+        "name": "p-interface",
+        "xml": "<outcome value='p-interface'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1696.117431640625,
+        "y": 988.3402709960938,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "73e8ef8a.6dee8"
+            ]
+        ]
+    },
+    {
+        "id": "73e8ef8a.6dee8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1836,
+        "y": 973,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "9ff282e5.e46b2",
+                "d72292cf.36986"
+            ]
+        ]
+    },
+    {
+        "id": "9ff282e5.e46b2",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 1971,
+        "y": 995,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "d72292cf.36986",
+        "type": "set",
+        "name": "set oofsolutions last info",
+        "xml": "<set>\n<parameter name='tmp.oofsolutions-last-dst-pnf-name' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`\" />\n<parameter name='tmp.oofsolutions-last-dst-ltpId' value=\"`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`\" />\n",
+        "comments": "",
+        "x": 2026,
+        "y": 949,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "ba0dda0.572ad28",
+        "type": "switchNode",
+        "name": "switch relationship_length",
+        "xml": "<switch test='`length($tmp.aai.cross-link.relationship-list.relationship) == 0`'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1440,
+        "y": 731,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "d7ed588c.061ed8",
+                "b66c4a0f.48599"
             ]
         ]
+    },
+    {
+        "id": "d7ed588c.061ed8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1631,
+        "y": 698,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b66c4a0f.48599",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1632,
+        "y": 745,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "8ebbd23d.9dd4d"
+            ]
+        ]
+    },
+    {
+        "id": "a982c4fa.2154f",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4642,
+        "y": 370,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "203d5e77.1749e2"
+            ]
+        ]
+    },
+    {
+        "id": "7cb92f1c.0d62a8",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-ttp.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5223,
+        "y": 433,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "517c6485.d4072c"
+            ]
+        ]
+    },
+    {
+        "id": "517c6485.d4072c",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.src-ttp.relationship-list.relationship[$vidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5449,
+        "y": 433,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "66fdc763.76b7a8"
+            ]
+        ]
+    },
+    {
+        "id": "66fdc763.76b7a8",
+        "type": "outcome",
+        "name": "p-interface",
+        "xml": "<outcome value='p-interface'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5643.2861328125,
+        "y": 432.82177734375,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "d6464d3a.f940c8"
+            ]
+        ]
+    },
+    {
+        "id": "d6464d3a.f940c8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5818.1171875,
+        "y": 432.34027099609375,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "ebf0e7da.b09cb"
+            ]
+        ]
+    },
+    {
+        "id": "203d5e77.1749e2",
+        "type": "switchNode",
+        "name": "switch ttp relationship",
+        "xml": "<switch test='`$tmp.aai.src-ttp.relationship-list.relationship_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4840,
+        "y": 372,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "6d19c367.9a927c",
+                "ad218f76.da61f",
+                "4692a096.2a98"
+            ]
+        ]
+    },
+    {
+        "id": "6d19c367.9a927c",
+        "type": "other",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5023,
+        "y": 334,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "13f17017.84d56"
+            ]
+        ]
+    },
+    {
+        "id": "4692a096.2a98",
+        "type": "outcome",
+        "name": "length 0",
+        "xml": "<outcome value='0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5033,
+        "y": 382,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "13f17017.84d56"
+            ]
+        ]
+    },
+    {
+        "id": "ad218f76.da61f",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5022,
+        "y": 436,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "7cb92f1c.0d62a8"
+            ]
+        ]
+    },
+    {
+        "id": "13f17017.84d56",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5178,
+        "y": 334,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fe418352.84c6",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4631,
+        "y": 744,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "a04c015d.4f2be"
+            ]
+        ]
+    },
+    {
+        "id": "491826fa.0106a8",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-ttp.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5212,
+        "y": 807,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "1943c22a.5a60a6"
+            ]
+        ]
+    },
+    {
+        "id": "a04c015d.4f2be",
+        "type": "switchNode",
+        "name": "switch ttp relationship",
+        "xml": "<switch test='`$tmp.aai.dst-ttp.relationship-list.relationship_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4829,
+        "y": 746,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "d6405c54.6f4518",
+                "6576831f.203ff4",
+                "863d1cc0.5d8dc8"
+            ]
+        ]
+    },
+    {
+        "id": "d6405c54.6f4518",
+        "type": "other",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5012,
+        "y": 708,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "3eef1226.8c611e"
+            ]
+        ]
+    },
+    {
+        "id": "863d1cc0.5d8dc8",
+        "type": "outcome",
+        "name": "length 0",
+        "xml": "<outcome value='0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5022,
+        "y": 756,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "3eef1226.8c611e"
+            ]
+        ]
+    },
+    {
+        "id": "6576831f.203ff4",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5011,
+        "y": 810,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "491826fa.0106a8"
+            ]
+        ]
+    },
+    {
+        "id": "3eef1226.8c611e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5167,
+        "y": 708,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "66a31e69.f659b8",
+        "type": "set",
+        "name": "set domain B node ttp-id",
+        "xml": "<set>\n<parameter name='domain-B.ttp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n",
+        "comments": "",
+        "x": 6024.5,
+        "y": 805,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "1943c22a.5a60a6",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.dst-ttp.relationship-list.relationship[$vidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5438,
+        "y": 807,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "d1d6f06f.051f98"
+            ]
+        ]
+    },
+    {
+        "id": "d1d6f06f.051f98",
+        "type": "outcome",
+        "name": "p-interface",
+        "xml": "<outcome value='p-interface'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5632.2861328125,
+        "y": 806.82177734375,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "c6c9b722.1343d8"
+            ]
+        ]
+    },
+    {
+        "id": "c6c9b722.1343d8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5807.1171875,
+        "y": 806.3402709960938,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "66a31e69.f659b8"
+            ]
+        ]
+    },
+    {
+        "id": "a736e107.ab857",
+        "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": 2359.5001220703125,
+        "y": 529,
+        "z": "5b68e0d.bd97b2",
+        "wires": [
+            [
+                "30082dde.5085da",
+                "a603f43.0659d88",
+                "ed057305.d13bc"
+            ]
+        ]
+    },
+    {
+        "id": "85e1ebfe.ba8e78",
+        "type": "comment",
+        "name": "among all ttps, find the one that has relationship to p-interface (TODO: check node/pnf is the same between this p-interface's pnf and the ttp's pnf)",
+        "info": "",
+        "comments": "",
+        "x": 5703,
+        "y": 377,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
+    },
+    {
+        "id": "1ff536a0.bad579",
+        "type": "comment",
+        "name": "among all ttps, find the one that has relationship to p-interface (TODO: check node/pnf is the same between this p-interface's pnf and the ttp's pnf)",
+        "info": "",
+        "comments": "",
+        "x": 5697,
+        "y": 749,
+        "z": "5b68e0d.bd97b2",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json
index 658a04cd..48817a42 100644
--- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json
@@ -84,8 +84,7 @@
                 "5733466d.dcbb88",
                 "6d51d616.88647",
                 "aab160b4.f76088",
-                "48dc3a93.b23a44",
-                "672fc75a.1e91b"
+                "48dc3a93.b23a44"
             ]
         ]
     },
@@ -526,9 +525,7 @@
         "z": "9b26c8a0.a64c1",
         "wires": [
             [
-                "2cd069f4.1bd85e",
-                "e85654b4.901fd",
-                "596112fe.dbc0a4"
+                "8a87ece8.73f728"
             ]
         ]
     },
@@ -536,10 +533,10 @@
         "id": "2cd069f4.1bd85e",
         "type": "set",
         "name": "set tmp.unis.uni[].tpId",
-        "xml": "<set>\n<!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />-->\n\n<parameter name='tmp.tpId' value=\"`$tmp.aai.uni.tpId`\" />\n",
+        "xml": "<set>\n<!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />-->\n\n<parameter name='tmp.tp-id' value=\"`$tmp.aai.uni.tp-id`\" />\n",
         "comments": "",
-        "x": 1843.117431640625,
-        "y": 598.3402709960938,
+        "x": 2557.117431640625,
+        "y": 641.3402709960938,
         "z": "9b26c8a0.a64c1",
         "wires": []
     },
@@ -589,12 +586,12 @@
     {
         "id": "e85654b4.901fd",
         "type": "execute",
-        "name": "execute split tpId to get pnf-name",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`tmp.unis.uni[$vidx].tpId`'/>\n<parameter name=\"regex\" value=\"nodeId\"/>\n<parameter name=\"tmp.unis.uni[$vidx].pnf-name\" value=\"\"/>\n",
+        "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.uni.tp-id`'/>\n<parameter name=\"regex\" value=\"[^-]+$\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1882,
-        "y": 673,
+        "x": 2596,
+        "y": 716,
         "z": "9b26c8a0.a64c1",
         "wires": [
             [
@@ -610,8 +607,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2105,
-        "y": 628,
+        "x": 2819,
+        "y": 671,
         "z": "9b26c8a0.a64c1",
         "wires": [
             [
@@ -626,8 +623,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2107,
-        "y": 692,
+        "x": 2821,
+        "y": 735,
         "z": "9b26c8a0.a64c1",
         "wires": [
             [
@@ -638,11 +635,11 @@
     {
         "id": "9111f685.17b2e8",
         "type": "set",
-        "name": "set ipAddress prefixLength",
-        "xml": "<set>\n<parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\n<parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />",
+        "name": "set ltpId",
+        "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix[$param-prefix_length -1]`' />\n",
         "comments": "",
-        "x": 2327,
-        "y": 630,
+        "x": 3041,
+        "y": 673,
         "z": "9b26c8a0.a64c1",
         "wires": []
     },
@@ -652,8 +649,8 @@
         "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": 2266,
-        "y": 711,
+        "x": 2980,
+        "y": 754,
         "z": "9b26c8a0.a64c1",
         "wires": []
     },
@@ -664,8 +661,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'\n\t\tAND depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\t\tresource=\"generic-vnf\" -->\n<!--\t\tkey=\"'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\n<!--\t\tAND depth = '0'\"-->\n<!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->",
         "comments": "",
         "outputs": 1,
-        "x": 1812,
-        "y": 810,
+        "x": 2526,
+        "y": 853,
         "z": "9b26c8a0.a64c1",
         "wires": [
             [
@@ -681,8 +678,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2171.88232421875,
-        "y": 818.6556396484375,
+        "x": 2885.88232421875,
+        "y": 861.6556396484375,
         "z": "9b26c8a0.a64c1",
         "wires": [
             [
@@ -697,8 +694,8 @@
         "name": "set node-id",
         "xml": "<set>\n<parameter name='`$tmp.unis.uni[$vidx].node-id`' value=\"`$tmp.aai.pnf.pnf-id`\" />\n",
         "comments": "",
-        "x": 2351,
-        "y": 772,
+        "x": 3065,
+        "y": 815,
         "z": "9b26c8a0.a64c1",
         "wires": []
     },
@@ -709,8 +706,8 @@
         "xml": "<for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2363.882568359375,
-        "y": 858.6597290039062,
+        "x": 3077.882568359375,
+        "y": 901.6597290039062,
         "z": "9b26c8a0.a64c1",
         "wires": [
             [
@@ -725,8 +722,8 @@
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2589.882568359375,
-        "y": 858.6597290039062,
+        "x": 3303.882568359375,
+        "y": 901.6597290039062,
         "z": "9b26c8a0.a64c1",
         "wires": [
             [
@@ -742,7 +739,7 @@
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2788,
+        "x": 3513,
         "y": 971,
         "z": "9b26c8a0.a64c1",
         "wires": [
@@ -758,7 +755,7 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3001,
+        "x": 3726,
         "y": 972,
         "z": "9b26c8a0.a64c1",
         "wires": [
@@ -774,7 +771,7 @@
         "name": "set network-id",
         "xml": "<set>\n<parameter name='`$tmp.unis.uni[$vidx].network-id`' value=\"`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 3236,
+        "x": 3961,
         "y": 902,
         "z": "9b26c8a0.a64c1",
         "wires": []
@@ -786,7 +783,7 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"'network-resource.network-id = $tmp.unis.uni[$vidx].network-id'\n\t\tAND depth = '0'\"\n        pfx='tmp.aai.network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3244,
+        "x": 3969,
         "y": 983,
         "z": "9b26c8a0.a64c1",
         "wires": [
@@ -802,7 +799,7 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3476.5,
+        "x": 4201.5,
         "y": 979,
         "z": "9b26c8a0.a64c1",
         "wires": [
@@ -817,7 +814,7 @@
         "name": "set network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name=\"`$tmp.unis.uni[$vidx].network-id`\" value=\"`$tmp.aai.network-resource.network-id`\" />\n<parameter name=\"`$tmp.unis.uni[$vidx].provider-id`\" value=\"`$tmp.aai.network-resource.provider-id`\" />\n<parameter name=\"`$tmp.unis.uni[$vidx].client-id`\" value=\"`$tmp.aai.network-resource.client-id`\" />\n<parameter name=\"`$tmp.unis.uni[$vidx].te-topo-id`\" value=\"`$tmp.aai.network-resource.te-topo-id`\" />\n<parameter name=\"`$tmp.unis.uni[$vidx].network-type`\" value=\"`$tmp.aai.network-resource.network-type`\" />\n\n\n",
         "comments": "",
-        "x": 3745,
+        "x": 4470,
         "y": 978,
         "z": "9b26c8a0.a64c1",
         "wires": []
@@ -843,7 +840,7 @@
         "xml": "<outcome value='thirdparty-controller'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2815,
+        "x": 3540,
         "y": 836,
         "z": "9b26c8a0.a64c1",
         "wires": [
@@ -859,7 +856,7 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3028,
+        "x": 3753,
         "y": 837,
         "z": "9b26c8a0.a64c1",
         "wires": [
@@ -874,7 +871,7 @@
         "name": "set thirdparty-sdnc-id",
         "xml": "<set>\n<parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value=\"`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 3255,
+        "x": 3980,
         "y": 836,
         "z": "9b26c8a0.a64c1",
         "wires": []
@@ -912,8 +909,8 @@
         "name": "set oof.vpn",
         "xml": "<set>\n<parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />",
         "comments": "",
-        "x": 1092.0272216796875,
-        "y": 1027.040771484375,
+        "x": 1096.0272216796875,
+        "y": 946.040771484375,
         "z": "9b26c8a0.a64c1",
         "wires": []
     },
@@ -1067,7 +1064,7 @@
         "id": "a9643f3f.4f04b",
         "type": "get-resource",
         "name": "get-resource 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 = $oof.vpn.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+        "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 = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1156.0272216796875,
@@ -1136,10 +1133,13 @@
         "wires": [
             [
                 "124c6957.e07dc7",
+                "f7756434.d014e",
+                "a9643f3f.4f04b",
+                "ae925256.a68df",
+                "ee991e0.ab6b36",
                 "3ce3b19a.7c10c6",
                 "d661efba.3fa238",
-                "ee991e0.ab6b36",
-                "f7756434.d014e"
+                "c6d53bc.53f5bc8"
             ]
         ]
     },
@@ -1196,8 +1196,8 @@
     {
         "id": "678c3911.078e2",
         "type": "execute",
-        "name": "execute RestconfApiCallNode Create ethernet Service with token",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/sdnc/restapi/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "name": "execute RestApiCallNode Create ethernet Service with token",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\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=\"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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
         "x": 1660.52734375,
@@ -1303,8 +1303,8 @@
     {
         "id": "42cb8b06.e7daec",
         "type": "execute",
-        "name": "execute RestconfApiCallNode Create ethernet Service without token",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/sdnc/restapi/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\"/>",
+        "name": "execute RestApiCallNode Create ethernet Service without token",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestApiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\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=\"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\"/>",
         "comments": "",
         "outputs": 1,
         "x": 1670.52734375,
@@ -1340,8 +1340,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1995,
-        "y": 817,
+        "x": 2709,
+        "y": 860,
         "z": "9b26c8a0.a64c1",
         "wires": [
             [
@@ -1353,11 +1353,237 @@
         "id": "672fc75a.1e91b",
         "type": "set",
         "name": "set tmp.unis.uni[].tpId",
-        "xml": "<set>\n<parameter name='tmp.unis.uni[0].id' value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\" />\n<parameter name='tmp.unis.uni[0].tp-id' value=\"networkId-providerId-5555-clientId-6666-topologyId-11-nodeId-0.190.0.1\" />\n<parameter name='tmp.unis.uni[0].access-provider-id' value=\"`$domain-A.provider-id`\" />\n<parameter name='tmp.unis.uni[0].access-client-id' value=\"`$domain-A.client-id`\" />\n<parameter name='tmp.unis.uni[0].access-topology-id' value=\"`$domain-A.topology-id`\" />\n<parameter name='tmp.unis.uni[0].access-node-id' value=\"\" />\n<parameter name='tmp.unis.uni[0].src-access-ltp-id' value=\"\" />\n<parameter name='tmp.unis.uni[0].dst-access-ltp-id' value=\"\" />\n\n<parameter name='tmp.unis.uni[1].id' value=\"5642e9dd-496c-4ef6-be97-5caf4e9beec9\" />\n<parameter name='tmp.unis.uni[1].tp-id' value=\"networkId-domain2-providerId-5555-clientId-6666-topologyId-11-nodeId-0.191.0.4\" />\n<parameter name='tmp.unis.uni[1].access-provider-id' value=\"`$domain-B.provider-id`\" />\n<parameter name='tmp.unis.uni[1].access-client-id' value=\"`$domain-B.client-id`\" />\n<parameter name='tmp.unis.uni[1].access-topology-id' value=\"`$domain-B.topology-id`\" />\n<parameter name='tmp.unis.uni[1].access-node-id' value=\"\" />\n<parameter name='tmp.unis.uni[1].src-access-ltp-id' value=\"\" />\n<parameter name='tmp.unis.uni[1].dst-access-ltp-id' value=\"\" />\n\n<parameter name='tmp.unis.uni_length' value=\"2\" />\n\n",
+        "xml": "<set>\n<parameter name='tmp.unis.uni[0].id' value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\" />\n<parameter name='tmp.unis.uni[0].tp-id' value=\"networkId-providerId-5555-clientId-6666-topologyId-11-nodeId-0.190.0.1\" />\n<parameter name='tmp.unis.uni[0].access-provider-id' value=\"`$domain-A.provider-id`\" />\n<parameter name='tmp.unis.uni[0].access-client-id' value=\"`$domain-A.client-id`\" />\n<parameter name='tmp.unis.uni[0].access-topology-id' value=\"`$domain-A.topology-id`\" />\n<parameter name='tmp.unis.uni[0].access-node-id' value=\"0.190.0.1\" />\n<parameter name='tmp.unis.uni[0].src-access-ltp-id' value=\"1234\" />\n<parameter name='tmp.unis.uni[0].dst-access-ltp-id' value=\"5678\" />\n<parameter name='tmp.unis.uni[0].network-id' value=\"domain2-providerId-5555-clientId-6666-topologyId-11\" />\n\n\n<parameter name='tmp.unis.uni[1].id' value=\"5642e9dd-496c-4ef6-be97-5caf4e9beec9\" />\n<parameter name='tmp.unis.uni[1].tp-id' value=\"networkId-domain2-providerId-5555-clientId-6666-topologyId-11-nodeId-0.191.0.4\" />\n<parameter name='tmp.unis.uni[1].access-provider-id' value=\"`$domain-B.provider-id`\" />\n<parameter name='tmp.unis.uni[1].access-client-id' value=\"`$domain-B.client-id`\" />\n<parameter name='tmp.unis.uni[1].access-topology-id' value=\"`$domain-B.topology-id`\" />\n<parameter name='tmp.unis.uni[1].access-node-id' value=\"0.190.0.3\" />\n<parameter name='tmp.unis.uni[1].src-access-ltp-id' value=\"9123\" />\n<parameter name='tmp.unis.uni[1].dst-access-ltp-id' value=\"4567\" />\n<parameter name='tmp.unis.uni[1].network-id' value=\"domain2-providerId-5555-clientId-6666-topologyId-11\" />\n\n\n<parameter name='tmp.unis.uni_length' value=\"2\" />\n\n",
         "comments": "",
         "x": 655,
         "y": 1015,
         "z": "9b26c8a0.a64c1",
         "wires": []
+    },
+    {
+        "id": "ae925256.a68df",
+        "type": "get-resource",
+        "name": "get 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 = $oof.vpn.network-id\"\n        pfx='tmp.aai.network-resource' local-only='false' >\n\n\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1128,
+        "y": 1024,
+        "z": "9b26c8a0.a64c1",
+        "wires": [
+            [
+                "23c084ce.22a7f4",
+                "d2d56dd3.d8df6",
+                "28e7be58.d60b6a"
+            ]
+        ]
+    },
+    {
+        "id": "23c084ce.22a7f4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1323.5001220703125,
+        "y": 981,
+        "z": "9b26c8a0.a64c1",
+        "wires": [
+            [
+                "16ae77fe.3db2f"
+            ]
+        ]
+    },
+    {
+        "id": "d2d56dd3.d8df6",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1315.5001220703125,
+        "y": 1036,
+        "z": "9b26c8a0.a64c1",
+        "wires": [
+            [
+                "8f6658aa.e556f8"
+            ]
+        ]
+    },
+    {
+        "id": "28e7be58.d60b6a",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1320.5001220703125,
+        "y": 1093,
+        "z": "9b26c8a0.a64c1",
+        "wires": [
+            [
+                "5bc0d431.a1baf4"
+            ]
+        ]
+    },
+    {
+        "id": "5bc0d431.a1baf4",
+        "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": 1472.5001220703125,
+        "y": 1094,
+        "z": "9b26c8a0.a64c1",
+        "wires": []
+    },
+    {
+        "id": "8f6658aa.e556f8",
+        "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": 1483.5001220703125,
+        "y": 1039,
+        "z": "9b26c8a0.a64c1",
+        "wires": []
+    },
+    {
+        "id": "16ae77fe.3db2f",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1467.8824462890625,
+        "y": 978.6556701660156,
+        "z": "9b26c8a0.a64c1",
+        "wires": [
+            [
+                "1facb6e4.b004d9"
+            ]
+        ]
+    },
+    {
+        "id": "1facb6e4.b004d9",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for index='ridx' start='0' end='`$tmp.aai.network-resource.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1682.8826904296875,
+        "y": 978.6597290039062,
+        "z": "9b26c8a0.a64c1",
+        "wires": [
+            [
+                "a5fdb89.17d6dc8"
+            ]
+        ]
+    },
+    {
+        "id": "a5fdb89.17d6dc8",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.network-resource.relationship-list.relationship[$ridx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1908.8826904296875,
+        "y": 978.6597290039062,
+        "z": "9b26c8a0.a64c1",
+        "wires": [
+            [
+                "d4a46397.2bb99"
+            ]
+        ]
+    },
+    {
+        "id": "d4a46397.2bb99",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2115.0001220703125,
+        "y": 977,
+        "z": "9b26c8a0.a64c1",
+        "wires": [
+            [
+                "d4ec153c.0cdc78"
+            ]
+        ]
+    },
+    {
+        "id": "d4ec153c.0cdc78",
+        "type": "set",
+        "name": "set prop.sdncRestApi.thirdpartySdnc.id",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.id' value=\"`$tmp.aai.network-resource.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 2133,
+        "y": 1056,
+        "z": "9b26c8a0.a64c1",
+        "wires": []
+    },
+    {
+        "id": "8a87ece8.73f728",
+        "type": "get-resource",
+        "name": "get-resource uni",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"uni\" \n\t\tkey=\"uni.id = $tmp.aai.generic-vnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value\"\n        pfx='tmp.aai.uni' local-only='false' >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1802,
+        "y": 689,
+        "z": "9b26c8a0.a64c1",
+        "wires": [
+            [
+                "af655688.304b78"
+            ]
+        ]
+    },
+    {
+        "id": "af655688.304b78",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1974,
+        "y": 689,
+        "z": "9b26c8a0.a64c1",
+        "wires": [
+            [
+                "91d7b892.85ea"
+            ]
+        ]
+    },
+    {
+        "id": "bc6860a4.74042",
+        "type": "set",
+        "name": "set tmp.unis.uni[]",
+        "xml": "<set>\n<!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`\" />-->\n\n<parameter name='`tmp.unis.uni[$vidx].`' value=\"`$tmp.aai.uni.`\" />\n",
+        "comments": "",
+        "x": 2299,
+        "y": 645,
+        "z": "9b26c8a0.a64c1",
+        "wires": []
+    },
+    {
+        "id": "91d7b892.85ea",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2115,
+        "y": 691,
+        "z": "9b26c8a0.a64c1",
+        "wires": [
+            [
+                "bc6860a4.74042",
+                "e85654b4.901fd",
+                "596112fe.dbc0a4"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
index c6505ad1..96f3843f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
@@ -48,6 +48,22 @@
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />
+                            <!--<set>-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$otn-domain.node-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$otn-domain.ttp-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='`$otn-domain.tpn`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$oof.vpn.access-node-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$otn-domain.node-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->
                         </set>
                     </block>
                 </outcome>
@@ -73,6 +89,22 @@
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />
+                                    <!--<set>-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$oof.vpn.access-node-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$otn-domain.node-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].src-ttp-id' value='`$otn-domain.ttp-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn' value='`$otn-domain.tpn`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$oof.vpn.access-node-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$otn-domain.node-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->
                                 </set>
                             </block>
                         </outcome>
@@ -81,13 +113,15 @@
             </execute>
             <switch test="`$prop.sdncRestApi.token_id`">
                 <outcome value=''>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
+                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />
                         <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />
                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                         <parameter name="format" value="json"/>
                         <parameter name="httpMethod" value="patch"/>
-                        <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />
+                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                        <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->
                         <parameter name="responsePrefix" value="vpn-result"/>
                         <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                         <parameter name="trustStorePassword" value="adminadmin"/>
@@ -106,13 +140,15 @@
                     </execute>
                 </outcome>
                 <outcome value='Other'>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
+                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />
                         <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />
                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                         <parameter name="format" value="json"/>
                         <parameter name="httpMethod" value="patch"/>
-                        <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />
+                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                        <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->
                         <parameter name="responsePrefix" value="vpn-result"/>
                         <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                         <parameter name="trustStorePassword" value="adminadmin"/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
index 7159b23a..8bf518e2 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
@@ -1,13 +1,11 @@
-<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}'>
-    <method rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
+    <method rpc="sotn-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`" />
-                <parameter name="restapiUser" value="`$prop.oof.user`" />
-                <parameter name="restapiPassword" value="`$prop.oof.password`" />
+            <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`"/>
+                <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"/>
@@ -15,95 +13,106 @@
                 <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" />
+                <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 value="success">
+                    <block/>
                 </outcome>
             </execute>
-            <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >
+            <for index="vidx" start="0" end="`$otn-oof.solutions_length`">
                 <block atomic="true">
                     <set>
-                        <parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />
+                        <parameter name="otn-oof.link-name" value="`$otn-oof.solutions[$vidx].link`"/>
                     </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' >
+                    <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'>
+                        <outcome value="success">
                             <block>
-                                <switch test='`$tmp.aai.cross-link.link-role`'>
-                                    <outcome value='cross-domain'>
+                                <switch test="`$tmp.aai.cross-link.link-role`">
+                                    <outcome value="cross-domain">
                                         <block atomic="true">
-                                            <set>
-                                                <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[1].relationship-value`" />
-                                                <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[1].relationship-value`" />
-                                                <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-                                                <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[0].relationship-value`" />
-                                            </set>
-                                            <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' >
+                                            <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>
+                                                            <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.cross-link.dst-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].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.dst-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`"/>
+                                                            </set>
+                                                            <break/>
+                                                        </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 AND p-interface.interface-name = $tmp.cross-link.src-ltpId" pfx="tmp.aai.src-tp" local-only="false">
                                                 <!--AND depth = '0'"-->
-                                                <outcome value='success'>
+                                                <outcome value="success">
                                                     <block>
-                                                        <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' >
+                                                        <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'>
+                                                            <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="domain-A.node-id" value="`$tmp.aai.src-pnf.pnf-id`"/>
+                                                                        <parameter name="domain-A.tpn" value="1"/>
                                                                     </set>
-                                                                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >
-                                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
-                                                                            <outcome value='tunnel-termination-point'>
+                                                                    <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.src-pnf.relationship-list.relationship_length`">
+                                                                        <switch test="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`">
+                                                                            <outcome value="tunnel-termination-point">
                                                                                 <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name='tmp.src-ttp-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+                                                                                        <parameter name="tmp.src-ttp-id" value="`$tmp.aai.src-pnf.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.src-ttp-id 
-		AND depth = '0'"
-        pfx='tmp.aai.src-ttp' local-only='false' >
-                                                                                        <outcome value='success'>
-                                                                                            <set>
-                                                                                                <parameter name='domain-A.ttp-id' value="`$tmp.aai.src-ttp.ttp-id`" />
-                                                                                            </set>
+                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $tmp.src-ttp-id AND depth = '0'" pfx="tmp.aai.src-ttp" local-only="false">
+                                                                                        <outcome value="success">
+                                                                                            <block atomic="true">
+                                                                                                <switch test="`$tmp.aai.src-ttp.relationship-list.relationship_length`">
+                                                                                                    <outcome value="">
+                                                                                                        <block/>
+                                                                                                    </outcome>
+                                                                                                    <outcome value="0">
+                                                                                                        <block/>
+                                                                                                    </outcome>
+                                                                                                    <outcome value="Other">
+                                                                                                        <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.src-ttp.relationship-list.relationship_length`">
+                                                                                                            <switch test="`$tmp.aai.src-ttp.relationship-list.relationship[$vidx].related-to`">
+                                                                                                                <outcome value="p-interface">
+                                                                                                                    <block atomic="true">
+                                                                                                                        <set>
+                                                                                                                            <parameter name="domain-A.ttp-id" value="`$tmp.aai.src-ttp.tunnel-tp-id`"/>
+                                                                                                                        </set>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                            </switch>
+                                                                                                        </for>
+                                                                                                    </outcome>
+                                                                                                </switch>
+                                                                                            </block>
                                                                                         </outcome>
                                                                                     </get-resource>
                                                                                 </block>
                                                                             </outcome>
-                                                                            <outcome value='network-resource'>
+                                                                            <outcome value="network-resource">
                                                                                 <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name='tmp.domain-A.network-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+                                                                                        <parameter name="tmp.domain-A.network-id" value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].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'>
+                                                                                    <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="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`"/>
                                                                                             </set>
                                                                                         </outcome>
                                                                                     </get-resource>
@@ -113,94 +122,99 @@
                                                                     </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`" />
+                                                            <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`" />
+                                                            <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>
                                                 </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`" />
+                                                <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`" />
+                                                <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.src-pnf-name
-		    AND p-interface.interface-name = $tmp.cross-link.src-ltpId"
-        pfx='tmp.aai.dst-tp' local-only='false' >
+                                            <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'>
+                                                <outcome value="success">
                                                     <block>
-                                                        <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' >
+                                                        <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'>
+                                                            <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="domain-B.node-id" value="`$tmp.aai.dst-pnf.pnf-id`"/>
+                                                                        <parameter name="domain-B.tpn" value="1"/>
                                                                     </set>
-                                                                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >
-                                                                        <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].related-to`'>
-                                                                            <outcome value='tunnel-termination-point'>
+                                                                    <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.dst-pnf.relationship-list.relationship_length`">
+                                                                        <switch test="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].related-to`">
+                                                                            <outcome value="tunnel-termination-point">
                                                                                 <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name='tmp.dst-ttp-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+                                                                                        <parameter name="tmp.dst-ttp-id" value="`$tmp.aai.dst-pnf.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.dst-ttp-id 
-		AND depth = '0'"
-        pfx='tmp.aai.dst-ttp' local-only='false' >
-                                                                                        <outcome value='success'>
-                                                                                            <set>
-                                                                                                <parameter name='domain-B.ttp-id' value="`$tmp.aai.dst-ttp.ttp-id`" />
-                                                                                            </set>
+                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $tmp.dst-ttp-id AND depth = '0'" pfx="tmp.aai.dst-ttp" local-only="false">
+                                                                                        <outcome value="success">
+                                                                                            <block atomic="true">
+                                                                                                <switch test="`$tmp.aai.dst-ttp.relationship-list.relationship_length`">
+                                                                                                    <outcome value="">
+                                                                                                        <block/>
+                                                                                                    </outcome>
+                                                                                                    <outcome value="0">
+                                                                                                        <block/>
+                                                                                                    </outcome>
+                                                                                                    <outcome value="Other">
+                                                                                                        <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.dst-ttp.relationship-list.relationship_length`">
+                                                                                                            <switch test="`$tmp.aai.dst-ttp.relationship-list.relationship[$vidx].related-to`">
+                                                                                                                <outcome value="p-interface">
+                                                                                                                    <block atomic="true">
+                                                                                                                        <set>
+                                                                                                                            <parameter name="domain-B.ttp-id" value="`$tmp.aai.dst-ttp.tunnel-tp-id`"/>
+                                                                                                                        </set>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                            </switch>
+                                                                                                        </for>
+                                                                                                    </outcome>
+                                                                                                </switch>
+                                                                                            </block>
                                                                                         </outcome>
                                                                                     </get-resource>
                                                                                 </block>
                                                                             </outcome>
-                                                                            <outcome value='network-resource'>
+                                                                            <outcome value="network-resource">
                                                                                 <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name='tmp.domain-B.network-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+                                                                                        <parameter name="tmp.domain-B.network-id" value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].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'>
+                                                                                    <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="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`"/>
                                                                                             </set>
                                                                                         </outcome>
                                                                                     </get-resource>
@@ -210,35 +224,35 @@
                                                                     </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`" />
+                                                            <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`" />
+                                                            <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>
                                                 </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`" />
+                                                <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`" />
+                                                <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>
@@ -246,34 +260,57 @@
                                         </block>
                                     </outcome>
                                 </switch>
-                                <switch test='`$vidx`'>
-                                    <outcome value='0'>
-                                        <set>
-                                            <parameter name='tmp.oofsolutions-first-src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-                                            <parameter name='tmp.oofsolutions-first-src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[0].relationship-data[1].relationship-value`" />
-                                        </set>
-                                    </outcome>
-                                    <outcome value='`$otn-oof.solutions_length - 1`'>
-                                        <set>
-                                            <parameter name='tmp.oofsolutions-last-dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[0].relationship-value`" />
-                                            <parameter name='tmp.oofsolutions-last-dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[1].relationship-data[1].relationship-value`" />
-                                        </set>
+                                <switch test="`length($tmp.aai.cross-link.relationship-list.relationship) == 0`">
+                                    <outcome value="true"/>
+                                    <outcome value="false">
+                                        <switch test="`$vidx`">
+                                            <outcome value="0">
+                                                <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>
+                                                                <set>
+                                                                    <parameter name="tmp.oofsolutions-first-src-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`"/>
+                                                                    <parameter name="tmp.oofsolutions-first-src-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`"/>
+                                                                </set>
+                                                                <break/>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                            </outcome>
+                                            <outcome value="`$otn-oof.solutions_length - 1`">
+                                                <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>
+                                                                <set>
+                                                                    <parameter name="tmp.oofsolutions-last-dst-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`"/>
+                                                                    <parameter name="tmp.oofsolutions-last-dst-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`"/>
+                                                                </set>
+                                                                <break/>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                            </outcome>
+                                        </switch>
                                     </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`" />
+                        <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`" />
+                        <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>
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
index 406f52c0..d8e111c0 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
@@ -1,65 +1,63 @@
-<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}'>
-    <method rpc='sotn-vf-operation-uni-activate' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
+    <method rpc="sotn-vf-operation-uni-activate" mode="sync">
         <block atomic="true">
-            <switch test='`$service-data.vnfs.vnf_length`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
+            <switch test="`$service-data.vnfs.vnf_length`">
+                <outcome value="">
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y"/>
+                        <parameter name="error-code" value="500"/>
+                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data"/>
                     </return>
                 </outcome>
             </switch>
-            <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
+            <for index="idx" start="0" end="`$service-data.vnfs.vnf_length`">
                 <switch test="`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`">
-                    <outcome value='true'>
+                    <outcome value="true">
                         <block atomic="true">
                             <set>
-                                <parameter name='vnf-index' value='`$idx`' />
+                                <parameter name="vnf-index" value="`$idx`"/>
                             </set>
                             <set>
-                                <parameter name='tmp.vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />
+                                <parameter name="tmp.vnf-id" value="`$vf-module-topology-operation-input.vnf-information.vnf-id`"/>
                             </set>
                         </block>
                     </outcome>
                 </switch>
             </for>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
+            <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties">
+                <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties"/>
+                <parameter name="contextPrefix" value="prop"/>
             </execute>
-            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>
-                <outcome value='0'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
+            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`">
+                <outcome value="0">
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y"/>
+                        <parameter name="error-code" value="500"/>
+                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data"/>
                     </return>
                 </outcome>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
+                <outcome value="">
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y"/>
+                        <parameter name="error-code" value="500"/>
+                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data"/>
                     </return>
                 </outcome>
-                <outcome value='Other'>
+                <outcome value="Other">
                     <block atomic="true">
                         <set>
-                            <parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />
+                            <parameter name="vf-module-length" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`"/>
                         </set>
-                        <for index='idx' start='0' end='`$vf-module-length`' >
+                        <for index="idx" start="0" end="`$vf-module-length`">
                             <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`">
-                                <outcome value='true'>
+                                <outcome value="true">
                                     <block atomic="true">
                                         <set>
-                                            <parameter name='tmp.vidx' value='`$idx`' />
-                                            <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />
+                                            <parameter name="tmp.vidx" value="`$idx`"/>
+                                            <parameter name="ctx.vf-module-data." value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`"/>
                                         </set>
                                         <set>
-                                            <parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />
+                                            <parameter name="vf-module-request-input." value="`$ctx.vf-module-data.vf-module-request-input.`"/>
                                         </set>
                                     </block>
                                 </outcome>
@@ -68,86 +66,88 @@
                     </block>
                 </outcome>
             </switch>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-		resource="generic-vnf" 
-		key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id"
-        pfx='tmp.aai.generic-vnf' local-only='false' >
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="generic-vnf" key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id" pfx="tmp.aai.generic-vnf" local-only="false">
                 <!--AND depth = '0'"-->
-                <outcome value='success'>
+                <outcome value="success">
                     <block>
-                        <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >
-                            <switch test='`$tmp.aai.generic-vnf.relationship-list.relationship[$vidx].related-to`'>
-                                <outcome value='uni'>
+                        <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.generic-vnf.relationship-list.relationship_length`">
+                            <switch test="`$tmp.aai.generic-vnf.relationship-list.relationship[$vidx].related-to`">
+                                <outcome value="uni">
                                     <block atomic="true">
-                                        <set>
-                                            <!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />-->
-                                            <parameter name='tmp.tpId' value="`$tmp.aai.uni.tpId`" />
-                                        </set>
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                            <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>
-                                            <parameter name="regex" value="nodeId"/>
-                                            <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>
-                                            <outcome value='success'>
-                                                <set>
-                                                    <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />
-                                                    <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />
-                                                </set>
-                                            </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.unis.uni[$vidx].pnf-name'
-		AND depth = '0'"
-        pfx='tmp.aai.pnf' local-only='false' >
-                                            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
-                                            <!--		resource="generic-vnf" -->
-                                            <!--		key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->
-                                            <!--		AND depth = '0'"-->
-                                            <!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->
-                                            <outcome value='success'>
+                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="uni" key="uni.id = $tmp.aai.generic-vnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value" pfx="tmp.aai.uni" local-only="false">
+                                            <outcome value="success">
                                                 <block>
                                                     <set>
-                                                        <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />
+                                                        <!--
+                                                        <parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+                                                        -->
+                                                        <parameter name="`tmp.unis.uni[$vidx].`" value="`$tmp.aai.uni.`"/>
                                                     </set>
-                                                    <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >
-                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
-                                                            <outcome value='thirdparty-controller'>
-                                                                <block atomic="true">
-                                                                    <set>
-                                                                        <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
-                                                                    </set>
-                                                                </block>
-                                                            </outcome>
-                                                            <outcome value='network-resource'>
-                                                                <block atomic="true">
-                                                                    <set>
-                                                                        <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].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.unis.uni[$vidx].network-id'
-		AND depth = '0'"
-        pfx='tmp.aai.network-resource' local-only='false' >
-                                                                        <outcome value='success'>
-                                                                            <set>
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />
-                                                                                <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />
-                                                                            </set>
+                                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">
+                                                        <parameter name="original_string" value="`tmp.aai.uni.tp-id`"/>
+                                                        <parameter name="regex" value="[^-]+$"/>
+                                                        <parameter name="ctx_memory_result_key" value="param-prefix"/>
+                                                        <outcome value="success">
+                                                            <set>
+                                                                <parameter name="tmp.src.ltpId" value="`$param-prefix[$param-prefix_length -1]`"/>
+                                                            </set>
+                                                        </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.unis.uni[$vidx].pnf-name' AND depth = '0'" pfx="tmp.aai.pnf" local-only="false">
+                                                        <!--
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                        -->
+                                                        <!--		resource="generic-vnf" -->
+                                                        <!--
+                                                                key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
+                                                        -->
+                                                        <!--		AND depth = '0'"-->
+                                                        <!--
+                                                                pfx='tmp.aai.generic-vnf' local-only='false' >
+                                                        -->
+                                                        <outcome value="success">
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name="`$tmp.unis.uni[$vidx].node-id`" value="`$tmp.aai.pnf.pnf-id`"/>
+                                                                </set>
+                                                                <for silentFailure="true" index="ridx" start="0" end="`$tmp.aai.pnf.relationship-list.relationship_length`">
+                                                                    <switch test="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`">
+                                                                        <outcome value="thirdparty-controller">
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name="`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`" value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`"/>
+                                                                                </set>
+                                                                            </block>
                                                                         </outcome>
-                                                                    </get-resource>
-                                                                </block>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
+                                                                        <outcome value="network-resource">
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].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.unis.uni[$vidx].network-id' AND depth = '0'" pfx="tmp.aai.network-resource" local-only="false">
+                                                                                    <outcome value="success">
+                                                                                        <set>
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`"/>
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`"/>
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`"/>
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`"/>
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`"/>
+                                                                                        </set>
+                                                                                    </outcome>
+                                                                                </get-resource>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                            </block>
+                                                        </outcome>
+                                                    </get-resource>
                                                 </block>
                                             </outcome>
                                         </get-resource>
@@ -155,121 +155,208 @@
                                 </outcome>
                             </switch>
                         </for>
-                        <switch test='`$tmp.unis.uni_length &lt; 2`' >
-                            <outcome value='true'>
-                                <return status='success'>
-                                    <parameter name="ack-final-indicator" value="Y" />
-                                    <parameter name="error-code" value="200" />
-                                    <parameter name="error-message" value="`$error-message`" />
+                        <switch test="`$tmp.unis.uni_length < 2`">
+                            <outcome value="true">
+                                <return status="success">
+                                    <parameter name="ack-final-indicator" value="Y"/>
+                                    <parameter name="error-code" value="200"/>
+                                    <parameter name="error-message" value="`$error-message`"/>
                                 </return>
                             </outcome>
                         </switch>
                     </block>
                 </outcome>
             </get-resource>
-            <call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' ></call>
-            <set>
-                <parameter name='tmp.unis.uni[0].id' value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`" />
-                <parameter name='tmp.unis.uni[0].tp-id' value="networkId-providerId-5555-clientId-6666-topologyId-11-nodeId-0.190.0.1" />
-                <parameter name='tmp.unis.uni[0].access-provider-id' value="`$domain-A.provider-id`" />
-                <parameter name='tmp.unis.uni[0].access-client-id' value="`$domain-A.client-id`" />
-                <parameter name='tmp.unis.uni[0].access-topology-id' value="`$domain-A.topology-id`" />
-                <parameter name='tmp.unis.uni[0].access-node-id' value="" />
-                <parameter name='tmp.unis.uni[0].src-access-ltp-id' value="" />
-                <parameter name='tmp.unis.uni[0].dst-access-ltp-id' value="" />
-                <parameter name='tmp.unis.uni[1].id' value="5642e9dd-496c-4ef6-be97-5caf4e9beec9" />
-                <parameter name='tmp.unis.uni[1].tp-id' value="networkId-domain2-providerId-5555-clientId-6666-topologyId-11-nodeId-0.191.0.4" />
-                <parameter name='tmp.unis.uni[1].access-provider-id' value="`$domain-B.provider-id`" />
-                <parameter name='tmp.unis.uni[1].access-client-id' value="`$domain-B.client-id`" />
-                <parameter name='tmp.unis.uni[1].access-topology-id' value="`$domain-B.topology-id`" />
-                <parameter name='tmp.unis.uni[1].access-node-id' value="" />
-                <parameter name='tmp.unis.uni[1].src-access-ltp-id' value="" />
-                <parameter name='tmp.unis.uni[1].dst-access-ltp-id' value="" />
-                <parameter name='tmp.unis.uni_length' value="2" />
-            </set>
-            <for index='vidx' start='0' end='`$tmp.unis.uni_length`' >
+            <call module="GENERIC-RESOURCE-API" rpc="sotn-get-otn-tunnel-path-from-oof" mode="sync"/>
+            <for index="vidx" start="0" end="`$tmp.unis.uni_length`">
                 <block atomic="true">
                     <set>
-                        <parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />
+                        <parameter name="oof.vpn." value="`$tmp.unis.uni[$vidx].`"/>
                     </set>
-                    <call module='GENERIC-RESOURCE-API' rpc='sotn-create-otn-tunnel' mode='sync' ></call>
+                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $oof.vpn.network-id" pfx="tmp.aai.network-resource" local-only="false">
+                        <outcome value="success">
+                            <block>
+                                <for index="ridx" start="0" end="`$tmp.aai.network-resource.relationship-list.relationship_length`">
+                                    <switch test="`$tmp.aai.network-resource.relationship-list.relationship[$ridx].related-to`">
+                                        <outcome value="esr-thirdparty-sdnc">
+                                            <set>
+                                                <parameter name="prop.sdncRestApi.thirdpartySdnc.id" value="`$tmp.aai.network-resource.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`"/>
+                                            </set>
+                                        </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="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+                        <outcome value="success">
+                            <set>
+                                <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`"/>
+                                <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`"/>
+                                <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`"/>
+                                <!--
+                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                -->
+                                <!--
+                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />
+                                -->
+                                <!--
+                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                -->
+                                <!--
+                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                -->
+                                <!--<parameter name="format" value="json"/>-->
+                                <!--<parameter name="httpMethod" value="get"/>-->
+                                <!--
+                                <parameter name="responsePrefix" value="topology"/>
+                                -->
+                                <!--
+                                <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"/>
+                                -->
+                            </set>
+                        </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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`"/>
+                            </return>
+                        </outcome>
+                    </get-resource>
+                    <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`"/>
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`"/>
+                        <parameter name="format" value="json"/>
+                        <parameter name="httpMethod" value="post"/>
+                        <parameter name="responsePrefix" value="token-result"/>
+                        <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"/>
+                        <outcome value="success">
+                            <set>
+                                <parameter name="prop.sdncRestApi.token_id" value="`$token-result.data.token_id`"/>
+                            </set>
+                        </outcome>
+                        <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 get token rest api"/>
+                            </return>
+                        </outcome>
+                    </execute>
+                    <call module="GENERIC-RESOURCE-API" rpc="sotn-create-otn-tunnel" mode="sync"/>
                     <set>
-                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />
+                        <parameter name="ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type" value="ietf-eth-tran-types:mef-10-bwp"/>
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type" value="ietf-eth-tran-types:p2p-svc"/>
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status" value="ietf-te-types:tunnel-state-up"/>
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id" value="0"/>
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type" value="ietf-eth-tran-types:port-classification"/>
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id" value="1"/>
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type" value="ietf-eth-tran-types:port-classification"/>
                     </set>
                     <set>
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id" value="`$oof.vpn.access-provider-id`"/>
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id" value="`$oof.vpn.access-client-id`"/>
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id" value="`$oof.vpn.access-topology-id`"/>
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id" value="`$oof.vpn.access-node-id`"/>
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id" value="`$oof.vpn.src-access-ltp-id`"/>
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id" value="`$oof.vpn.access-node-id`"/>
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id" value="`$oof.vpn.dst-access-ltp-id`"/>
                     </set>
                     <switch test="`$prop.sdncRestApi.token_id`">
-                        <outcome value=''>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
-                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                        <outcome value="">
+                            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestApiCallNode" method="sendRequest">
+                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`"/>
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`"/>
+                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>
+                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>
                                 <parameter name="format" value="json"/>
                                 <parameter name="httpMethod" value="patch"/>
-                                <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />
+                                <parameter name="dirPath" value="/opt/onap/sdnc/restconfapi/yang"/>
                                 <parameter name="responsePrefix" value="vpn-result"/>
                                 <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"/>
-                                <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 Create vpn rest api" />
+                                <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 Create vpn rest api"/>
                                     </return>
                                 </outcome>
-                                <outcome value='success'>
-                                    <block atomic="true"></block>
+                                <outcome value="success">
+                                    <block atomic="true"/>
                                 </outcome>
                             </execute>
                         </outcome>
-                        <outcome value='Other'>
-                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
-                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                        <outcome value="Other">
+                            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestApiCallNode" method="sendRequest">
+                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`"/>
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`"/>
+                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>
+                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>
                                 <parameter name="format" value="json"/>
                                 <parameter name="httpMethod" value="patch"/>
-                                <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />
+                                <parameter name="dirPath" value="/opt/onap/sdnc/restconfapi/yang"/>
                                 <parameter name="responsePrefix" value="vpn-result"/>
                                 <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 Create vpn rest api" />
+                                <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 Create vpn rest api"/>
                                     </return>
                                 </outcome>
-                                <outcome value='success'>
-                                    <block atomic="true"></block>
+                                <outcome value="success">
+                                    <block atomic="true"/>
                                 </outcome>
                             </execute>
                         </outcome>
                     </switch>
                 </block>
             </for>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
+            <return status="success">
+                <parameter name="ack-final-indicator" value="Y"/>
+                <parameter name="error-code" value="200"/>
+                <parameter name="error-message" value="`$error-message`"/>
             </return>
         </block>
     </method>
diff --git a/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json b/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json
index eb7a20c6..a3b5d401 100644
--- a/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json
+++ b/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json
@@ -382,11 +382,11 @@
         "id": "4f7b81dc.d4d6f",
         "type": "set",
         "name": "set domain-services",
-        "xml": "<set>\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='optical-service-delete-input.request-id' value=\"`$domain-service1`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$service-name + $param-prefix[2]`\"/>",
+        "xml": "<set>\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='optical-service-delete-input.request-id' value=\"`$domain-service1`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.service-name + $param-prefix[2]`\"/>",
         "comments": "",
         "x": 777.61669921875,
         "y": 244.61666870117188,
         "z": "27c6cdb6.f4809a",
         "wires": []
     }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
index 2eb38164..a04cdba5 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml
@@ -23,7 +23,7 @@ pfx='detail-db1'>
                 <parameter name='domain-type' value='`$param-prefix[0]`' />
                 <parameter name='controller-ip' value='`$param-prefix[1]`' />
                 <parameter name='optical-service-delete-input.request-id' value="`$domain-service1`" />
-                <parameter name='optical-service-delete-input.payload.service-name' value="`$service-name + $param-prefix[2]`"/>
+                <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.service-name + $param-prefix[2]`"/>
             </set>
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`" />
@@ -87,4 +87,4 @@ pfx='output'></get-resource>
             </execute>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
diff --git a/platform-logic/restapi-templates/src/main/json/optical-service-create-msa.json b/platform-logic/restapi-templates/src/main/json/optical-service-create-msa.json
index cd26b7e6..8806f4b8 100644
--- a/platform-logic/restapi-templates/src/main/json/optical-service-create-msa.json
+++ b/platform-logic/restapi-templates/src/main/json/optical-service-create-msa.json
@@ -5,8 +5,8 @@
    "sdnc-request-header":{
       "request-id": ${optical-service-create-input.request-id},
       "rpc-action":"service-create",
-      "notification-url": ${notification-url},
-      "request-system-id":"SDN-ONAP"
+      "notification-url": "http://sdnc.onap:8090/receiver/services",
+      "request-system-id":"DCAE"
    },
    "service-a-end":{
       "service-rate": ${optical-service-create-input.payload.service-rate},
diff --git a/platform-logic/restapi-templates/src/main/json/optical-service-delete-msa.json b/platform-logic/restapi-templates/src/main/json/optical-service-delete-msa.json
index e777f99a..63f6b8aa 100644
--- a/platform-logic/restapi-templates/src/main/json/optical-service-delete-msa.json
+++ b/platform-logic/restapi-templates/src/main/json/optical-service-delete-msa.json
@@ -2,8 +2,8 @@
  "sdnc-request-header":{
    "request-id": ${optical-service-delete-input.request-id},
    "rpc-action": "service-delete",
-   "notification-url": ${notification-url},
-   "request-system-id": "SDN-ONAP"
+   "notification-url": "http://sdnc.onap:8090/receiver/services",
+   "request-system-id": "DCAE"
   },
   "service-delete-req-info":{
     "tail-retention": "no",
diff --git a/platform-logic/restapi-templates/src/main/json/sotn-ethernet-service.json b/platform-logic/restapi-templates/src/main/json/sotn-ethernet-service.json
index 582e88e3..6fdb4e10 100644
--- a/platform-logic/restapi-templates/src/main/json/sotn-ethernet-service.json
+++ b/platform-logic/restapi-templates/src/main/json/sotn-ethernet-service.json
@@ -1,42 +1,64 @@
 {
     "ietf-eth-tran-service:etht-svc": {
-        "globals": {
-            "etht-svc-bandwidth-profiles": [
-                {
-                    "bandwidth-profile-name": ${prop.global.sotn.bandwidth-profile-name},
-                    "bandwidth-profile-type": "ietf-eth-tran-types:mef-10-bwp",
-                    "CIR": ${prop.global.sotn.cir},
-                    "EIR": ${prop.global.sotn.eir},
-                    "color-aware": ${prop.global.sotn.colorAware},
-                    "coupling-flag": ${prop.global.sotn.couplingFlag}
-                }
-            ]
-        },
         "etht-svc-instances": [
             {
                 "etht-svc-name": ${prop.global.sotn.etht-svc-name},
-                "access-provider-id": ${oof.vpn.access-provider-id},
-                "access-client-id": ${oof.vpn.access-client-id},
-                "access-topology-id": ${oof.vpn.access-topology-id},
+                "te-topology-identifier":{
+                    "provider-id":${oof.vpn.access-provider-id},
+                    "client-id":${oof.vpn.access-client-id},
+                    "topology-id":${oof.vpn.access-topology-id}
+                },
                 "etht-svc-type": "ietf-eth-tran-types:p2p-svc",
+                "underlay":{
+                    "pw":{
+                        "pw-name":"pwName",
+                        "pw-id":"123",
+                        "pw-paths":[
+                            {
+                                "path-id":"123",
+                                "tp-tunnels":[
+                                    {
+                                        "name":"tptunnel-22"
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                },
+                "resilience":{
+                    "protection":{
+                        "enable":"true",
+                        "hold-off-time":"0",
+                        "protection-reversion-disable":"true",
+                        "protection-type":"ietf-te-types:lsp-protection-unprotected",
+                        "wait-to-revert":"0"
+                    }
+                },
                 "admin-status": "ietf-te-types:tunnel-state-up",
-                "etht-svc-access-ports": [
-                    {
-                        "access-port-id": "0",
-                        "access-node-id": ${oof.vpn.access-node-id},
-                        "access-ltp-id": ${oof.vpn.src-access-ltp-id},
-                        "service-classification-type": "ietf-eth-tran-types:port-classification",
-                        "ingress-egress-bandwidth-profile-name": ${prop.global.sotn.bandwidth-profile-name}
-                    },
+                "etht-svc-end-points":[
                     {
-                        "access-port-id": "1",
-                        "access-node-id": ${oof.vpn.access-node-id},
-                        "access-ltp-id": ${oof.vpn.dst-access-ltp-id},
-                        "service-classification-type": "ietf-eth-tran-types:port-classification",
-                        "ingress-egress-bandwidth-profile-name": ${prop.global.sotn.bandwidth-profile-name}
+                        "etht-svc-end-point-name":"source-point-name",
+                        "etht-svc-access-points":[
+                            {
+                            "access-point-id":"0",
+                            "access-node-id":${oof.vpn.access-node-id},
+                            "access-ltp-id":${oof.vpn.src-access-ltp-id}
+                            },
+                            {
+                            "access-point-id":"1",
+                            "access-node-id":${oof.vpn.access-node-id},
+                            "access-ltp-id":${oof.vpn.dst-access-ltp-id}
+                            }
+                        ],
+                        "outer-tag":{
+                            "tag-type":"ietf-eth-tran-types:classify-c-vlan",
+                            "vlan-value":1
+                        },
+                        "service-classification-type":"ietf-eth-tran-types:vlan-classification",
+                        "ingress-egress-bandwidth-profile":${prop.global.sotn.bandwidth-profile-name}
                     }
                 ]
             }
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/platform-logic/restapi-templates/src/main/json/sotn-otn-tunnel-service.json b/platform-logic/restapi-templates/src/main/json/sotn-otn-tunnel-service.json
index 085d4944..38869639 100644
--- a/platform-logic/restapi-templates/src/main/json/sotn-otn-tunnel-service.json
+++ b/platform-logic/restapi-templates/src/main/json/sotn-otn-tunnel-service.json
@@ -3,34 +3,54 @@
         "tunnels":{
             "tunnel":[
                 {
-                    "destination": ${oof.vpn.access-node-id},
-                    "source": ${otn-domain.node-id},
-                    "src-ttp-id": ${otn-domain.ttp-id},
-                    "ietf-otn-tunnel:src-tpn": ${otn-domain.tpn},
-                    "name": "otntunnel-22",
-                    "te-topology-identifier": {
-                        "client-id": ${otn-domain.client-id},
-                        "provider-id": ${otn-domain.provider-id},
-                        "topology-id": ${otn-domain.te-topo-id}
-                    }
+                "destination": ${ietf-te_te.tunnels.tunnel[0].destination},
+                "source": ${ietf-te_te.tunnels.tunnel[0].source},
+                "src-ttp-id": ${ietf-te_te.tunnels.tunnel[0].src-ttp-id},
+                "dst-ttp-id": ${ietf-te_te.tunnels.tunnel[0].dst-ttp-id},
+                "ietf-otn-tunnel:src-tpn": ${ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn},
+                "ietf-otn-tunnel:dst-tpn": ${ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn},
+                "te-bandwidth": {
+                    "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODUFlex-gfp"
                 },
+                "encoding": "ietf-te-types:lsp-encoding-oduk",
+                "name": ${ietf-te_te.tunnels.tunnel[0].name},
+                "restoration": {
+                    "enable": "false",
+                    "hold-off-time": "0",
+                    "restoration-reversion-disable": "true",
+                    "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
+                    "wait-to-revert": "0"
+                },
+                "switching-type": "ietf-te-types:switching-otn",
+                "provisioning-state": "ietf-te-types:tunnel-state-down",
+                "te-topology-identifier": {
+                    "client-id": ${ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id},
+                "provider-id": ${ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id},
+                "topology-id": ${ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id}
+            }
+            },
                 {
-                    "destination": ${oof.vpn.access-node-id},
-                    "source": ${otn-domain.node-id},
-                    "src-ttp-id": ${otn-domain.ttp-id},
-                    "ietf-otn-tunnel:src-tpn": ${otn-domain.tpn},
-                    "name": "tptunnel-22",
-                    "dependency-tunnels": {
-                        "dependency-tunnel": [
-                            "name": "tptunnel-22"
-                        ]
-                    },
-                    "te-topology-identifier": {
-                        "client-id": ${otn-domain.client-id},
-                        "provider-id": ${otn-domain.provider-id},
-                        "topology-id": ${otn-domain.te-topo-id}
-                    }
-                }
+                "destination": ${ietf-te_te.tunnels.tunnel[1].destination},
+                "source": ${ietf-te_te.tunnels.tunnel[1].source},
+                "encoding": "ietf-te-types:lsp-encoding-packet",
+                "name": ${ietf-te_te.tunnels.tunnel[1].name},
+                "dependency-tunnels": {
+                    "dependency-tunnel": [
+                        {
+                        "name": ${ietf-te_te.tunnels.tunnel[0].name},
+                        "encoding": "ietf-te-types:lsp-encoding-oduk",
+                        "switching-type": "ietf-te-types:switching-otn"
+                        }
+                    ]
+                },
+                "switching-type": "ietf-te-types:switching-psc1",
+                "te-topology-identifier": {
+                    "client-id": ${ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id},
+                "provider-id": ${ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id},
+                "topology-id": ${ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id}
+            },
+            "provisioning-state": "ietf-te-types:tunnel-state-down"
+            }
             ]
         }
     }